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

[Allan McRae]

    Date: Saturday, August 16, 2008 @ 23:23:40
  Author: allan
Revision: 9073

upgpkg: heimdal 1.2-2
    ncurses rebuild

Modified:
  heimdal/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-17 03:22:03 UTC (rev 9072)
+++ PKGBUILD	2008-08-17 03:23:40 UTC (rev 9073)
@@ -7,7 +7,7 @@
 
 pkgname=heimdal
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Heimdal Kerberos V5 libraries"
 arch=(i686 x86_64)
 url="http://www.pdc.kth.se/heimdal/"
@@ -56,7 +56,7 @@
 	lib/hdb/hdb.h lib/krb5/krb5.conf.5 lib/krb5/krb5.conf.cat5
 
   ./configure --prefix=/usr --enable-shared=yes --without-x \
-	--sysconfdir=/etc  --mandir=/usr/man \
+	--sysconfdir=/etc  --mandir=/usr/share/man \
 	--datadir=/var/lib/heimdal \
 	--localstatedir=/var/lib/heimdal \
 	--with-openssl=/usr \
@@ -69,17 +69,17 @@
   make DESTDIR=${pkgdir} install || return 1
 
   for i in telnetd ftpd rshd; do
-    mv ${pkgdir}/usr/man/man8/${i}.8 ${pkgdir}/usr/man/man8/k${i}.8
+    mv ${pkgdir}/usr/share/man/man8/${i}.8 ${pkgdir}/usr/share/man/man8/k${i}.8
     mv ${pkgdir}/usr/sbin/${i} ${pkgdir}/usr/sbin/k${i}
   done
   
   for i in rcp rsh telnet ftp su login; do
-    if [ -f ${pkgdir}/usr/man/man1/${i}.1 ]; then
-      mv ${pkgdir}/usr/man/man1/${i}.1 ${pkgdir}/usr/man/man1/k${i}.1
+    if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then
+      mv ${pkgdir}/usr/share/man/man1/${i}.1 ${pkgdir}/usr/share/man/man1/k${i}.1
     fi
     mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i}
   done
-  rm -rf ${pkgdir}/usr/man/cat{1,3,5,8}
+  rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8}
   
   #Arch could be a KDC too
   mkdir -p ${pkgdir}/etc/rc.d
@@ -89,13 +89,9 @@
   done
 
   #Remove some conflicts 
-  rm ${pkgdir}/usr/man/man5/ftpusers.5*
-  rm ${pkgdir}/usr/man/man5/login.access.5*
-  # and some more
-  rm ${pkgdir}/usr/bin/mk_cmds
-  rm ${pkgdir}/usr/include/ss/ss.h
-  rm ${pkgdir}/usr/lib/libss.a
-  rm ${pkgdir}/usr/lib/libss.so
+  rm ${pkgdir}/usr/share/man/man5/ftpusers.5*
+  rm ${pkgdir}/usr/share/man/man5/login.access.5*
+  rm ${pkgdir}/usr/share/info/dir
 
   # install the license
   install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \