Date: Thu, 4 Jul 2013 17:38:58 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180278: security/pinentry : remove expired QT3 support Message-ID: <201307041738.r64HcwUa000540@oldred.freebsd.org> Resent-Message-ID: <201307041740.r64He2qI010293@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180278
>Category: ports
>Synopsis: security/pinentry : remove expired QT3 support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 04 17:40:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rene Ladan
>Release: FreeBSD 9.1-amd64
>Organization:
>Environment:
FreeBSD 9.1-amd64
Ports r322216
>Description:
Remove support for the expired QT3 port.
Change default frontend from QT3 to QT4 and bump PORTREVISION
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 322216)
+++ Makefile (working copy)
@@ -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
@@ -26,13 +26,12 @@
.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:NQT4}
NCURSES_DESC= Curses frontend
GTK_DESC= Gtk+1 frontend
GTK2_DESC= Gtk+2 frontend
-QT3_DESC= Qt3 frontend
QT4_DESC= Qt4 frontend
.else
PKGNAMESUFFIX= ${PINENTRY_SLAVE}
@@ -40,14 +39,7 @@
.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
@@ -88,10 +80,6 @@
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 && \
Index: pkg-plist
===================================================================
--- pkg-plist (revision 322216)
+++ pkg-plist (working copy)
@@ -2,5 +2,4 @@
%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041738.r64HcwUa000540>