[arch-commits] Commit in db4.1/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 17:05:41
  Author: jgc
Revision: 49911

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

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

Modified:
  db4.1/repos/extra-i686/	(properties)
  db4.1/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)


Property changes on: db4.1/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /db4.1/trunk:1
   + /db4.1/trunk:1-49910

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-16 20:58:20 UTC (rev 49910)
+++ extra-i686/PKGBUILD	2009-08-16 21:05:41 UTC (rev 49911)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=db4.1
 pkgver=4.1.25
-pkgrel=2
+pkgrel=3
 pkgdesc="The Berkeley DB embedded database system 4.1"
 arch=(i686 x86_64)
 license=('custom')
@@ -10,33 +10,35 @@
 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.1.25/patch.4.1.25.1
-	http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.2
-	http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.3)
-md5sums=('d82ed75cb53b0daba4a7e959e8a6f86c' '1e073d12cd89f9345e281ca07368f74b'
-         '5eedc6818783b4b89317d89d2babb6f7' 'bda83ce3ce18a3e9001d0c2eb90d9508')
+        http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.1
+        http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.2
+        http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.3)
+md5sums=('d82ed75cb53b0daba4a7e959e8a6f86c'
+         '1e073d12cd89f9345e281ca07368f74b'
+         '5eedc6818783b4b89317d89d2babb6f7'
+         'bda83ce3ce18a3e9001d0c2eb90d9508')
 
 build() {
-  cd ${startdir}/src/db-${pkgver}/
-  patch -Np0 -i ${startdir}/src/patch.4.1.25.1 || return 1
-  patch -Np0 -i ${startdir}/src/patch.4.1.25.2 || return 1
-  patch -Np0 -i ${startdir}/src/patch.4.1.25.3 || return 1
+  cd "${srcdir}/db-${pkgver}/"
+  patch -Np0 -i "${srcdir}/patch.4.1.25.1" || return 1
+  patch -Np0 -i "${srcdir}/patch.4.1.25.2" || return 1
+  patch -Np0 -i "${srcdir}/patch.4.1.25.3" || 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.1 install
+  make prefix="${pkgdir}/usr" \
+       includedir="${pkgdir}/usr/include/db4.1" 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.1_${i/db_/}
+    mv ${i} db4.1_${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
 }