Multiple cleanups:

- Move PKG_INSTALLATION_TYPES where it belongs.
- No need to use GNU make.
- No locales provided, so remove USE_PKGLOCALEDIR definition.
- Add a note telling that the usage of bsd.options.mk in this package is
  a hack and should be fixed (i.e., splitting the package in different
  ones).
- Get rid of the ugly PLIST handling.  (Anyway, the 'new' solution, based
  on PLIST_SUBST as usual, has to go away when the previous point is fixed.)
- Reword DESCR, based on the included README.
- Install info file correctly and bump PKGREVISION to 1 because of this.

3 files changed, 30 insertions, 24 deletions

diff --git a/security/pinentry/DESCR b/security/pinentry/DESCR
index ebb1d93ed80..eca2e9c1210 100644
--- a/security/pinentry/DESCR
+++ b/security/pinentry/DESCR
@@ -1,3 +1,4 @@
-A module that contains various interfaces
-(qt, gtk, curses, terminal) to enter a
-PIN/passphrase. 
+This is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+It provides programs for several graphical toolkits, such as GTK+ and
+QT, as well as for the console, using curses.
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 1465e49d4d2..1eea9f43c41 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/10/24 08:58:01 shannonjr Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/05 17:19:54 jmmv Exp $
 #
 
 DISTNAME=		pinentry-0.7.1
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/
 
@@ -9,33 +10,36 @@ MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
 COMMENT=		Applications for entering PINs or Passphrases
 
-USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+USE_BUILDLINK3=		yes
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.pinentry
-PKG_SUPPORTED_OPTIONS=  qt gtk
+INFO_FILES=		pinentry.info
+
+# 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
+# and pinentry-qt, so that the frontends can be built on their own and
+# can be distributed in different binary packages.
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pinentry
+PKG_SUPPORTED_OPTIONS=	gtk qt
 .include "../../mk/bsd.options.mk"
 
-post-install:
-	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-.if !empty(PKG_OPTIONS:Mqt)
-	${ECHO} "bin/pinentry-qt" >>${PLIST_SRC}
-.endif
 .if !empty(PKG_OPTIONS:Mgtk)
-	${ECHO} "bin/pinentry-gtk" >>${PLIST_SRC}
+PLIST_SUBST+=		USE_GTK=
+.  include "../../x11/gtk/buildlink3.mk"
+.else
+PLIST_SUBST+=		USE_GTK='@comment '
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt)
+PLIST_SUBST+=		USE_QT=
+.  include "../../x11/qt3-libs/buildlink3.mk"
+.else
+PLIST_SUBST+=		USE_QT='@comment '
 .endif
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
-.if !empty(PKG_OPTIONS:Mqt)
-.include "../../x11/qt3-libs/buildlink3.mk"
-.endif
-.if !empty(PKG_OPTIONS:Mgtk)
-.include "../../x11/gtk/buildlink3.mk"
-.endif
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index 660faf88852..861562fa09c 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2004/10/23 13:30:10 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/05 17:19:54 jmmv Exp $
 bin/pinentry-curses
-info/pinentry.info
+${USE_GTK}bin/pinentry-gtk
+${USE_QT}bin/pinentry-qt