Date: Sun, 16 Dec 2018 16:49:17 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487601 - in head: archivers/quazip deskutils/znotes devel/libdbusmenu-qt devel/liteide devel/qca graphics/fracplanet graphics/photivo multimedia/gstreamer1-qt multimedia/phonon multime... Message-ID: <201812161649.wBGGnHXb089823@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Sun Dec 16 16:49:17 2018 New Revision: 487601 URL: https://svnweb.freebsd.org/changeset/ports/487601 Log: 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 Modified: head/archivers/quazip/Makefile head/deskutils/znotes/Makefile head/devel/libdbusmenu-qt/Makefile head/devel/liteide/Makefile head/devel/qca/Makefile head/graphics/fracplanet/Makefile head/graphics/photivo/Makefile head/multimedia/gstreamer1-qt/Makefile head/multimedia/phonon-designerplugin/Makefile head/multimedia/phonon-gstreamer/Makefile head/multimedia/phonon-vlc/Makefile head/multimedia/phonon/Makefile head/net-im/telepathy-qt/Makefile head/net-p2p/transmission-qt/Makefile head/security/qtkeychain/Makefile head/sysutils/polkit-qt/Makefile head/x11-themes/Kvantum/Makefile head/x11-themes/adwaita-qt/Makefile head/x11-toolkits/qwt6/Makefile Modified: head/archivers/quazip/Makefile ============================================================================== --- head/archivers/quazip/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/archivers/quazip/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/deskutils/znotes/Makefile ============================================================================== --- head/deskutils/znotes/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/deskutils/znotes/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/devel/libdbusmenu-qt/Makefile ============================================================================== --- head/devel/libdbusmenu-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/devel/libdbusmenu-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/devel/liteide/Makefile ============================================================================== --- head/devel/liteide/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/devel/liteide/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 " Modified: head/devel/qca/Makefile ============================================================================== --- head/devel/qca/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/devel/qca/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -20,9 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt: 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/ce 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 Modified: head/graphics/fracplanet/Makefile ============================================================================== --- head/graphics/fracplanet/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/graphics/fracplanet/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/graphics/photivo/Makefile ============================================================================== --- head/graphics/photivo/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/graphics/photivo/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/multimedia/gstreamer1-qt/Makefile ============================================================================== --- head/multimedia/gstreamer1-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/multimedia/gstreamer1-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/multimedia/phonon-designerplugin/Makefile ============================================================================== --- head/multimedia/phonon-designerplugin/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/multimedia/phonon-designerplugin/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/multimedia/phonon-gstreamer/Makefile ============================================================================== --- head/multimedia/phonon-gstreamer/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/multimedia/phonon-gstreamer/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 \ Modified: head/multimedia/phonon-vlc/Makefile ============================================================================== --- head/multimedia/phonon-vlc/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/multimedia/phonon-vlc/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 \ Modified: head/multimedia/phonon/Makefile ============================================================================== --- head/multimedia/phonon/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/multimedia/phonon/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 \ Modified: head/net-im/telepathy-qt/Makefile ============================================================================== --- head/net-im/telepathy-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/net-im/telepathy-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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=${PKGNAMESUFFI -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 Modified: head/net-p2p/transmission-qt/Makefile ============================================================================== --- head/net-p2p/transmission-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/net-p2p/transmission-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 \ Modified: head/security/qtkeychain/Makefile ============================================================================== --- head/security/qtkeychain/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/security/qtkeychain/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/sysutils/polkit-qt/Makefile ============================================================================== --- head/sysutils/polkit-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/sysutils/polkit-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 \ Modified: head/x11-themes/Kvantum/Makefile ============================================================================== --- head/x11-themes/Kvantum/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/x11-themes/Kvantum/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/x11-themes/adwaita-qt/Makefile ============================================================================== --- head/x11-themes/adwaita-qt/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/x11-themes/adwaita-qt/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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 Modified: head/x11-toolkits/qwt6/Makefile ============================================================================== --- head/x11-toolkits/qwt6/Makefile Sun Dec 16 16:34:25 2018 (r487600) +++ head/x11-toolkits/qwt6/Makefile Sun Dec 16 16:49:17 2018 (r487601) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812161649.wBGGnHXb089823>