Sun Feb 1 21:39:44 2009 UTC ()
heimdal leaves empty directories after deinstallation, fix that.

OK by wiz@.


(shattered)
diff -r1.71 -r1.72 pkgsrc/security/heimdal/Makefile
diff -r1.16 -r1.17 pkgsrc/security/heimdal/PLIST
cvs diff -r1.71 -r1.72 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2008/05/14 18:01:26 1.71
+++ pkgsrc/security/heimdal/Makefile 2009/02/01 21:39:43 1.72
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.71 2008/05/14 18:01:26 jwise Exp $ 1# $NetBSD: Makefile,v 1.72 2009/02/01 21:39:43 shattered Exp $
2 2
3DISTNAME= heimdal-1.1 3DISTNAME= heimdal-1.1
4CATEGORIES= security 4CATEGORIES= security
5MASTER_SITES= http://www.h5l.org/dist/src/ 5MASTER_SITES= http://www.h5l.org/dist/src/
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8MAINTAINER= lha@NetBSD.org 8MAINTAINER= lha@NetBSD.org
9HOMEPAGE= http://www.h5l.org/ 9HOMEPAGE= http://www.h5l.org/
10COMMENT= Kerberos 5 implementation 10COMMENT= Kerberos 5 implementation
11 11
12CONFLICTS+= arla-[0-9]* 12CONFLICTS+= arla-[0-9]*
13CONFLICTS+= mit-krb5-[0-9]* 13CONFLICTS+= mit-krb5-[0-9]*
14CONFLICTS+= openafs-[0-9]* 14CONFLICTS+= openafs-[0-9]*
15CONFLICTS+= gss-[0-9]* 15CONFLICTS+= gss-[0-9]*
16 16
17#LICENSE= modified-bsd 17#LICENSE= modified-bsd
18 18
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
@@ -55,27 +55,27 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.readlin @@ -55,27 +55,27 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.readlin
55 55
56PLIST_VARS+= afskauth hcrypto 56PLIST_VARS+= afskauth hcrypto
57.if ${OPSYS} == "IRIX" 57.if ${OPSYS} == "IRIX"
58PLIST.afskauth= yes 58PLIST.afskauth= yes
59.endif 59.endif
60.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" 60.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != ""
61PLIST.hcrypto= yes 61PLIST.hcrypto= yes
62.endif 62.endif
63 63
64OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700 64OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700
65SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 65SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
66SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 66SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
67RCD_SCRIPTS= kadmind kcm kdc kpasswdd 67RCD_SCRIPTS= kadmind kcm kdc kpasswdd
68INFO_FILES= # PLIST 68INFO_FILES= yes
69 69
70# Dynamically determine the "replacement" headers for bits needed by 70# Dynamically determine the "replacement" headers for bits needed by
71# Heimdal but are missing in the base system and add them to the PLIST. 71# Heimdal but are missing in the base system and add them to the PLIST.
72# 72#
73GENERATE_PLIST+= \ 73GENERATE_PLIST+= \
74 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ 74 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \
75 ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); \ 75 ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," ); \
76 ${ECHO} "@dirrm include/krb5"; 76 ${ECHO} "@dirrm include/krb5";
77 77
78.include "../../devel/readline/buildlink3.mk" 78.include "../../devel/readline/buildlink3.mk"
79.include "../../security/openssl/buildlink3.mk" 79.include "../../security/openssl/buildlink3.mk"
80.include "../../mk/bdb.buildlink3.mk" 80.include "../../mk/bdb.buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/security/heimdal/PLIST (expand / switch to unified diff)

--- pkgsrc/security/heimdal/PLIST 2008/05/14 18:01:26 1.16
+++ pkgsrc/security/heimdal/PLIST 2009/02/01 21:39:44 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2008/05/14 18:01:26 jwise Exp $ 1@comment $NetBSD: PLIST,v 1.17 2009/02/01 21:39:44 shattered Exp $
2bin/afslog 2bin/afslog
3bin/compile_et 3bin/compile_et
4bin/gss 4bin/gss
5bin/hxtool 5bin/hxtool
6bin/kauth 6bin/kauth
7bin/kdestroy 7bin/kdestroy
8bin/kf 8bin/kf
9bin/kftp 9bin/kftp
10bin/kgetcred 10bin/kgetcred
11bin/kinit 11bin/kinit
12bin/klist 12bin/klist
13bin/kpasswd 13bin/kpasswd
14bin/krb5-config 14bin/krb5-config
@@ -822,15 +822,18 @@ man/man8/${KRB5_PREFIX}rshd.8 @@ -822,15 +822,18 @@ man/man8/${KRB5_PREFIX}rshd.8
822man/man8/${KRB5_PREFIX}telnetd.8 822man/man8/${KRB5_PREFIX}telnetd.8
823man/man8/string2key.8 823man/man8/string2key.8
824man/man8/verify_krb5_conf.8 824man/man8/verify_krb5_conf.8
825sbin/iprop-log 825sbin/iprop-log
826sbin/kadmin 826sbin/kadmin
827sbin/kstash 827sbin/kstash
828sbin/ktutil 828sbin/ktutil
829${PLIST.ldap}share/examples/heimdal/hdb.schema 829${PLIST.ldap}share/examples/heimdal/hdb.schema
830share/examples/rc.d/kadmind 830share/examples/rc.d/kadmind
831share/examples/rc.d/kcm 831share/examples/rc.d/kcm
832share/examples/rc.d/kdc 832share/examples/rc.d/kdc
833share/examples/rc.d/kpasswdd 833share/examples/rc.d/kpasswdd
834${PLIST.ldap}@dirrm share/examples/heimdal 834${PLIST.ldap}@dirrm share/examples/heimdal
835@dirrm include/krb5/kadm5 
836@dirrm include/krb5/ss 835@dirrm include/krb5/ss
 836@dirrm include/krb5/roken
 837@dirrm include/krb5/krb5
 838@dirrm include/krb5/kadm5
 839@dirrm include/krb5/gssapi