9 files changed, 16 insertions, 45 deletions

diff --git a/MOVED b/MOVED
index d0ec22826764..94ae6acacc01 100644
--- a/MOVED
+++ b/MOVED
@@ -4420,3 +4420,4 @@ graphics/linux-dri74||2013-07-03|Removed
 games/gnomememoryblocks||2013-07-04|Has expired: Unsupported upstream
 devel/py-reddit||2013-07-07|Has been removed from PyPI, Use www/py-praw
 games/speakinghangman||2013-07-07|Has expired: No more public distfiles
+security/pinentry-qt||2013-07-09|Removed: Qt3 ports have expired
diff --git a/security/Makefile b/security/Makefile
index ace7b829530a..e7c37266930d 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -709,7 +709,6 @@
     SUBDIR += pinentry-curses
     SUBDIR += pinentry-gtk
     SUBDIR += pinentry-gtk2
-    SUBDIR += pinentry-qt
     SUBDIR += pinentry-qt4
     SUBDIR += pkcrack
     SUBDIR += pkcs11-dump
diff --git a/security/pinentry-curses/Makefile b/security/pinentry-curses/Makefile
index 4b73b9fb196a..4d62e30ea770 100644
--- a/security/pinentry-curses/Makefile
+++ b/security/pinentry-curses/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
+PORTREVISION=	3
 
 COMMENT=	Curses version of the gnupg password dialog
 
diff --git a/security/pinentry-gtk/Makefile b/security/pinentry-gtk/Makefile
index f9319ee7fb27..eb21b0471807 100644
--- a/security/pinentry-gtk/Makefile
+++ b/security/pinentry-gtk/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
+PORTREVISION=	3
 
 COMMENT=	GTK version of the gnupg password dialog
 
diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
index c878e63b74c3..fb2d85c96ea0 100644
--- a/security/pinentry-gtk2/Makefile
+++ b/security/pinentry-gtk2/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
+PORTREVISION=	3
 
 COMMENT=	GTK+ 2.0 version of the GnuPG password dialog
 
diff --git a/security/pinentry-qt/Makefile b/security/pinentry-qt/Makefile
deleted file mode 100644
index d39ace79235f..000000000000
--- a/security/pinentry-qt/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Michael Nottebrock <lofi@freebsd.org>
-# $FreeBSD$
-
-PORTNAME=	pinentry
-
-COMMENT=	QT3 version of the gnupg password dialog
-
-CONFLICTS_INSTALL=	pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \
-		pinentry-gtk2-* pinentry-qt4-*
-
-PINENTRY_SLAVE=	-qt3
-PORT_OPTIONS+=	QT3
-
-MASTERDIR=	${.CURDIR}/../pinentry
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt4/Makefile
index 37b8fa61ecd4..8ef844e95c46 100644
--- a/security/pinentry-qt4/Makefile
+++ b/security/pinentry-qt4/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
+PORTREVISION=	3
 
-COMMENT=	QT4 version of the gnupg password dialog
+COMMENT=	Qt 4 version of the gnupg password dialog
 
 CONFLICTS_INSTALL=	pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \
 		pinentry-gtk2-* pinentry-qt-*
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 2767af9b1d35..a74c5b23fe9c 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	0.8.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
@@ -14,11 +14,11 @@ COMMENT?=	Collection of simple PIN or passphrase entry dialogs
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		ksba.19:${PORTSDIR}/security/libksba
 
-CONFLICTS_INSTALL?=	pinentry-[a-z]*-[0.9]*
+CONFLICTS_INSTALL?=	pinentry-[a-z]*
 
-USES=		iconv
+USES=		iconv gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+CONFIGURE_ARGS+=--disable-pinentry-qt
 INFO=		pinentry
 
 CFLAGS+=	-I${LOCALBASE}/include
@@ -26,33 +26,21 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(PINENTRY_SLAVE)
 OPTIONS_MULTI=	FRONTEND
-OPTIONS_MULTI_FRONTEND=	NCURSES GTK GTK2 QT3 QT4
-OPTIONS_DEFAULT=	${OPTIONS_MULTI_FRONTEND:NQT3}
+OPTIONS_MULTI_FRONTEND=	NCURSES GTK GTK2 QT4
+OPTIONS_DEFAULT=	${OPTIONS_MULTI_FRONTEND}
 
 NCURSES_DESC=	Curses frontend
-GTK_DESC=	Gtk+1 frontend
-GTK2_DESC=	Gtk+2 frontend
-QT3_DESC=	Qt3 frontend
-QT4_DESC=	Qt4 frontend
+GTK_DESC=	Gtk+ 1 frontend
+GTK2_DESC=	Gtk+ 2 frontend
+QT4_DESC=	Qt 4 frontend
 .else
 PKGNAMESUFFIX=	${PINENTRY_SLAVE}
 .endif
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MQT3}
-USE_QT_VER=	3
-PLIST_SUB+=	WITH_QT3=""
-MOC3=		${LOCALBASE}/bin/moc
-.else
-CONFIGURE_ARGS+=--disable-pinentry-qt
-PLIST_SUB+=	WITH_QT3="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MQT4}
-# bsd.kde.mk overrides MOC from bsd.qt.mk
-USE_QT4=	gui # moc_build
-BUILD_DEPENDS+=	${MOC4}:${PORTSDIR}/devel/qt4-moc
+USE_QT4=	gui moc_build
 PLIST_SUB+=	WITH_QT4=""
 MOC4=		${LOCALBASE}/bin/moc-qt4
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -88,10 +76,6 @@ PLIST_SUB+=	WITH_NCURSES="@comment "
 pre-configure:
 	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
 		${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure
-.if ${PORT_OPTIONS:MQT3}
-	${REINPLACE_CMD} -e "/^MOC/s,@MOC@,${MOC3}," \
-		${WRKSRC}/qt/Makefile.in
-.endif
 .if ${PORT_OPTIONS:MQT4}
 	cd ${WRKSRC}/qt4 && \
 		${MOC4} pinentrydialog.h > pinentrydialog.moc && \
diff --git a/security/pinentry/pkg-plist b/security/pinentry/pkg-plist
index 4b29a33c5d49..57e21f10b913 100644
--- a/security/pinentry/pkg-plist
+++ b/security/pinentry/pkg-plist
@@ -2,5 +2,4 @@ bin/pinentry
 %%WITH_NCURSES%%bin/pinentry-curses
 %%WITH_GTK%%bin/pinentry-gtk
 %%WITH_GTK2%%bin/pinentry-gtk-2
-%%WITH_QT3%%bin/pinentry-qt
 %%WITH_QT4%%bin/pinentry-qt4