pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security put the pinentry variants which depend on a t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/94df592a42bc
branches: trunk
changeset: 571056:94df592a42bc
user: drochner <drochner%pkgsrc.org@localhost>
date: Sun Feb 07 15:36:58 2010 +0000
description:
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)
diffstat:
security/Makefile | 5 ++++-
security/pinentry-gtk/DESCR | 4 ++++
security/pinentry-gtk/Makefile | 34 ++++++++++++++++++++++++++++++++++
security/pinentry-gtk/PLIST | 2 ++
security/pinentry-gtk/distinfo | 5 +++++
security/pinentry-gtk2/DESCR | 4 ++++
security/pinentry-gtk2/Makefile | 34 ++++++++++++++++++++++++++++++++++
security/pinentry-gtk2/PLIST | 2 ++
security/pinentry-gtk2/distinfo | 5 +++++
security/pinentry-qt/DESCR | 4 ++++
security/pinentry-qt/Makefile | 39 +++++++++++++++++++++++++++++++++++++++
security/pinentry-qt/PLIST | 2 ++
security/pinentry-qt/distinfo | 5 +++++
security/pinentry/Makefile | 8 +++++++-
security/pinentry/PLIST | 5 +----
security/pinentry/options.mk | 33 ++++++++++-----------------------
16 files changed, 162 insertions(+), 29 deletions(-)
diffs (293 lines):
diff -r aa357e67b4d9 -r 94df592a42bc security/Makefile
--- a/security/Makefile Sun Feb 07 15:26:40 2010 +0000
+++ b/security/Makefile Sun Feb 07 15:36:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.371 2010/01/27 10:32:20 sno Exp $
+# $NetBSD: Makefile,v 1.372 2010/02/07 15:36:58 drochner Exp $
#
COMMENT= Security tools
@@ -249,6 +249,9 @@
SUBDIR+= php-mhash
SUBDIR+= php-suhosin
SUBDIR+= pinentry
+SUBDIR+= pinentry-gtk
+SUBDIR+= pinentry-gtk2
+SUBDIR+= pinentry-qt
SUBDIR+= pinepgp
SUBDIR+= pkcs11-helper
SUBDIR+= pks
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk/DESCR Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,4 @@
+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 -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk/Makefile Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,34 @@
+# $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@localhost
+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"
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk/PLIST Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-gtk
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk/distinfo Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,5 @@
+$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
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk2/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk2/DESCR Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,4 @@
+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 -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk2/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk2/Makefile Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,34 @@
+# $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@localhost
+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"
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk2/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk2/PLIST Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-gtk-2
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-gtk2/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-gtk2/distinfo Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,5 @@
+$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
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-qt/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt/DESCR Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,4 @@
+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 -r aa357e67b4d9 -r 94df592a42bc security/pinentry-qt/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt/Makefile Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,39 @@
+# $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@localhost
+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"
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-qt/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt/PLIST Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-qt
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry-qt/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pinentry-qt/distinfo Sun Feb 07 15:36:58 2010 +0000
@@ -0,0 +1,5 @@
+$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
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry/Makefile
--- a/security/pinentry/Makefile Sun Feb 07 15:26:40 2010 +0000
+++ b/security/pinentry/Makefile Sun Feb 07 15:36:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/12/15 19:50:47 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2010/02/07 15:36:58 drochner Exp $
#
DISTNAME= pinentry-0.7.6
@@ -18,6 +18,12 @@
.include "options.mk"
+.if defined(PINENTRY_DEFAULT)
+post-install:
+ ${LN} -sf ${DESTDIR}${PREFIX}/bin/pinentry-${PINENTRY_DEFAULT} \
+ ${DESTDIR}${PREFIX}/bin/pinentry
+.endif
+
BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0
.include "../../converters/libiconv/buildlink3.mk"
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry/PLIST
--- a/security/pinentry/PLIST Sun Feb 07 15:26:40 2010 +0000
+++ b/security/pinentry/PLIST Sun Feb 07 15:36:58 2010 +0000
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/02/07 15:36:58 drochner Exp $
bin/pinentry
bin/pinentry-curses
info/pinentry.info
-${PLIST.gtk}bin/pinentry-gtk
-${PLIST.gtk2}bin/pinentry-gtk-2
-${PLIST.qt}bin/pinentry-qt
diff -r aa357e67b4d9 -r 94df592a42bc security/pinentry/options.mk
--- a/security/pinentry/options.mk Sun Feb 07 15:26:40 2010 +0000
+++ b/security/pinentry/options.mk Sun Feb 07 15:36:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2010/02/07 15:36:58 drochner Exp $
#
# XXX This usage of bsd.options.mk is incorrect. The package should
@@ -11,33 +11,20 @@
PKG_SUPPORTED_OPTIONS= gtk gtk2 qt
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
-
+CONFIGURE_ARGS+= --disable-pinentry-gtk
.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+= --enable-pinentry-gtk
-PLIST.gtk= yes
-. include "../../x11/gtk/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-pinentry-gtk
+DEPENDS+= pinentry-gtk-[0-9]*:../../security/pinentry-gtk
+PINENTRY_DEFAULT= gtk
.endif
+CONFIGURE_ARGS+= --disable-pinentry-gtk2
.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+= --enable-pinentry-gtk2
-PLIST.gtk2= yes
-. include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-pinentry-gtk2
+DEPENDS+= pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
+PINENTRY_DEFAULT= gtk2
.endif
+CONFIGURE_ARGS+= --disable-pinentry-qt
.if !empty(PKG_OPTIONS:Mqt)
-USE_LANGUAGES+= c c++
-USE_TOOLS+= gmake
-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
-PLIST.qt= yes
-. include "../../x11/qt3-libs/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-pinentry-qt
+DEPENDS+= pinentry-qt-[0-9]*:../../security/pinentry-qt
+PINENTRY_DEFAULT= qt
.endif
Home |
Main Index |
Thread Index |
Old Index