Sun Feb 7 15:36:58 2010 UTC ()
put the pinentry variants which depend on a toolkit into seperate
pkgs rather than having their build controlled by options
(no change in the default case)


(drochner)
diff -r1.371 -r1.372 pkgsrc/security/Makefile
diff -r1.22 -r1.23 pkgsrc/security/pinentry/Makefile
diff -r1.7 -r1.8 pkgsrc/security/pinentry/PLIST
diff -r1.5 -r1.6 pkgsrc/security/pinentry/options.mk
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk/DESCR
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk/PLIST
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk/distinfo
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk2/DESCR
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk2/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk2/PLIST
diff -r0 -r1.1 pkgsrc/security/pinentry-gtk2/distinfo
diff -r0 -r1.1 pkgsrc/security/pinentry-qt/DESCR
diff -r0 -r1.1 pkgsrc/security/pinentry-qt/Makefile
diff -r0 -r1.1 pkgsrc/security/pinentry-qt/PLIST
diff -r0 -r1.1 pkgsrc/security/pinentry-qt/distinfo
cvs diff -r1.371 -r1.372 pkgsrc/security/Makefile (expand / switch to unified diff)

--- pkgsrc/security/Makefile 2010/01/27 10:32:20 1.371
+++ pkgsrc/security/Makefile 2010/02/07 15:36:58 1.372
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.371 2010/01/27 10:32:20 sno Exp $ 1# $NetBSD: Makefile,v 1.372 2010/02/07 15:36:58 drochner Exp $
2# 2#
3 3
4COMMENT= Security tools 4COMMENT= Security tools
5 5
6SUBDIR+= Bastille 6SUBDIR+= Bastille
7SUBDIR+= CSP 7SUBDIR+= CSP
8SUBDIR+= CoolKey 8SUBDIR+= CoolKey
9SUBDIR+= EasyPG 9SUBDIR+= EasyPG
10SUBDIR+= MyPasswordSafe 10SUBDIR+= MyPasswordSafe
11SUBDIR+= PAM 11SUBDIR+= PAM
12SUBDIR+= aide 12SUBDIR+= aide
13SUBDIR+= aide06 13SUBDIR+= aide06
14SUBDIR+= amap 14SUBDIR+= amap
@@ -239,26 +239,29 @@ SUBDIR+= pam-pwauth_suid @@ -239,26 +239,29 @@ SUBDIR+= pam-pwauth_suid
239SUBDIR+= pam-radius 239SUBDIR+= pam-radius
240SUBDIR+= pam-saml 240SUBDIR+= pam-saml
241SUBDIR+= pam_ssh_agent_auth 241SUBDIR+= pam_ssh_agent_auth
242SUBDIR+= pcsc-lite 242SUBDIR+= pcsc-lite
243SUBDIR+= pcsc-tools 243SUBDIR+= pcsc-tools
244SUBDIR+= pgp2 244SUBDIR+= pgp2
245SUBDIR+= pgp5 245SUBDIR+= pgp5
246SUBDIR+= pgpdump 246SUBDIR+= pgpdump
247SUBDIR+= pgpenvelope 247SUBDIR+= pgpenvelope
248SUBDIR+= php-mcrypt 248SUBDIR+= php-mcrypt
249SUBDIR+= php-mhash 249SUBDIR+= php-mhash
250SUBDIR+= php-suhosin 250SUBDIR+= php-suhosin
251SUBDIR+= pinentry 251SUBDIR+= pinentry
 252SUBDIR+= pinentry-gtk
 253SUBDIR+= pinentry-gtk2
 254SUBDIR+= pinentry-qt
252SUBDIR+= pinepgp 255SUBDIR+= pinepgp
253SUBDIR+= pkcs11-helper 256SUBDIR+= pkcs11-helper
254SUBDIR+= pks 257SUBDIR+= pks
255SUBDIR+= policykit 258SUBDIR+= policykit
256SUBDIR+= policykit-gnome 259SUBDIR+= policykit-gnome
257SUBDIR+= polkit-qt 260SUBDIR+= polkit-qt
258SUBDIR+= portsentry 261SUBDIR+= portsentry
259SUBDIR+= prelude-correlator 262SUBDIR+= prelude-correlator
260SUBDIR+= prelude-lml 263SUBDIR+= prelude-lml
261SUBDIR+= prelude-manager 264SUBDIR+= prelude-manager
262SUBDIR+= prelude-pflogger 265SUBDIR+= prelude-pflogger
263SUBDIR+= priv 266SUBDIR+= priv
264SUBDIR+= prngd 267SUBDIR+= prngd
cvs diff -r1.22 -r1.23 pkgsrc/security/pinentry/Makefile (expand / switch to unified diff)

--- pkgsrc/security/pinentry/Makefile 2009/12/15 19:50:47 1.22
+++ pkgsrc/security/pinentry/Makefile 2010/02/07 15:36:58 1.23
@@ -1,27 +1,33 @@ @@ -1,27 +1,33 @@
1# $NetBSD: Makefile,v 1.22 2009/12/15 19:50:47 drochner Exp $ 1# $NetBSD: Makefile,v 1.23 2010/02/07 15:36:58 drochner Exp $
2# 2#
3 3
4DISTNAME= pinentry-0.7.6 4DISTNAME= pinentry-0.7.6
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/
7 7
8MAINTAINER= shannonjr@NetBSD.org 8MAINTAINER= shannonjr@NetBSD.org
9HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/ 9HOMEPAGE= ftp://ftp.gnupg.org/gcrypt/pinentry/
10COMMENT= Applications for entering PINs or Passphrases 10COMMENT= Applications for entering PINs or Passphrases
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} 15CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
16 16
17INFO_FILES= yes 17INFO_FILES= yes
18 18
19.include "options.mk" 19.include "options.mk"
20 20
 21.if defined(PINENTRY_DEFAULT)
 22post-install:
 23 ${LN} -sf ${DESTDIR}${PREFIX}/bin/pinentry-${PINENTRY_DEFAULT} \
 24 ${DESTDIR}${PREFIX}/bin/pinentry
 25.endif
 26
21BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 27BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
22 28
23.include "../../converters/libiconv/buildlink3.mk" 29.include "../../converters/libiconv/buildlink3.mk"
24.include "../../security/libgpg-error/buildlink3.mk" 30.include "../../security/libgpg-error/buildlink3.mk"
25.include "../../security/libksba/buildlink3.mk" 31.include "../../security/libksba/buildlink3.mk"
26.include "../../mk/pthread.buildlink3.mk" 32.include "../../mk/pthread.buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/security/pinentry/PLIST (expand / switch to unified diff)

--- pkgsrc/security/pinentry/PLIST 2008/04/12 22:43:12 1.7
+++ pkgsrc/security/pinentry/PLIST 2010/02/07 15:36:58 1.8
@@ -1,7 +1,4 @@ @@ -1,7 +1,4 @@
1@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.8 2010/02/07 15:36:58 drochner Exp $
2bin/pinentry 2bin/pinentry
3bin/pinentry-curses 3bin/pinentry-curses
4info/pinentry.info 4info/pinentry.info
5${PLIST.gtk}bin/pinentry-gtk 
6${PLIST.gtk2}bin/pinentry-gtk-2 
7${PLIST.qt}bin/pinentry-qt 
cvs diff -r1.5 -r1.6 pkgsrc/security/pinentry/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/security/pinentry/Attic/options.mk 2008/04/12 22:43:12 1.5
+++ pkgsrc/security/pinentry/Attic/options.mk 2010/02/07 15:36:58 1.6
@@ -1,43 +1,30 @@ @@ -1,43 +1,30 @@
1# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $ 1# $NetBSD: options.mk,v 1.6 2010/02/07 15:36:58 drochner Exp $
2# 2#
3 3
4# XXX This usage of bsd.options.mk is incorrect. The package should 4# XXX This usage of bsd.options.mk is incorrect. The package should
5# to be split into three packages 5# to be split into three packages
6# pinentry-curses 6# pinentry-curses
7# pinentry-gtk 7# pinentry-gtk
8# pinentry-qt 8# pinentry-qt
9 9
10PKG_OPTIONS_VAR= PKG_OPTIONS.pinentry 10PKG_OPTIONS_VAR= PKG_OPTIONS.pinentry
11PKG_SUPPORTED_OPTIONS= gtk gtk2 qt 11PKG_SUPPORTED_OPTIONS= gtk gtk2 qt
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 
15 
16.if !empty(PKG_OPTIONS:Mgtk) 
17CONFIGURE_ARGS+= --enable-pinentry-gtk 
18PLIST.gtk= yes 
19. include "../../x11/gtk/buildlink3.mk" 
20.else 
21CONFIGURE_ARGS+= --disable-pinentry-gtk 14CONFIGURE_ARGS+= --disable-pinentry-gtk
 15.if !empty(PKG_OPTIONS:Mgtk)
 16DEPENDS+= pinentry-gtk-[0-9]*:../../security/pinentry-gtk
 17PINENTRY_DEFAULT= gtk
22.endif 18.endif
23 19
24.if !empty(PKG_OPTIONS:Mgtk2) 
25CONFIGURE_ARGS+= --enable-pinentry-gtk2 
26PLIST.gtk2= yes 
27. include "../../x11/gtk2/buildlink3.mk" 
28.else 
29CONFIGURE_ARGS+= --disable-pinentry-gtk2 20CONFIGURE_ARGS+= --disable-pinentry-gtk2
 21.if !empty(PKG_OPTIONS:Mgtk2)
 22DEPENDS+= pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
 23PINENTRY_DEFAULT= gtk2
30.endif 24.endif
31 25
32.if !empty(PKG_OPTIONS:Mqt) 
33USE_LANGUAGES+= c c++ 
34USE_TOOLS+= gmake 
35CONFIGURE_ARGS+= --enable-pinentry-qt 
36CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} 
37CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include 
38CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib 
39PLIST.qt= yes 
40. include "../../x11/qt3-libs/buildlink3.mk" 
41.else 
42CONFIGURE_ARGS+= --disable-pinentry-qt 26CONFIGURE_ARGS+= --disable-pinentry-qt
 27.if !empty(PKG_OPTIONS:Mqt)
 28DEPENDS+= pinentry-qt-[0-9]*:../../security/pinentry-qt
 29PINENTRY_DEFAULT= qt
43.endif 30.endif
File Added: pkgsrc/security/pinentry-gtk/Attic/DESCR
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.
File Added: pkgsrc/security/pinentry-gtk/Attic/Makefile
# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
#

DISTNAME=		pinentry-0.7.6
PKGNAME=		pinentry-gtk-0.7.6
CATEGORIES=		security
MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/

MAINTAINER=		shannonjr@NetBSD.org
HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
COMMENT=		Applications for entering PINs or Passphrases

PKG_DESTDIR_SUPPORT=	user-destdir

GNU_CONFIGURE=		yes
CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+=	--enable-pinentry-gtk
CONFIGURE_ARGS+=	--disable-pinentry-curses
#CONFIGURE_ARGS+=	--disable-fallback-curses
CONFIGURE_ARGS+=	--disable-pinentry-gtk2
CONFIGURE_ARGS+=	--disable-pinentry-qt
CONFIGURE_ARGS+=	--disable-pinentry-qt4

INFO_FILES=		yes

INSTALL_DIRS=		gtk

BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
.include "../../x11/gtk/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/security/pinentry-gtk/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
bin/pinentry-gtk
File Added: pkgsrc/security/pinentry-gtk/Attic/distinfo
$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $

SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
Size (pinentry-0.7.6.tar.gz) = 475101 bytes
File Added: pkgsrc/security/pinentry-gtk2/DESCR
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.
File Added: pkgsrc/security/pinentry-gtk2/Makefile
# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
#

DISTNAME=		pinentry-0.7.6
PKGNAME=		pinentry-gtk2-0.7.6
CATEGORIES=		security
MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/

MAINTAINER=		shannonjr@NetBSD.org
HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
COMMENT=		Applications for entering PINs or Passphrases

PKG_DESTDIR_SUPPORT=	user-destdir

GNU_CONFIGURE=		yes
CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+=	--enable-pinentry-gtk2
CONFIGURE_ARGS+=	--disable-pinentry-curses
#CONFIGURE_ARGS+=	--disable-fallback-curses
CONFIGURE_ARGS+=	--disable-pinentry-gtk
CONFIGURE_ARGS+=	--disable-pinentry-qt
CONFIGURE_ARGS+=	--disable-pinentry-qt4

INFO_FILES=		yes

INSTALL_DIRS=		gtk+-2

BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
.include "../../x11/gtk2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/security/pinentry-gtk2/PLIST
@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
bin/pinentry-gtk-2
File Added: pkgsrc/security/pinentry-gtk2/Attic/distinfo
$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $

SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
Size (pinentry-0.7.6.tar.gz) = 475101 bytes
File Added: pkgsrc/security/pinentry-qt/Attic/DESCR
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.
File Added: pkgsrc/security/pinentry-qt/Attic/Makefile
# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
#

DISTNAME=		pinentry-0.7.6
PKGNAME=		pinentry-qt-0.7.6
CATEGORIES=		security
MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/

MAINTAINER=		shannonjr@NetBSD.org
HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
COMMENT=		Applications for entering PINs or Passphrases

PKG_DESTDIR_SUPPORT=	user-destdir

GNU_CONFIGURE=		yes
CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+=	--enable-pinentry-qt
CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR:Q}
CONFIGURE_ARGS+=	--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
CONFIGURE_ARGS+=	--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib
CONFIGURE_ARGS+=	--disable-pinentry-curses
#CONFIGURE_ARGS+=	--disable-fallback-curses
CONFIGURE_ARGS+=	--disable-pinentry-gtk
CONFIGURE_ARGS+=	--disable-pinentry-gtk2
CONFIGURE_ARGS+=	--disable-pinentry-qt4

USE_LANGUAGES+=		c c++
USE_TOOLS+=		gmake
INFO_FILES=		yes

INSTALL_DIRS=		qt

BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
#.include "../../security/libgpg-error/buildlink3.mk"
#.include "../../security/libksba/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/security/pinentry-qt/Attic/PLIST
@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
bin/pinentry-qt
File Added: pkgsrc/security/pinentry-qt/Attic/distinfo
$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $

SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
Size (pinentry-0.7.6.tar.gz) = 475101 bytes