[arch-commits] Commit in heimdal/trunk (PKGBUILD)

Allan McRae allan at archlinux.org
Tue Oct 19 11:20:05 UTC 2010


    Date: Tuesday, October 19, 2010 @ 07:20:04
  Author: allan
Revision: 96210

upgpkg: heimdal 1.3.3-2
db-5.1 rebuild

Modified:
  heimdal/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-19 09:51:15 UTC (rev 96209)
+++ PKGBUILD	2010-10-19 11:20:04 UTC (rev 96210)
@@ -8,7 +8,7 @@
 
 pkgname=heimdal
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="http://www.h5l.org/"
@@ -42,22 +42,24 @@
 
 build() {
   cd ${srcdir}/heimdal-${pkgver}
-  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1
-  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1
-  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch || return 1
-  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch || return 1
-  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1
-  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1
-  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1
+  patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch
+  patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch
+  patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch
+  patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch
+  patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch
+  patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch
+  patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch
 
   sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \
 	doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \
 	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
+	
+  sed -i 's|$(LIB_NDBM)|$(LIB_NDBM) $(LIB_db_create)|' lib/otp/Makefile.am
 
-  libtoolize --force || return 1
-  aclocal -I cf || return 1
-  autoconf || return 1
-  automake || return 1
+  libtoolize --force
+  aclocal -I cf
+  autoconf
+  automake
 
   ./configure --prefix=/usr --enable-shared=yes --without-x \
 	--sysconfdir=/etc --mandir=/usr/share/man \
@@ -70,29 +72,29 @@
 	--with-sqlite3-include=/usr/include \
 	--libexecdir=/usr/sbin
 	
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+  make DESTDIR=${pkgdir} install
 
   # Rename daemons and their manpages
   for i in telnetd ftpd rshd; do
-    mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1
-    mv ${pkgdir}/usr/sbin/{,k}${i} || return 1
+    mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8
+    mv ${pkgdir}/usr/sbin/{,k}${i}
   done
   
   # Rename clients and their manpages
   for i in rcp rsh telnet ftp su login; do
     if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
-      mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1
+      mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1
     fi
-    mv ${pkgdir}/usr/bin/{,k}${i} || return 1
+    mv ${pkgdir}/usr/bin/{,k}${i}
   done
   rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
   
   # Arch could be a KDC too
   install -d ${pkgdir}/etc/rc.d
-  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/ || return 1
+  install -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${pkgdir}/etc/
   for i in heimdal-kdc kadmind kpasswd; do
-    install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1
+    install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i}
   done
 
   # Remove conflicts
@@ -102,5 +104,5 @@
 
   # Install the license
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \
-  	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }




More information about the arch-commits mailing list