From owner-svn-ports-all@freebsd.org Sat Mar 16 18:02:11 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53A491537810; Sat, 16 Mar 2019 18:02:11 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC9976E41B; Sat, 16 Mar 2019 18:02:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E38B6259AA; Sat, 16 Mar 2019 18:02:10 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GI2AnJ048269; Sat, 16 Mar 2019 18:02:10 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GI2Aov048268; Sat, 16 Mar 2019 18:02:10 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161802.x2GI2Aov048268@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 18:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495937 - head/security/pinentry X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/security/pinentry X-SVN-Commit-Revision: 495937 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EC9976E41B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 18:02:11 -0000 Author: tcberner Date: Sat Mar 16 18:02:10 2019 New Revision: 495937 URL: https://svnweb.freebsd.org/changeset/ports/495937 Log: security/pinentry: remove QT4 option (Qt4 deprecation) - this breaks security/pinentry-qt4 until removal Approved by: portmgr (implicit) Modified: head/security/pinentry/Makefile Modified: head/security/pinentry/Makefile ============================================================================== --- head/security/pinentry/Makefile Sat Mar 16 18:01:22 2019 (r495936) +++ head/security/pinentry/Makefile Sat Mar 16 18:02:10 2019 (r495937) @@ -3,7 +3,7 @@ PORTNAME= pinentry PORTVERSION= 1.1.0 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= security MASTER_SITES= GNUPG/pinentry @@ -22,7 +22,7 @@ NO_BUILD= yes PLIST_FILES= bin/pinentry OPTIONS_SINGLE= FRONTEND -OPTIONS_SINGLE_FRONTEND= TTY NCURSES FLTK GTK2 QT4 QT5 GNOME3 +OPTIONS_SINGLE_FRONTEND= TTY NCURSES FLTK GTK2 QT5 GNOME3 OPTIONS_DEFAULT= TTY FRONTEND_DESC= Default frontend @@ -43,10 +43,6 @@ GTK2_DESC= Gtk+ 2 frontend PINENTRY_GTK2= pinentry-gtk-2 GTK2_RUN_DEPENDS= ${PINENTRY_GTK2}:security/pinentry-gtk2 -QT4_DESC= Qt 4 frontend -PINENTRY_QT4= pinentry-qt4 -QT4_RUN_DEPENDS= ${PINENTRY_QT4}:security/pinentry-qt4 - QT5_DESC= Qt 5 frontend PINENTRY_QT5= pinentry-qt5 QT5_RUN_DEPENDS= ${PINENTRY_QT5}:security/pinentry-qt5 @@ -63,11 +59,6 @@ PINENTRY_BIN= ${PINENTRY_${gui}} . endif .endfor -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif - do-install: ${LN} -sf ${PINENTRY_BIN} ${STAGEDIR}${PREFIX}/bin/pinentry ${INSTALL_DATA} ${WRKSRC}/doc/pinentry.info ${STAGEDIR}${PREFIX}/${INFO_PATH} @@ -98,13 +89,7 @@ PLIST_FILES= bin/pinentry-gnome3 CONFIGURE_ARGS+=--disable-pinentry-gnome3 .endif -.if ${PINENTRY_GUI} == "qt4" -USES+= compiler:c++11-lib qt:4 -USE_QT= corelib gui moc_build -PLIST_FILES= bin/pinentry-qt4 -CONFIGURE_ARGS+=--disable-pinentry-qt5 \ - --program-suffix=4 -.elif ${PINENTRY_GUI} == "qt5" +.if ${PINENTRY_GUI} == "qt5" USES+= compiler:c++11-lib qt:5 USE_QT= core gui widgets buildtools_build PLIST_FILES= bin/pinentry-qt5