Update to gnupg-devel-1.9.11nb1:

- Derive PKGNAME from DISTNAME.
- Move PKG_INSTALLATION_TYPES where it belongs.
- Sort USE_* and include sections alphabetically.
- Put CONFIGURE_ARGS in its own section.
- Fix indentation for TEST_TARGET line.
- No need to use LIBTOOL_OVERRIDE.
- No need to use BUILD_USES_MSGFMT; the distfile comes with prebuilt .gmo
  files.
- No need to use GNU make.
- Add missing dependencies on libiconv and gettext-lib.
- Drop logic to detect the actual installed version of gettext.  It was
  wrong because it relied on the current state of the system, thus possibly
  leading to different results depending on package installation order.
  Instead, just include gettext-lib's buildlink3.mk file, so that the
  'builtin' machinery does everything for us.
- Move the definition of PKG_OPTIONS_VAR and friends to its own section.
  While here, add a comment saying that it might be possible to avoid this
  option by creating a new package that includes the extra files installed
  when it's enabled.  (Not doing now because I'm not sure it's possible
  yet.)
- Use PLIST_SRC correctly to handle multiple PLIST chunks instead of
  manually creating a file inside WRKSRC.
- Remove empty directories from PLIST.gpgsm.

3 files changed, 31 insertions, 43 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 1eb24afed1f..4639ac9a8be 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/10/24 09:03:17 shannonjr Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 22:20:17 jmmv Exp $
 #
 
 DISTNAME=		gnupg-1.9.11
-PKGNAME=		gnupg-devel-1.9.11
+PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
 
@@ -10,46 +11,35 @@ MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
 COMMENT=		Utility programs that come with GnuPG 1.9 (experimental branch)
 
-BUILD_USES_MSGFMT=      yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-.include "../../mk/bsd.prefs.mk"
+GNU_CONFIGURE=		yes
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 
-USE_BUILDLINK3=         yes
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_PKGLOCALEDIR=       yes
-USE_LIBTOOL=            yes
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
-GNU_CONFIGURE=          yes
-USE_GNU_TOOLS+=         make
-CRYPTO=                 yes
-CONFIGURE_ARGS+=        --with-static-rnd=auto
-CONFIGURE_ARGS+=        --without-included-gettext
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+CONFIGURE_ARGS+=	--with-static-rnd=auto
+CONFIGURE_ARGS+=	--without-included-gettext
 
-TEST_TARGET=            check
+TEST_TARGET=		check
 
-# We need gettext-lib >= 0.14.1 for NLS support
-.include "../../devel/gettext-lib/buildlink3.mk"
-GETTEXT_IS_TOO_OLD!=if ${PKG_ADMIN} pmatch 'gettext-lib < 0.14.1' gettext-lib ; then \
-		${ECHO} "yes";	\
-	else 	\
-		${ECHO} "no";	\
-	fi
-.if GETTEXT_IS_TOO_OLD
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+# XXX It looks like that gpgsm support could be splitted in its own package,
+# according to the configure script.  If that's true, this use of the options
+# framework is incorrect and should be fixed.
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
+PKG_SUPPORTED_OPTIONS=	gpgsm
+.include "../../mk/bsd.options.mk"
 
 ## If no options are specified, only gpg-agent is built. This
 ## is sufficient for OpenPGP/MIME support in Kmail
 ## SMIME support is provided by gpgsm. This support is 
 ## in the alpha stage of development. 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS=	gpgsm
-.include "../../mk/bsd.options.mk"
+PLIST_SRC=	${.CURDIR}/PLIST
 .if empty(PKG_OPTIONS:Mgpgsm)
 CONFIGURE_ARGS+=	--enable-agent-only
 .else
-.include "../../security/dirmngr/buildlink3.mk"
+PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
+.  include "../../security/dirmngr/buildlink3.mk"
 .endif
 
 # This package will only build with pth
@@ -58,20 +48,14 @@ CONFIGURE_ARGS+=	--enable-agent-only
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
-post-install:
-	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-.if !GETTEXT_IS_TOO_OLD
-	${ECHO} '${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg2.mo >>${PLIST_SRC}
-.endif
-.if !empty(PKG_OPTIONS:Mgpgsm)
-	${CAT} -f ${PKGDIR}/PLIST.gpgsm >> ${PLIST_SRC}
-.endif
-
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
-.include "../../security/libgpg-error/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libassuan/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
 .include "../../security/pinentry/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg-devel/PLIST b/security/gnupg-devel/PLIST
index 564df201707..aa84bc5ee29 100644
--- a/security/gnupg-devel/PLIST
+++ b/security/gnupg-devel/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2004/10/23 14:46:16 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/05 22:20:17 jmmv Exp $
 bin/gpg-agent
 bin/gpgconf
 bin/watchgnupg
 info/gnupg.info
 libexec/gpg-protect-tool
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnupg2.mo
 sbin/addgnupghome
diff --git a/security/gnupg-devel/PLIST.gpgsm b/security/gnupg-devel/PLIST.gpgsm
index d56dcab95f6..9e14f3f04c4 100644
--- a/security/gnupg-devel/PLIST.gpgsm
+++ b/security/gnupg-devel/PLIST.gpgsm
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST.gpgsm,v 1.2 2004/11/05 22:20:17 jmmv Exp $
 bin/gpg2
 bin/gpgsm
 bin/gpgv2
@@ -7,3 +8,5 @@ bin/sc-investigate
 bin/scdaemon
 lib/gnupg/pcsc-wrapper
 share/gnupg/gpg-conf.skel
+@dirrm share/gnupg
+@dirrm lib/gnupg