aboutsummaryrefslogtreecommitdiff
path: root/security/pinentry
diff options
context:
space:
mode:
Diffstat (limited to 'security/pinentry')
-rw-r--r--security/pinentry/Makefile32
-rw-r--r--security/pinentry/distinfo6
2 files changed, 5 insertions, 33 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index e0d92e843fe0..1a329ce6b1ef 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= pinentry
-PORTVERSION= 0.7.1
-PORTREVISION= 3
+PORTVERSION= 0.7.2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= pinentry
@@ -18,7 +17,7 @@ COMMENT?= A collection of simple PIN or passphrase entry dialogs
LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt \
ksba.13:${PORTSDIR}/security/libksba
-CONFLICTS?= pinentry-qt* pinentry-gtk* pinentry-curses*
+CONFLICTS?= pinentry-[a-z]*-[0.9]*
USE_GETOPT_LONG=yes
USE_ICONV= yes
@@ -56,16 +55,7 @@ PLIST_SUB+= WITH_GTK="@comment "
.if defined(PINENTRY_GTK2)
USE_GNOME+= gtk20
PLIST_SUB+= WITH_GTK2=""
-
-PATCH_SITES= http://home.arcor.de/dralbrecht.dress/GnuPG/
-PATCHFILES= pinentry-0.7.1-gtk+-2.4.diff.bz2
-PATCH_DIST_STRIP= -p1
-
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
-
-pre-configure:
- @cd ${WRKSRC}; ${ACLOCAL}
+CONFIGURE_ENV+= CFLAGS=-I/usr/local/include
.else
CONFIGURE_ARGS+=--disable-pinentry-gtk2
PLIST_SUB+= WITH_GTK2="@comment "
@@ -78,28 +68,12 @@ CONFIGURE_ARGS+=--disable-pinentry-curses
PLIST_SUB+= WITH_CURSES="@comment "
.endif
.else
-PATCH_SITES= http://home.arcor.de/dralbrecht.dress/GnuPG/
-PATCHFILES= pinentry-0.7.1-gtk+-2.4.diff.bz2
-PATCH_DIST_STRIP= -p1
-USE_AUTOCONF_VER= 259
-USE_AUTOMAKE_VER= 19
USE_QT_VER= 3
USE_GNOME+= gtk12 gtk20
PLIST_SUB+= WITH_QT=""
PLIST_SUB+= WITH_GTK=""
PLIST_SUB+= WITH_GTK2=""
PLIST_SUB+= WITH_CURSES=""
-
-pre-configure:
- @cd ${WRKSRC}; ${ACLOCAL}
-
-run-autotools:
- @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
- ${AUTOMAKE_ARGS})
- @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
- ${AUTOCONF_ARGS})
- @${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
- ${WRKSRC}/acinclude.m4 ${WRKSRC}/configure
.endif
.include <bsd.port.mk>
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index 359ea3a7b7c8..624678edb36a 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,4 +1,2 @@
-MD5 (pinentry-0.7.1.tar.gz) = 7861d63dea6434a5a05da84e83f209e6
-SIZE (pinentry-0.7.1.tar.gz) = 347047
-MD5 (pinentry-0.7.1-gtk+-2.4.diff.bz2) = 824144322bcfbba4d291e293b352610a
-SIZE (pinentry-0.7.1-gtk+-2.4.diff.bz2) = 26267
+MD5 (pinentry-0.7.2.tar.gz) = 55626ce13ed76d82ec5330d19bdf3ab4
+SIZE (pinentry-0.7.2.tar.gz) = 398775