summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-20 18:15:37 +0000
committerjlam <jlam@pkgsrc.org>2006-03-20 18:15:37 +0000
commit741aecb60794fe08a7a2c61bfcc516bee56c6a2b (patch)
tree0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /security
parent6132a5c7603ce3eb9c6eaaf83c45b47f9e30fa6d (diff)
downloadpkgsrc-741aecb60794fe08a7a2c61bfcc516bee56c6a2b.tar.gz
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead. * Properly account for split info files during installation. * Move info file listings directly into the package PLISTs. This fixes info-file-related PLIST problems.
Diffstat (limited to 'security')
-rw-r--r--security/mit-krb5/Makefile18
-rw-r--r--security/mit-krb5/PLIST6
2 files changed, 12 insertions, 12 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index df7e5276735..9dd622f0aaf 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/14 16:00:41 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2006/03/20 18:15:38 jlam Exp $
DISTNAME= krb5-1.4.2
PKGNAME= mit-${DISTNAME:S/-signed$//}
@@ -70,14 +70,14 @@ SUBST_STAGE.mit-krb5= pre-configure
SUBST_FILES.mit-krb5= appl/bsd/Makefile.in include/krb5/stock/osconf.h
SUBST_SED.mit-krb5= -e "/KRB5_PATH_RLOGIN/s,/rlogin,/${KRB5_PREFIX}rlogin,g"
-INFO_FILES= krb425.info krb5-admin.info krb5-install.info krb5-user.info
+INFO_FILES= # PLIST
OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \
${ROOT_USER} ${ROOT_GROUP} 0700
RCD_SCRIPTS= kadmind kdc
-INSTALLATION_DIRS= bin include/gssapi include/gssrpc info lib \
- man/man1 man/man5 man/man8 sbin \
+INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \
+ lib man/man1 man/man5 man/man8 sbin \
share/examples/krb5
# The MIT krb5 distribution is actually a tar file that contains the
@@ -96,13 +96,9 @@ pre-configure:
done
post-install:
- cd ${WRKSRC}/../doc; for i in ${INFO_FILES}; do \
- ${INSTALL_MAN} $$i ${PREFIX}/${INFO_DIR}; \
- for f in $$i-[0-9]*; do \
- if ${TEST} -f "$$f"; then \
- ${INSTALL_MAN} "$$f" ${PREFIX}/${INFO_DIR}; \
- fi; \
- done; \
+ cd ${WRKSRC}/../doc; for f in *.info *.info-[0-9]*; do \
+ ${TEST} ! -f "$$f" || \
+ ${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR}; \
done
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mit-krb5/PLIST b/security/mit-krb5/PLIST
index fd7913d6bbd..689600a6dd7 100644
--- a/security/mit-krb5/PLIST
+++ b/security/mit-krb5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/05/13 03:54:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $
bin/compile_et
bin/gss-client
bin/kdestroy
@@ -38,6 +38,10 @@ include/gssrpc/types.h
include/gssrpc/xdr.h
include/krb5.h
include/profile.h
+info/krb425.info
+info/krb5-admin.info
+info/krb5-install.info
+info/krb5-user.info
lib/libcom_err.la
lib/libdes425.la
lib/libgssapi_krb5.la