From 0096c3d15ddef1337b3c1c4d5e37c9930c91ba4f Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 24 Mar 2011 05:38:01 +0000 Subject: * fix make target dependency to man page aliases (arg_printusage.3) will be always installed. * add user-destdir installation support. --- security/kth-krb4/Makefile | 22 +++++++++++++++------- security/kth-krb4/PLIST | 3 ++- security/kth-krb4/distinfo | 4 +++- .../kth-krb4/patches/patch-cf_Makefile.am.common | 15 +++++++++++++++ .../kth-krb4/patches/patch-lib_roken_Makefile.in | 15 +++++++++++++++ 5 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 security/kth-krb4/patches/patch-cf_Makefile.am.common create mode 100644 security/kth-krb4/patches/patch-lib_roken_Makefile.in diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 5d367fadc86..1c7f6ec8d3f 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2010/01/17 12:02:41 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2011/03/24 05:38:01 obache Exp $ # DISTNAME= krb4-1.2.2 @@ -14,6 +14,8 @@ COMMENT= Kerberos IV distribution from KTH CONFLICTS+= arla-[0-9]* CONFLICTS+= libdes-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + CRYPTO= yes USE_LIBTOOL= yes @@ -67,12 +69,18 @@ CONFIGURE_ARGS+= --with-readline=yes \ PLIST_VARS+= glob post-install: - ${INSTALL_DATA_DIR} ${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${EXAMPLEDIR} - ${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${EXAMPLEDIR} - ${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${EXAMPLEDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${DESTDIR}${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/krb.realms ${DESTDIR}${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/inetd.conf.changes ${DESTDIR}${EXAMPLEDIR} + ${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${DESTDIR}${EXAMPLEDIR} + ${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${DESTDIR}${EXAMPLEDIR} + +SPECIAL_PERMS+= bin/${KRB4_PREFIX}rsh ${SETUID_ROOT_PERMS} +SPECIAL_PERMS+= bin/${KRB4_PREFIX}rcp ${SETUID_ROOT_PERMS} +SPECIAL_PERMS+= bin/${KRB4_PREFIX}rlogin ${SETUID_ROOT_PERMS} +SPECIAL_PERMS+= bin/${KRB4_PREFIX}su ${SETUID_ROOT_PERMS} +SPECIAL_PERMS+= bin/otp ${SETUID_ROOT_PERMS} .include "../../security/openssl/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST index 3470d128c42..6a7be75f270 100644 --- a/security/kth-krb4/PLIST +++ b/security/kth-krb4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2011/03/23 20:56:49 zafer Exp $ +@comment $NetBSD: PLIST,v 1.17 2011/03/24 05:38:01 obache Exp $ bin/afslog bin/compile_et bin/k4ftp @@ -124,6 +124,7 @@ man/man1/rxterm.1 man/man1/tenletxr.1 man/man1/xnlock.1 man/man3/acl_check.3 +man/man3/arg_printusage.3 man/man3/des_crypt.3 man/man3/editline.3 man/man3/getarg.3 diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo index a1e0fba1038..50fa777f4af 100644 --- a/security/kth-krb4/distinfo +++ b/security/kth-krb4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2008/09/17 16:11:28 joerg Exp $ +$NetBSD: distinfo,v 1.13 2011/03/24 05:38:01 obache Exp $ SHA1 (krb4-1.2.2.tar.gz) = 41379763161d0b94646adb8847b83f92e5c985a4 RMD160 (krb4-1.2.2.tar.gz) = 585f19767c610c31ca5be59d8cf61724739969f1 @@ -10,3 +10,5 @@ SHA1 (patch-ad) = 48ebf93893662ecc10e56e0653351f80359b12b0 SHA1 (patch-ae) = 654d92268a6c693d566acde1a7c881dc6dea2166 SHA1 (patch-ah) = 5d09fc774b0d35070036aebd1339b32ed38137de SHA1 (patch-ai) = dc9db52ff819cc08753e8fe98397187df1dd0310 +SHA1 (patch-cf_Makefile.am.common) = 259477799fd5c473ec6561c1046dd5977eb58cdb +SHA1 (patch-lib_roken_Makefile.in) = 2d29e181a45ba5618f409fe41ecd0c1e7e6b895b diff --git a/security/kth-krb4/patches/patch-cf_Makefile.am.common b/security/kth-krb4/patches/patch-cf_Makefile.am.common new file mode 100644 index 00000000000..13b97526131 --- /dev/null +++ b/security/kth-krb4/patches/patch-cf_Makefile.am.common @@ -0,0 +1,15 @@ +$NetBSD: patch-cf_Makefile.am.common,v 1.1 2011/03/24 05:38:01 obache Exp $ + +* require install-man before install-cat-mans to create alias links. + +--- cf/Makefile.am.common.orig 2002-08-19 16:10:25.000000000 +0000 ++++ cf/Makefile.am.common +@@ -187,7 +187,7 @@ dist-cat8-mans: + + dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans + +-install-cat-mans: ++install-cat-mans: install-man + $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) + + install-data-local: install-cat-mans diff --git a/security/kth-krb4/patches/patch-lib_roken_Makefile.in b/security/kth-krb4/patches/patch-lib_roken_Makefile.in new file mode 100644 index 00000000000..6432b5e7ba7 --- /dev/null +++ b/security/kth-krb4/patches/patch-lib_roken_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_roken_Makefile.in,v 1.1 2011/03/24 05:38:01 obache Exp $ + +* require install-man before install-cat-mans to create alias links. + +--- lib/roken/Makefile.in.orig 2011-03-24 05:23:13.000000000 +0000 ++++ lib/roken/Makefile.in +@@ -1059,7 +1059,7 @@ dist-cat8-mans: + + dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans + +-install-cat-mans: ++install-cat-mans: install-man + $(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS) + + install-data-local: install-cat-mans -- cgit v1.2.3