1 files changed, 15 insertions, 24 deletions
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index 5e71171f9..298dafcbf 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -1,42 +1,34 @@
+# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
+_pkgname=cdrkit
 pkgname=cdrkit-libre
 pkgver=1.1.11
-pkgrel=2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
+pkgrel=2.3
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without files under apple's license binding)"
 arch=('i686' 'x86_64')
 url="http://cdrkit.org/"
 license=('GPL2')
-depends=('file' 'bzip2' 'perl')
+depends=('file' 'bzip2')
+optdepends=('perl: for dirsplit')
 makedepends=('cmake')
-provides=('cdrtools' "cdrkit=${pkgver}")
-conflicts=('cdrtools' 'cdrkit')
-replaces=('cdrtools' 'cdrkit')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+provides=("cdrkit=${pkgver}")
+conflicts=('cdrkit')
+replaces=('cdrkit')
+source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
 
-mksource() {
-    if [ ! -d ${pkgname}-${pkgver} ]; then
-        wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \
-        bsdtar xzf -
-
-        mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver}
-    fi
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
-    rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+  # Remove files under apple's license binding
+  rm -rvf ${_pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
 
-    tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
-    rm -r ${pkgname}-${pkgver}/
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
   make PREFIX="$pkgdir/usr" install
 
   # Make symlinks for cdrtools compatibility
@@ -54,4 +46,3 @@ package() {
   ln -s genisoimage.1 mkhybrid.1
   ln -s icedax.1 cdda2wav.1
 }
-md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435')