[arch-commits] Commit in dvd+rw-tools/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Saturday, August 15, 2009 @ 12:14:44
  Author: jgc
Revision: 49783

Merged revisions 356,49778 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/dvd+rw-tools/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49778 | jgc | 2009-08-15 17:54:31 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  upgpkg: dvd+rw-tools 7.1-2
      Fix manpath
........

Modified:
  dvd+rw-tools/repos/extra-i686/	(properties)
  dvd+rw-tools/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)


Property changes on: dvd+rw-tools/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dvd+rw-tools/trunk:1
   + /dvd+rw-tools/trunk:1-49782

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-15 16:10:30 UTC (rev 49782)
+++ extra-i686/PKGBUILD	2009-08-15 16:14:44 UTC (rev 49783)
@@ -3,30 +3,27 @@
 
 pkgname=dvd+rw-tools
 pkgver=7.1
-origver=7.1 # sometimes it is not the same as pkgver and has '-' in it
-pkgrel=1
-[ "$CARCH" = "x86_64" ] && force=y
+pkgrel=2
 pkgdesc="dvd burning tools"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://fy.chalmers.se/~appro/linux/DVD+RW"
 depends=('cdrkit' 'gcc-libs')
-source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-$origver.tar.gz"
-	"buildpatch-7.0-3-20080108-karolina.patch")
-md5sums=('8acb3c885c87f6838704a0025e435871' '54b4dc52f5380216d4d9fc2dd2086d31')
+source=(http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz
+        buildpatch-7.0-3-20080108-karolina.patch)
+md5sums=('8acb3c885c87f6838704a0025e435871'
+         '54b4dc52f5380216d4d9fc2dd2086d31')
 
 build() {
-  	# fix build, thank you Karolina
-	cd $startdir/src/$pkgname-$pkgver
-	patch -Np1 -i $startdir/src/buildpatch-7.0-3-20080108-karolina.patch
+	cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix build, thank you Karolina
+	patch -Np1 -i "${srcdir}/buildpatch-7.0-3-20080108-karolina.patch"
 
-  cd ${startdir}/src/${pkgname}-${pkgver}
   make || return 1
-  mkdir -p ${startdir}/pkg/usr/bin
-  for bin in growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control; do
-    install -D -m755 $bin ${startdir}/pkg/usr/bin/$bin || return 1
-  done
-  install -D -m644 growisofs.1 ${startdir}/pkg/usr/share/man/man1/growisofs.1 || return 1
-}
 
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
 
+  install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/" || return 1
+  install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1 || return 1
+}