Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2019 18:02:10 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495937 - head/security/pinentry
Message-ID:  <201903161802.x2GI2Aov048268@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903161802.x2GI2Aov048268>