From 552ba0470fd73d6f3ddda72b0db458ea6b51f462 Mon Sep 17 00:00:00 2001
From: Raansu <Gero3977@gmail.com>
Date: Thu, 13 Aug 2015 02:58:05 -0700
Subject: [PATCH] Clean up PKGBUILD and make it more compliant to PKGBUILD
 standards

---
 PKGBUILD | 59 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index cff32f2..a6428f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,29 +10,42 @@ url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 depends=('gcc-libs')
 options=('!libtool' '!makeflags')
 source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-
-package() {
-  cd ${srcdir}/db-${pkgver}/
-
-  cd build_unix
-  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --disable-static --enable-cxx
-  make LIBSO_LIBS=-lpthread || return 1
-  make prefix=${pkgdir}/usr \
-       includedir=${pkgdir}/usr/include/db4.8 install
-
-  rm -rf ${pkgdir}/usr/docs
-  rm -f ${pkgdir}/usr/lib/libdb{,_cxx}.so
-  rm -f ${pkgdir}/usr/lib/libdb{,_cxx}-4.so
-
-  cd ${pkgdir}/usr/bin
-  for i in *; do
-    mv $i db4.8_${i/db_/}
-  done
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 ${srcdir}/db-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
 md5sums=('f80022099c5742cd179343556179aa8c')
 sha1sums=('ab36c170dda5b2ceaad3915ced96e41c6b7e493c')
 
+build() {
+  cd "$srcdir/db-$pkgver/"
+
+  cd "build_unix"
+  ../dist/configure --prefix=/usr --enable-compat185 --enable-shared --disable-static --enable-cxx
+  make LIBSO_LIBS=-lpthread || return 1
+}
+
+package() {  
+  cd "$srcdir/db-$pkgver/"
+  
+  cd "build_unix"
+  make prefix="$pkgdir/usr" includedir="$pkgdir/usr/include/db4.8" install
+
+# Remove conflicting symlinks created by make, should never overwrite 
+# main libdb symlinks to current version. Programs that need or use 
+# db4.8 should be able to find it.
+  rm -rf "$pkgdir/usr/docs"
+  rm -f "$pkgdir/usr/lib/libdb.so"
+  rm -f "$pkgdir/usr/lib/libdb_cxx.so"
+  rm -f "$pkgdir/usr/lib/libdb-4.so"
+  rm -f "$pkgdir/usr/lib/libdb_cxx-4.so"
+
+# Rename db4.8 bin files to not conflict with current db version 
+# installed. Programs that need or use db4.8 should be aware of this 
+# name change. 
+  cd "$pkgdir/usr/bin"
+  for i in *; do
+    mv $i db4.8_${i/db_/}
+  done
+
+# Install license
+  mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 "$srcdir/db-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+