From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 4 17:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6A3F31B4 for ; Thu, 4 Jul 2013 17:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 51BBC1341 for ; Thu, 4 Jul 2013 17:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r64He2vB010294 for ; Thu, 4 Jul 2013 17:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r64He2qI010293; Thu, 4 Jul 2013 17:40:02 GMT (envelope-from gnats) Resent-Date: Thu, 4 Jul 2013 17:40:02 GMT Resent-Message-Id: <201307041740.r64He2qI010293@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rene Ladan Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3B78E186 for ; Thu, 4 Jul 2013 17:38:59 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 13AF11324 for ; Thu, 4 Jul 2013 17:38:59 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r64Hcwsg000543 for ; Thu, 4 Jul 2013 17:38:58 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r64HcwUa000540; Thu, 4 Jul 2013 17:38:58 GMT (envelope-from nobody) Message-Id: <201307041738.r64HcwUa000540@oldred.freebsd.org> Date: Thu, 4 Jul 2013 17:38:58 GMT From: Rene Ladan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/180278: security/pinentry : remove expired QT3 support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2013 17:40:02 -0000 >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 -.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: