aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-02-29 18:35:00 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-02-29 18:35:00 +0000
commitfe2e23cbdd1c0a3bc3f0503e7625d5994f365a80 (patch)
treea32b1c3693c36c5ec5b5fdf2e101223814c8f87a
parentcc6c7225d9b174e519c3198594cae26726496c0c (diff)
downloadports-fe2e23cbdd1c0a3bc3f0503e7625d5994f365a80.tar.gz
ports-fe2e23cbdd1c0a3bc3f0503e7625d5994f365a80.zip
Notes
-rw-r--r--security/pinentry-gnome3/Makefile2
-rw-r--r--security/pinentry/Makefile25
-rw-r--r--security/pinentry/distinfo4
3 files changed, 8 insertions, 23 deletions
diff --git a/security/pinentry-gnome3/Makefile b/security/pinentry-gnome3/Makefile
index 0137a273d093..c3bfd1b6eaf3 100644
--- a/security/pinentry-gnome3/Makefile
+++ b/security/pinentry-gnome3/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pinentry
-PORTREVISION= 1
+PORTREVISION= 0
COMMENT= GNOME 3 version of the GnuPG password dialog
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index f8e42b2c1156..b7ec53dcee55 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pinentry
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.7
PORTREVISION?= 0
CATEGORIES= security
MASTER_SITES= GNUPG/pinentry
@@ -36,12 +36,8 @@ GTK2_DESC= Gtk+ 2 frontend
PINENTRY_GTK2= pinentry-gtk-2
GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2
-.if exists(/usr/lib/libc++.so)
-QT4_DESC= Qt 4 frontend (broken)
-.else
QT4_DESC= Qt 4 frontend
-.endif
-PINENTRY_QT4= pinentry-qt4
+PINENTRY_QT4= pinentry-qt
QT4_RUN_DEPENDS= ${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4
GNOME3_DESC= GNOME 3 frontend
@@ -90,14 +86,11 @@ CONFIGURE_ARGS+=--disable-pinentry-gnome3
.if ${PINENTRY_GUI} == "qt4"
USES+= compiler:c++11-lib
-USE_CXXSTD= c++11
-. if exists(/usr/lib/libc++.so)
-IGNORE= does not compile with libc++
-. endif
USE_QT4= gui moc_build
-PLIST_FILES= bin/pinentry-qt4
+PLIST_FILES= bin/pinentry-qt
+CONFIGURE_ARGS+=--disable-pinentry-qt5
.else
-CONFIGURE_ARGS+=--disable-pinentry-qt4
+CONFIGURE_ARGS+=--disable-pinentry-qt --disable-pinentry-qt5
.endif
.if ${PINENTRY_GUI} == "gtk2"
@@ -121,14 +114,6 @@ CONFIGURE_ARGS+=--enable-pinentry-tty
CONFIGURE_ARGS+=--disable-pinentry-tty
.endif
-pre-configure:
-.if ${PINENTRY_GUI} == "qt4"
- cd ${WRKSRC}/qt4 && \
- ${MOC} pinentrydialog.h > pinentrydialog.moc && \
- ${MOC} qsecurelineedit.h > qsecurelineedit.moc && \
- ${MOC} pinentryconfirm.h > pinentryconfirm.moc
-.endif
-
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \
${STAGEDIR}${PREFIX}/info/pinentry.info
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index b50a966682ec..26b526b6a535 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pinentry-0.9.5.tar.bz2) = 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c
-SIZE (pinentry-0.9.5.tar.bz2) = 514677
+SHA256 (pinentry-0.9.7.tar.bz2) = 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
+SIZE (pinentry-0.9.7.tar.bz2) = 432978