List the info pages directly in the PLIST and ensure that we honor

PKGINFODIR.

22 files changed, 44 insertions, 40 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 9c7afa28ce9..4607fb0e64b 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 23:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
@@ -23,6 +23,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk
 USE_PKGLOCALEDIR=	yes
 RCD_SCRIPTS=		dirmngr
+INFO_FILES=		# PLIST
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
@@ -58,8 +59,6 @@ post-build:
 post-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${PREFIX}/sbin
 
-INFO_FILES=		dirmngr.info
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/dirmngr/PLIST b/security/dirmngr/PLIST
index bb4e2de6a56..a86a1b47c99 100644
--- a/security/dirmngr/PLIST
+++ b/security/dirmngr/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:20:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:29 jlam Exp $
 bin/dirmngr
 bin/dirmngr-client
+info/dirmngr.info
 libexec/dirmngr_ldap
 sbin/runDirmngr
 share/examples/rc.d/dirmngr
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 2986561e9e6..1472c0ad774 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/09 17:25:54 cube Exp $
+# $NetBSD: Makefile,v 1.47 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	gnutls-1.3.5
 CATEGORIES=	security devel
@@ -19,8 +19,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
-
-INFO_FILES=		gnutls.info
+INFO_FILES=		# PLIST
 
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
diff --git a/security/gnutls/PLIST b/security/gnutls/PLIST
index 0d5434f0d7a..96893180635 100644
--- a/security/gnutls/PLIST
+++ b/security/gnutls/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/03/09 17:25:54 cube Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/03/31 23:56:29 jlam Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -14,6 +14,7 @@ include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
+info/gnutls.info
 lib/libgnutls-extra.la
 lib/libgnutls-openssl.la
 lib/libgnutls.la
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 0d9ce00da58..026d40b2f0a 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/01 16:22:20 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	gpgme-1.0.3
@@ -16,6 +16,7 @@ DEPENDS+=		gnupg>=1.2.2:../../security/gnupg
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
+INFO_FILES=		# PLIST
 
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	gpgme/gpgme-config.in
@@ -44,8 +45,6 @@ TEST_TARGET=		check
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-INFO_FILES=		gpgme.info
-
 .include "../../security/libgpg-error/buildlink3.mk"
 
 # we want the getenv_r() semantics of NetBSD-current
diff --git a/security/gpgme/PLIST b/security/gpgme/PLIST
index f936292a9df..e3c771310d0 100644
--- a/security/gpgme/PLIST
+++ b/security/gpgme/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/03/31 23:56:29 jlam Exp $
 bin/gpgme-config
 include/gpgme.h
+info/gpgme.info
 lib/libgpgme-pthread.la
 lib/libgpgme.la
 share/aclocal/gpgme.m4
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 6505c8b8289..b634714ae12 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=		gsasl-0.2.5
 PKGREVISION=		1
@@ -18,12 +18,11 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 TEST_TARGET=		check
 
-INFO_FILES=		gsasl.info
-
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 PKGCONFIG_OVERRIDE+=    libgsasl.pc.in
+INFO_FILES=		# PLIST
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
diff --git a/security/gsasl/PLIST b/security/gsasl/PLIST
index bb591799b81..c19523cb02a 100644
--- a/security/gsasl/PLIST
+++ b/security/gsasl/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2005/02/28 13:29:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/03/31 23:56:29 jlam Exp $
 bin/gsasl
 include/gsasl-compat.h
 include/gsasl-mech.h
 include/gsasl.h
+info/gsasl.info
 lib/libgsasl.la
 lib/pkgconfig/libgsasl.pc
 man/man1/gsasl.1
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 7aafccb4bb9..771909d5ee5 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/31 23:44:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		gss-0.0.15
@@ -17,9 +17,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+INFO_FILES=		# PLIST
 
 PKGCONFIG_OVERRIDE+=    gss.pc.in
 
-INFO_FILES=		gss.info
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gss/PLIST b/security/gss/PLIST
index 280f02a880d..59fe5bc946d 100644
--- a/security/gss/PLIST
+++ b/security/gss/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/31 23:56:29 jlam Exp $
 bin/gss
 include/gss.h
 include/gss/api.h
 include/gss/ext.h
+info/gss.info
 lib/libgss.la
 lib/pkgconfig/gss.pc
 man/man1/gss.1
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index bba154cbf41..aa852a3081d 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/20 23:01:03 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -42,8 +42,7 @@ CONFIGURE_ARGS+=	--program-transform=${KTH_KRB4_TRANSFORM:Q}
 MANINSTALL=		maninstall
 .endif
 
-INFO_FILES=		kth-krb.info
-
+INFO_FILES=		# PLIST
 EXAMPLEDIR=		${PREFIX}/share/examples/kth-krb4
 
 # this hangs while compiling one of the files, at least with the
diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST
index b81a676741c..286d7b4bd42 100644
--- a/security/kth-krb4/PLIST
+++ b/security/kth-krb4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/02/20 23:01:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/31 23:56:29 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/k4ftp
@@ -67,6 +67,7 @@ include/kerberosIV/sha.h
 include/kerberosIV/sl.h
 include/kerberosIV/ss/ss.h
 include/kerberosIV/xdbm.h
+info/kth-krb.info
 lib/libacl.la
 lib/libcom_err.la
 lib/libdes.la
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index 8b53aee2914..a427b364bc9 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		libassuan-0.6.10
@@ -13,8 +13,7 @@ COMMENT=		The IPC library used by some GnuPG related software
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-
-INFO_FILES=		assuan.info
+INFO_FILES=		# PLIST
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
diff --git a/security/libassuan/PLIST b/security/libassuan/PLIST
index 7952df0de44..ad855f265e6 100644
--- a/security/libassuan/PLIST
+++ b/security/libassuan/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 17:00:51 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/31 23:56:29 jlam Exp $
 bin/libassuan-config
 include/assuan.h
+info/assuan.info
 lib/libassuan.a
 share/aclocal/libassuan.m4
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 19bbb390415..e8751ce7c9a 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/31 23:56:29 jlam Exp $
 
 DISTNAME=	libgcrypt-1.2.2
 PKGREVISION=	1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		yes
 TEST_TARGET=		check
 
 TEXINFO_REQD=		4.0
-INFO_FILES=		gcrypt.info
+INFO_FILES=		# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index 0a06bfa908d..ba921886811 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/31 23:56:29 jlam Exp $
 bin/libgcrypt-config
 include/gcrypt-module.h
 include/gcrypt.h
+info/gcrypt.info
 lib/libgcrypt.la
 share/aclocal/libgcrypt.m4
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 701e924eb93..3cb21acd8c5 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	libksba-0.9.13
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	YES
 TEST_TARGET=	check
 
 TEXINFO_REQD=	4.0
-INFO_FILES=	ksba.info
+INFO_FILES=	# PLIST
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/libksba/PLIST b/security/libksba/PLIST
index 5db775545b4..98f5de6dc2f 100644
--- a/security/libksba/PLIST
+++ b/security/libksba/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/31 23:56:29 jlam Exp $
 bin/ksba-config
 include/ksba.h
+info/ksba.info
 lib/libksba.la
 share/aclocal/ksba.m4
diff --git a/security/libksba04/Makefile b/security/libksba04/Makefile
index ffe7dd93bfc..f38d46b79fd 100644
--- a/security/libksba04/Makefile
+++ b/security/libksba04/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=	libksba-0.4.7
@@ -16,6 +16,6 @@ GNU_CONFIGURE=	YES
 TEST_TARGET=	check
 
 TEXINFO_REQD=	4.0
-INFO_FILES=	ksba.info
+INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libksba04/PLIST b/security/libksba04/PLIST
index 5db775545b4..98f5de6dc2f 100644
--- a/security/libksba04/PLIST
+++ b/security/libksba04/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/31 23:56:29 jlam Exp $
 bin/ksba-config
 include/ksba.h
+info/ksba.info
 lib/libksba.la
 share/aclocal/ksba.m4
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 8480c14175e..c401ffe1b6a 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:29 jlam Exp $
 #
 
 DISTNAME=		pinentry-0.7.1
@@ -13,7 +13,7 @@ COMMENT=		Applications for entering PINs or Passphrases
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 
-INFO_FILES=		pinentry.info
+INFO_FILES=		# PLIST
 
 # XXX This usage of bsd.options.mk is wrong and has to be fixed.  The
 # package has to be splitted into different packages, such as pinentry-gtk
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index 861562fa09c..e99f26b0dd7 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/05 17:19:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/31 23:56:29 jlam Exp $
 bin/pinentry-curses
+info/pinentry.info
 ${USE_GTK}bin/pinentry-gtk
 ${USE_QT}bin/pinentry-qt