Use regular DEPRECATED and EXPIRATION_DATE variables in an "if FLAVOR" block

instead of flavoring the variables themselves. This caused too much hassle
for Tools/scripts/rmport.

Discussed with:	tcberner

19 files changed, 38 insertions, 56 deletions

diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
index d9592d1900f0..f419756c5931 100644
--- a/archivers/quazip/Makefile
+++ b/archivers/quazip/Makefile
@@ -16,13 +16,12 @@ LICENSE=	LGPL21
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake:outsource
 USE_LDCONFIG=	yes
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib moc_build network_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=TRUE
diff --git a/deskutils/znotes/Makefile b/deskutils/znotes/Makefile
index e7cdc4daed52..0517a55e55d2 100644
--- a/deskutils/znotes/Makefile
+++ b/deskutils/znotes/Makefile
@@ -16,9 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		qmake
 USE_GL=		gl
 
@@ -28,6 +25,8 @@ GH_PROJECT=	zNotes
 GH_TAGNAME=	6423c5e
 
 . if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		uic_build moc_build rcc_build linguisttools_build corelib gui network xml
 . else
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index e5a090ef3126..7dee2aa9964b 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -18,13 +18,12 @@ LICENSE=	LGPL20
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		compiler:c++11-lib cmake:outsource
 USE_LDCONFIG=	yes
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib dbus gui \
 		moc_build qmake_build rcc_build uic_build
diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile
index 1bb3891a3828..59db07664aa9 100644
--- a/devel/liteide/Makefile
+++ b/devel/liteide/Makefile
@@ -22,9 +22,6 @@ qt4_CONFLICTS_INSTALL=	${PORTNAME}
 qt4_PKGNAMESUFFIX=	-qt4
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt4
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		gl qmake
 USE_GL=		gl
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
@@ -34,6 +31,8 @@ GH_ACCOUNT=	visualfc
 GH_TUPLE=	visualfc:gotools:77fd0f0:gotools/src/github.com/visualfc/gotools
 
 .if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib gui moc_build network rcc_build uic_build webkit xml
 PLIST_SUB+=	QT4="" NO_QT4="@comment "
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index 3c208648c191..d3b395f57b2b 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -20,9 +20,6 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake:outsource tar:xz
 CMAKE_ARGS=	-DBUILD_PLUGINS=none -DBUILD_TESTS=no \
 		-DPKGCONFIG_INSTALL_PREFIX=${PREFIX}/libdata/pkgconfig \
@@ -32,6 +29,8 @@ CONFIGURE_ENV=	QC_CERTSTORE_PATH=${LOCALBASE}/share/certs/ca-root-nss.crt
 USE_LDCONFIG=	yes
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 CMAKE_ON=	QT4_BUILD
 USES+=		qt:4
 USE_QT=		corelib moc_build qmake_build rcc_build
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 3ebfffdcf522..88b41b8b5bd7 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -22,14 +22,13 @@ FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 qt5_PKGNAMESUFFIX=	-${FLAVOR}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		compiler:c++11-lang gl qmake:outsource
 USE_GL=		gl glu
 QMAKE_ARGS=	VERSION_NUMBER=${PORTVERSION}
 
 .if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=	qt:4
 USE_QT=		corelib gui moc_build opengl
 .else
diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index bce5c215fb78..44f4e50c6077 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -35,10 +35,9 @@ qt4_CONFLICTS_INSTALL=	${PORTNAME}
 qt4_PKGNAMESUFFIX=	-qt4
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt4
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 .if ${FLAVOR:U} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		qmake_build moc_build rcc_build uic_build corelib gui network
 CMAKE_ON=	FORCE_QT4
diff --git a/multimedia/gstreamer1-qt/Makefile b/multimedia/gstreamer1-qt/Makefile
index bced1289990a..71f266e48435 100644
--- a/multimedia/gstreamer1-qt/Makefile
+++ b/multimedia/gstreamer1-qt/Makefile
@@ -17,9 +17,6 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 CONFLICTS_INSTALL=	gstreamer${PKGNAMESUFFIX}-*
 
 USES=		bison cmake:outsource gl gnome pathfix pkgconfig tar:xz
@@ -33,6 +30,8 @@ CMAKE_OFF=	USE_GST_PLUGIN_DIR USE_QT_PLUGIN_DIR
 CMAKE_ARGS=	-DQT_VERSION=${FLAVOR:C/qt//}
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib gui opengl declarative script \
 		qmake_build moc_build rcc_build uic_build qtestlib_build
diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
index b6a72ad957b5..669de2e013bd 100644
--- a/multimedia/phonon-designerplugin/Makefile
+++ b/multimedia/phonon-designerplugin/Makefile
@@ -18,12 +18,11 @@ FLAVOR?=	${FLAVORS:[1]}
 qt4_PKGNAMESUFFIX=	-designerplugin-qt4
 qt5_PKGNAMESUFFIX=	-designerplugin-qt5
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake tar:xz
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		kde:4 qt:4
 USE_QT=		corelib designer gui phonon \
 		qmake_build moc_build rcc_build uic_build
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index c7ee439305c0..cc786a3fbfa5 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -22,9 +22,6 @@ qt5_PKGNAMESUFFIX=	-${PHONON_PLUGIN}-qt5
 qt4_PLIST=	${.CURDIR}/pkg-plist.qt4
 qt5_PLIST=	${.CURDIR}/pkg-plist.qt5
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake pkgconfig tar:xz
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
@@ -32,6 +29,8 @@ USE_GSTREAMER1=	yes
 USE_XORG=	x11
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		kde:4 qt:4
 USE_KDE=	automoc4
 USE_QT=		corelib gui opengl phonon \
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index f11c2a2d41d6..c75a2f7a2fc1 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -21,12 +21,11 @@ FLAVOR?=	${FLAVORS:[1]}
 qt4_LIB_DEPENDS=	libvlc.so:multimedia/vlc-qt4
 qt5_LIB_DEPENDS=	libvlc.so:multimedia/vlc3
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake:outsource pkgconfig tar:xz
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		kde:4 qt:4
 USE_KDE=	automoc4
 USE_QT=		corelib gui phonon \
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 3159812f0663..3e3f3cdeb388 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -23,9 +23,6 @@ qt5_PKGNAMESUFFIX=	-qt5
 qt4_PLIST=	${.CURDIR}/pkg-plist.qt4
 qt5_PLIST=	${.CURDIR}/pkg-plist.qt5
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake compiler:c++11-lang pathfix tar:xz
 CMAKE_ON=	PHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT \
 		PHONON_NO_PLATFORMPLUGIN
@@ -33,6 +30,8 @@ CMAKE_OFF=	PHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
 USE_LDCONFIG=	yes
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		kde:4 qt:4
 USE_KDE=	automoc4
 USE_QT=		corelib dbus declarative gui testlib \
diff --git a/net-im/telepathy-qt/Makefile b/net-im/telepathy-qt/Makefile
index da13678b216d..8f02d2dd37d5 100644
--- a/net-im/telepathy-qt/Makefile
+++ b/net-im/telepathy-qt/Makefile
@@ -22,9 +22,6 @@ FLAVOR?=	${FLAVORS:[1]}
 qt4_PKGNAMESUFFIX=	4
 qt5_PKGNAMESUFFIX=	5
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake:outsource gettext gnome localbase:ldflags pathfix pkgconfig python:2.7,build
 USE_GNOME=	glib20 libxslt:build
 USE_GSTREAMER=	yes
@@ -36,6 +33,8 @@ CMAKE_ARGS=	-DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \
 		-DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE}
 
 . if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib dbus gui network xml \
 		moc_build qmake_build qtestlib_build rcc_build uic_build
diff --git a/net-p2p/transmission-qt/Makefile b/net-p2p/transmission-qt/Makefile
index 85002e4dc80b..07dc1946ab55 100644
--- a/net-p2p/transmission-qt/Makefile
+++ b/net-p2p/transmission-qt/Makefile
@@ -12,10 +12,9 @@ FLAVOR?=	${FLAVORS:[1]}
 qt4_CONFLICTS_INSTALL=	transmission-qt5
 qt5_CONFLICTS_INSTALL=	transmission-qt4
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 .if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES=		qt:4
 NLS_USES=	gettext-runtime:run qt:4
 USE_QT=		moc_build linguisttools_build qmake_build rcc_build \
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index 6eb517ec5b08..a4b722895c65 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -16,9 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	frankosterfeld
@@ -26,6 +23,8 @@ USE_LDCONFIG=	yes
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 CMAKE_ON=	BUILD_WITH_QT4
 USE_QT=		corelib dbus linguisttools_build moc_build rcc_build qmake_build
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index b5c0fa2d44d8..94cdfe55bbc4 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -20,15 +20,14 @@ LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 USES=		cmake:outsource gnome pkgconfig tar:bzip2
 USE_GNOME=	glib20
 CMAKE_OFF=	BUILD_EXAMPLES  \
 		BUILD_TEST
 
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		kde:4 qt:4
 USE_KDE=	automoc4
 USE_QT=		corelib dbus gui \
diff --git a/x11-themes/Kvantum/Makefile b/x11-themes/Kvantum/Makefile
index dbf30e0fc414..9ef8addc5101 100644
--- a/x11-themes/Kvantum/Makefile
+++ b/x11-themes/Kvantum/Makefile
@@ -15,9 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 qt4_PKGNAMESUFFIX=	-qt4
 qt5_PKGNAMESUFFIX=	-qt5
 
@@ -31,6 +28,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	tsujan
 
 .if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib gui svg rcc_build uic_build moc_build
 .elif ${FLAVOR} == qt5
diff --git a/x11-themes/adwaita-qt/Makefile b/x11-themes/adwaita-qt/Makefile
index 5952d3b27858..ddd21cd5faaa 100644
--- a/x11-themes/adwaita-qt/Makefile
+++ b/x11-themes/adwaita-qt/Makefile
@@ -16,12 +16,11 @@ FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
 qt4_PKGNAMESUFFIX=	4
 qt5_PKGNAMESUFFIX=	5
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
 
 USES=		cmake:outsource compiler:c++11-lib localbase pkgconfig
 .  if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib dbus gui \
 		moc_build rcc_build uic_build qmake_build
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index 0e5b7c54e33a..1ba111c4405e 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -12,8 +12,6 @@ COMMENT=	Qt Widgets for Technical Applications
 
 FLAVORS=	qt5 qt4
 FLAVOR?=	${FLAVORS:[1]}
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
 
 USES=		gl gmake qmake tar:bzip2
 USE_GL=		gl
@@ -27,6 +25,8 @@ PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
 QMAKE_ARGS+=	PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
 
 .if ${FLAVOR} == qt4
+DEPRECATED=	Qt4 has been EOL since december 2015
+EXPIRATION_DATE=2019-03-15
 USES+=		qt:4
 USE_QT=		corelib designer gui opengl svg xml moc_build rcc_build script
 .else