List the info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

8 files changed, 20 insertions, 15 deletions

diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index 4dd88874918..4d495a9e85e 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/04/07 15:28:49 jlam Exp $
 #
 
 DISTNAME=	fsh-1.2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.lysator.liu.se/fsh/
 COMMENT=	Fast remote command execution
 
 GNU_CONFIGURE=	YES
-INFO_FILES=	fsh.info
+INFO_FILES=	# PLIST
 
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
diff --git a/security/fsh/PLIST b/security/fsh/PLIST
index 440b83b8890..a6f75660e06 100644
--- a/security/fsh/PLIST
+++ b/security/fsh/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/09 23:01:17 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/07 15:28:49 jlam Exp $
 bin/fcp
 bin/fsh
 bin/fshd
 bin/in.fshd
+info/fsh.info
 libexec/fcpwrap
 share/fsh/fsh.py
 share/fsh/fshcompat.py
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8d7aa09ab9a..b120ab0d405 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2006/04/04 21:16:37 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2006/04/07 15:28:49 jlam Exp $
 
 DISTNAME=	gnupg-1.4.3
 CATEGORIES=	security
@@ -27,11 +27,10 @@ USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=		check
+INFO_FILES=		# PLIST
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-INFO_FILES=	gpg.info gpgv.info
-
 .include "options.mk"
 
 .if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*))
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index f144d85f1fc..3fa1ad590e8 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.16 2006/04/04 21:16:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/04/07 15:28:49 jlam Exp $
 bin/gpg
 bin/gpg-zip
 bin/gpgsplit
 bin/gpgv
+info/gpg.info
+info/gpgv.info
 libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
diff --git a/security/lsh2/Makefile b/security/lsh2/Makefile
index 155eef3593a..826dce13182 100644
--- a/security/lsh2/Makefile
+++ b/security/lsh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/19 12:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/07 15:28:49 jlam Exp $
 #
 
 DISTNAME=		lsh-2.0.2
@@ -12,6 +12,8 @@ COMMENT=		SSH2 client/server
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gm4
 CONFIGURE_ARGS+=	--disable-openssl --disable-pam
+INFO_FILES=		# PLIST
+
 # lcp test depends on /bin/bash and thus fails, others work
 TEST_TARGET=		check
 
@@ -21,8 +23,6 @@ CONFLICTS+=		openssh-[0-9]* openssh+gssapi-[0-9]*
 # src/nettle/examples/nettle-openssl.c needs des_key*
 USE_OLD_DES_API=	yes
 
-INFO_FILES=		lsh.info nettle.info
-
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/liboop/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/lsh2/PLIST b/security/lsh2/PLIST
index 83377a14685..283ae7e2db3 100644
--- a/security/lsh2/PLIST
+++ b/security/lsh2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/03/14 19:30:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/07 15:28:49 jlam Exp $
 bin/lcp
 bin/lsftp
 bin/lsh
@@ -53,6 +53,8 @@ include/nettle/sexp.h
 include/nettle/sha.h
 include/nettle/twofish.h
 include/nettle/yarrow.h
+info/lsh.info
+info/nettle.info
 lib/libnettle.a
 man/man1/lsftp.1
 man/man1/lsh-authorize.1
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 5e3e27d13d6..1c052e87885 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:28 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -23,6 +23,8 @@ USE_TOOLS+=		makeinfo perl:run
 
 GCC_REQD+=		2.95.3
 
+INFO_FILES=		# PLIST
+
 PKG_USERS=		sfs:sfs::Self-certifying\ file\ system:/
 PKG_GROUPS=		sfs
 PKG_SYSCONFSUBDIR=	sfs
@@ -40,8 +42,6 @@ SFSEXAMPLEDIR=		${PREFIX}/share/examples/sfs
 
 MESSAGE_SUBST+=		SFSDIR=${SFS_ROOT} SFSEXAMPLEDIR=${SFSEXAMPLEDIR}
 
-INFO_FILES=		sfs.info
-
 post-install:
 	${INSTALL_DATA_DIR} ${SFSEXAMPLEDIR}
 	@${SED} -e 's|@SFSDIR@|${SFS_ROOT}|g' ${FILESDIR}/sfsrwsd_config.sample \
diff --git a/security/sfs/PLIST b/security/sfs/PLIST
index dbcf5da28cd..59233c3c463 100644
--- a/security/sfs/PLIST
+++ b/security/sfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/05/03 15:50:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/04/07 15:28:49 jlam Exp $
 bin/dirsearch
 bin/newaid
 bin/rex
@@ -126,6 +126,7 @@ include/${PKGNAME}/xdr_suio.h
 include/${PKGNAME}/xdrmisc.h
 include/${PKGNAME}/xhinfo.h
 include/sfs.h
+info/sfs.info
 lib/libsfs.a
 lib/sfs
 lib/${PKGNAME}/aiod