[arch-commits] Commit in db4.5/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 14:49:51
  Author: jgc
Revision: 49851

Merged revisions 356,49850 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/db4.5/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49850 | jgc | 2009-08-16 20:49:10 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: db4.5 4.5.20-2
      Rebuild to get rid of .FILELIST
........

Modified:
  db4.5/repos/extra-x86_64/	(properties)
  db4.5/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)


Property changes on: db4.5/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /db4.5/trunk:1
   + /db4.5/trunk:1-49850

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-16 18:49:10 UTC (rev 49850)
+++ extra-x86_64/PKGBUILD	2009-08-16 18:49:51 UTC (rev 49851)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=db4.5
 pkgver=4.5.20
-pkgrel=1
+pkgrel=2
 pkgdesc="The Berkeley DB embedded database system 4.5"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -10,32 +10,33 @@
 depends=('gcc-libs')
 options=('!libtool' '!makeflags')
 source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz
-	http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
-	http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2)
+        http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
+        http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2)
 md5sums=('b0f1c777708cb8e9d37fb47e7ed3312d'
          'a571e239b9041d7990df287cbc59ad6f'
          'b7a7086a067ba116f5a8464362c9a9a7')
 
 build() {
-  cd ${startdir}/src/db-${pkgver}/
-  patch -Np0 -i ${startdir}/src/patch.4.5.20.1 || return 1
-  patch -Np0 -i ${startdir}/src/patch.4.5.20.2 || return 1
+  cd "${srcdir}/db-${pkgver}"
+  patch -Np0 -i "${srcdir}/patch.4.5.20.1" || return 1
+  patch -Np0 -i "${srcdir}/patch.4.5.20.2" || return 1
 
   cd build_unix
   ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --disable-static --enable-cxx
+      --enable-shared --disable-static --enable-cxx || return 1
   make LIBSO_LIBS=-lpthread || return 1
-  make prefix=${startdir}/pkg/usr \
-       includedir=${startdir}/pkg/usr/include/db4.5 install
+  make prefix="${pkgdir}/usr" \
+       includedir="${pkgdir}/usr/include/db4.5" install || return 1
 
-  rm -rf ${startdir}/pkg/usr/docs
-  rm -f ${startdir}/pkg/usr/lib/libdb{,_cxx}.so
-  rm -f ${startdir}/pkg/usr/lib/libdb{,_cxx}-4.so
+  rm -rf "${pkgdir}/usr/docs"
+  rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}.so
+  rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}-4.so
 
-  cd ${startdir}/pkg/usr/bin
+  cd "${pkgdir}/usr/bin"
   for i in *; do
-    mv $i db4.5_${i/db_/}
+    mv ${i} db4.5_${i/db_/} || return 1
   done
-  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 ${startdir}/src/db-${pkgver}/LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/db-${pkgver}/LICENSE" \
+      "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }