Switch from qt4 to qt5. There are currently no consumer in the tree. OK to update or we do want delete it?
Rafael diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile index 918df2dfbf1..2a6bae43503 100644 --- a/devel/qjson/Makefile +++ b/devel/qjson/Makefile @@ -1,30 +1,26 @@ # $OpenBSD: Makefile,v 1.14 2019/07/12 20:45:57 sthen Exp $ -CATEGORIES = devel - COMMENT= Qt-based library that maps JSON data to QVariant objects GH_ACCOUNT = flavio GH_PROJECT = qjson GH_TAGNAME = 0.9.0 -REVISION = 2 +REVISION = 3 + +CATEGORIES = devel HOMEPAGE = http://qjson.sourceforge.net/ -SHARED_LIBS = qjson 1.0 +SHARED_LIBS = qjson-qt5 0.0 MODULES = devel/cmake \ - x11/qt4 - -WANTLIB += QtGui m ${COMPILER_LIBCXX} - -COMPILER = base-clang ports-gcc base-gcc + x11/qt5 # LGPLv2 -PERMIT_PACKAGE = Yes +PERMIT_PACKAGE = Yes + +WANTLIB += ${COMPILER_LIBCXX} Qt5Core m -# XXX enable tests if we switch to qt5 -CONFIGURE_ARGS = -DQJSON_BUILD_TESTS:Bool=No \ - -DQT4_BUILD:Bool=Yes +CONFIGURE_ARGS = -DQJSON_BUILD_TESTS=ON .include <bsd.port.mk> diff --git a/devel/qjson/pkg/PLIST b/devel/qjson/pkg/PLIST index 728ae14f634..fe9d39a6427 100644 --- a/devel/qjson/pkg/PLIST +++ b/devel/qjson/pkg/PLIST @@ -1,15 +1,16 @@ @comment $OpenBSD: PLIST,v 1.5 2017/03/17 15:00:11 jca Exp $ -include/qjson/ -include/qjson/parser.h -include/qjson/parserrunnable.h -include/qjson/qjson_export.h -include/qjson/qobjecthelper.h -include/qjson/serializer.h -include/qjson/serializerrunnable.h -lib/cmake/qjson/ -lib/cmake/qjson/QJSONConfig.cmake -lib/cmake/qjson/QJSONConfigVersion.cmake -lib/cmake/qjson/QJSONTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/qjson/QJSONTargets.cmake -@lib lib/libqjson.so.${LIBqjson_VERSION} -lib/pkgconfig/QJson.pc +include/qjson-qt5/ +include/qjson-qt5/parser.h +include/qjson-qt5/parserrunnable.h +include/qjson-qt5/qjson_export.h +include/qjson-qt5/qobjecthelper.h +include/qjson-qt5/serializer.h +include/qjson-qt5/serializerrunnable.h +lib/cmake/ +lib/cmake/qjson-qt5/ +lib/cmake/qjson-qt5/QJSON-qt5Config.cmake +lib/cmake/qjson-qt5/QJSON-qt5ConfigVersion.cmake +lib/cmake/qjson-qt5/QJSON-qt5Targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/qjson-qt5/QJSON-qt5Targets.cmake +@lib lib/libqjson-qt5.so.${LIBqjson-qt5_VERSION} +lib/pkgconfig/QJson-qt5.pc
