archivers/quazip: add flavors for Qt 5 and Qt 6 (9ab8ec61) · Commits · FreeBSD / FreeBSD ports

MOVED

+0 −1

Original line number	Diff line number	Diff line
		@@ -11567,7 +11567,6 @@ graphics/fracplanet@qt5\|graphics/fracplanet\|2019-03-16\|Flavor has been removed
		graphics/photivo@qt4\|\|2019-03-16\|Qt4 deprecation
		graphics/photivo@qt5\|graphics/photivo\|2019-03-16\|Flavor has been removed
		archivers/quazip@qt4\|\|2019-03-16\|Qt4 deprecation
		archivers/quazip@qt5\|archivers/quazip\|2019-03-16\|Flavor has been removed
		net-p2p/transmission@qt4\|\|2019-03-16\|Qt4 deprecation
		net-p2p/transmission@qt5\|net-p2p/transmission-qt\|2019-03-16\|Flavor has been removed
		x11-themes/Kvantum@qt4\|\|2019-03-16\|Qt4 deprecation

archivers/quazip/Makefile

+13 −6

Original line number	Diff line number	Diff line
		PORTNAME= quazip
		DISTVERSIONPREFIX= v
		DISTVERSION= 1.4
		PORTREVISION= 1
		CATEGORIES= archivers
		PKGNAMESUFFIX= -qt5
		PKGNAMESUFFIX= -${FLAVOR}

		MAINTAINER= kde@FreeBSD.org
		COMMENT= Qt/C++ wrapper for ZIP/UNZIP package
		@@ -10,16 +11,22 @@ WWW= https://github.com/stachenov/quazip

		LICENSE= LGPL21

		USES= cmake compiler:c++11-lang cpe qt:5
		FLAVORS= qt5 qt6
		FLAVOR?= qt5

		USES= cmake compiler:c++11-lang cpe qt:${FLAVOR:S/qt//}
		CPE_VENDOR= quazip_project
		USE_GITHUB= yes
		GH_ACCOUNT= stachenov
		CPE_VENDOR= quazip_project
		USE_LDCONFIG= yes
		USE_QT= core network \
		_USE_QT_qt5= core network \
		buildtools:build testlib:build qmake:build
		CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE
		_USE_QT_qt6= base 5compat
		USE_QT= ${_USE_QT_${FLAVOR}}

		CMAKE_ARGS= -DQUAZIP_QT_MAJOR_VERSION=${FLAVOR:S/qt//}

		PLIST_SUB= QTVER_SUFFIX=5 \
		PLIST_SUB= QTVER_SUFFIX=${FLAVOR:S/qt//} \
		QUAZIP_VERSION=${DISTVERSION}

		.include <bsd.port.mk>

archivers/quazip/pkg-plist

+25 −25

Original line number	Diff line number	Diff line
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/JlCompress.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/ioapi.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/minizip_crypt.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quaadler32.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quachecksum32.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quacrc32.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quagzipfile.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quaziodevice.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip_global.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazip_qt_compat.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipdir.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipfile.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipfileinfo.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/quazipnewinfo.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/unzip.h
		include/QuaZip-Qt5-%%QUAZIP_VERSION%%/quazip/zip.h
		lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5Config.cmake
		lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5ConfigVersion.cmake
		lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5_SharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
		lib/cmake/QuaZip-Qt5-%%QUAZIP_VERSION%%/QuaZip-Qt5_SharedTargets.cmake
		lib/libquazip1-qt5.so
		lib/libquazip1-qt5.so.%%QUAZIP_VERSION%%
		lib/libquazip1-qt5.so.%%QUAZIP_VERSION%%.0
		libdata/pkgconfig/quazip1-qt5.pc
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/JlCompress.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/ioapi.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/minizip_crypt.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quaadler32.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quachecksum32.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quacrc32.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quagzipfile.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quaziodevice.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_global.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazip_qt_compat.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipdir.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipfile.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipfileinfo.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/quazipnewinfo.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/unzip.h
		include/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/quazip/zip.h
		lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%Config.cmake
		lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%ConfigVersion.cmake
		lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%_SharedTargets-%%CMAKE_BUILD_TYPE%%.cmake
		lib/cmake/QuaZip-Qt%%QTVER_SUFFIX%%-%%QUAZIP_VERSION%%/QuaZip-Qt%%QTVER_SUFFIX%%_SharedTargets.cmake
		lib/libquazip1-qt%%QTVER_SUFFIX%%.so
		lib/libquazip1-qt%%QTVER_SUFFIX%%.so.%%QUAZIP_VERSION%%
		lib/libquazip1-qt%%QTVER_SUFFIX%%.so.%%QUAZIP_VERSION%%.0
		libdata/pkgconfig/quazip1-qt%%QTVER_SUFFIX%%.pc

astro/marble/Makefile

+2 −1

Original line number	Diff line number	Diff line
		PORTNAME= marble
		DISTVERSION= ${KDE_APPLICATIONS_VERSION}
		PORTREVISION= 1
		CATEGORIES= astro education kde kde-applications

		MAINTAINER= kde@FreeBSD.org
		@@ -9,7 +10,7 @@ WWW= https://marble.kde.org/
		LICENSE= GPLv2+
		LICENSE_FILE= ${WRKSRC}/LICENSE.txt

		LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip
		LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip@qt5

		USES= cmake compiler:c++11-lang desktop-file-utils gettext \
		kde:5 qt:5 shared-mime-info tar:xz xorg

astro/merkaartor/Makefile

+2 −2

Original line number	Diff line number	Diff line
		PORTNAME= merkaartor
		PORTVERSION= 0.19.0
		PORTREVISION= 8
		PORTREVISION= 9
		CATEGORIES= astro

		MAINTAINER= dev2@heesakkers.info
		@@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

		LIB_DEPENDS= libgdal.so:graphics/gdal \
		libproj.so:graphics/proj \
		libquazip1-qt5.so:archivers/quazip
		libquazip1-qt5.so:archivers/quazip@qt5

		USES= compiler:c++11-lang gnome pkgconfig qmake qt:5 sqlite:3
		USE_GITHUB= yes

Original line number	Diff line number	Diff line
		@@ -11567,7 +11567,6 @@ graphics/fracplanet@qt5\|graphics/fracplanet\|2019-03-16\|Flavor has been removed
		graphics/photivo@qt4\|\|2019-03-16\|Qt4 deprecation
		graphics/photivo@qt5\|graphics/photivo\|2019-03-16\|Flavor has been removed
		archivers/quazip@qt4\|\|2019-03-16\|Qt4 deprecation
		archivers/quazip@qt5\|archivers/quazip\|2019-03-16\|Flavor has been removed
		net-p2p/transmission@qt4\|\|2019-03-16\|Qt4 deprecation
		net-p2p/transmission@qt5\|net-p2p/transmission-qt\|2019-03-16\|Flavor has been removed
		x11-themes/Kvantum@qt4\|\|2019-03-16\|Qt4 deprecation