--- textproc/soprano/Makefile (revision 492190) +++ textproc/soprano/Makefile (working copy) @@ -2,29 +2,35 @@ # $FreeBSD$ PORTNAME= soprano -PORTVERSION= 2.9.4 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 2.9.3-91 +DISTVERSIONSUFFIX= -gd7f30f1 +PORTEPOCH= 1 CATEGORIES= textproc -MASTER_SITES= SF/${PORTNAME}/Soprano/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Qt/C++ RDF framework -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 +LICENSE= GPLv2 LGPL20+ +LICENSE_COMB= dual LIB_DEPENDS= libraptor2.so:textproc/raptor2 \ + librasqal.so:textproc/rasqal \ librdf.so:textproc/redland \ libiodbc.so:databases/libiodbc -USE_QT= corelib dbus network qtestlib_build xml \ - qmake_build moc_build uic_build rcc_build -USES= cmake pkgconfig qt:4 tar:bzip2 -CMAKE_ARGS+= -DSOPRANO_DISABLE_CLUCENE_INDEX=yes \ - -DSOPRANO_DISABLE_SESAME2_BACKEND=yes +USES= cmake pkgconfig qt:5 tar:bzip2 +USE_QT= buildtools_build core dbus help network qmake_build xml USE_LDCONFIG= yes -post-patch: +USE_GITHUB= yes +GH_ACCOUNT= KDE + +CMAKE_ON= SOPRANO_DISABLE_CLUCENE_INDEX \ + QT5_BUILD \ + SOPRANO_DISABLE_SESAME2_BACKEND + +pre-configure: @${REINPLACE_CMD} -e 's,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig,' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's,soprano/cmake,cmake/Modules,' \ --- textproc/soprano/distinfo (revision 492190) +++ textproc/soprano/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (soprano-2.9.4.tar.bz2) = 64066fbd54e71d7ae4c8a4116997448a72808a2813cff3bb5d2c28f0fce9e0e5 -SIZE (soprano-2.9.4.tar.bz2) = 1958856 +TIMESTAMP = 1549345503 +SHA256 (KDE-soprano-v2.9.3-91-gd7f30f1_GH0.tar.gz) = 8136d83c63e6a76468159cc3c5316a00c92522662b946f62b3852fb77eee56dc +SIZE (KDE-soprano-v2.9.3-91-gd7f30f1_GH0.tar.gz) = 2092276 --- textproc/soprano/files/patch-soprano_pluginmanager.cpp (revision 492190) +++ textproc/soprano/files/patch-soprano_pluginmanager.cpp (nonexistent) @@ -1,17 +0,0 @@ -error: invalid suffix on literal; C++11 requires a space between literal and identifier - [-Wreserved-user-defined-literal] - fileSearchPaths << file.fileName().section( "/", 0, -5, - QString::SectionIncludeTrailingSep ) + QLatin1String( "lib"SOPRANO_LIB_SUFFIX ); - ^ - ---- soprano/pluginmanager.cpp.orig 2013-10-09 17:22:28 UTC -+++ soprano/pluginmanager.cpp -@@ -43,7 +43,7 @@ namespace { - fileSearchPaths << file.fileName().section( '/', 0, -2 ); - #ifndef Q_OS_WIN - // the lib folder in the same prefix -- fileSearchPaths << file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ) + QLatin1String( "lib"SOPRANO_LIB_SUFFIX ); -+ fileSearchPaths << file.fileName().section( "/", 0, -5, QString::SectionIncludeTrailingSep ) + QLatin1String( "lib" SOPRANO_LIB_SUFFIX ); - #endif - return Soprano::findLibraryPath( file.library(), fileSearchPaths, QStringList() << QLatin1String( "soprano" ) ); - } --- textproc/soprano/files/patch-soprano_sopranodirs.cpp (revision 492190) +++ textproc/soprano/files/patch-soprano_sopranodirs.cpp (nonexistent) @@ -1,25 +0,0 @@ -error: invalid suffix on literal; C++11 requires a space between literal and identifier - paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX ); - ^ ---- soprano/sopranodirs.cpp.orig 2018-01-06 22:23:48 UTC -+++ soprano/sopranodirs.cpp -@@ -124,14 +124,14 @@ QStringList Soprano::envDirList( const char* var ) - QStringList Soprano::libDirs() - { - QStringList paths = QCoreApplication::libraryPaths(); -- paths << QLatin1String( SOPRANO_PREFIX"/lib"SOPRANO_LIB_SUFFIX ); -+ paths << QLatin1String( SOPRANO_PREFIX "/lib" SOPRANO_LIB_SUFFIX ); - #ifdef Q_OS_WIN -- paths << QLatin1String( SOPRANO_PREFIX"/bin" ); -+ paths << QLatin1String( SOPRANO_PREFIX "/bin" ); - paths << getWinPrefix() + QLatin1String( "/bin" ); -- paths << getWinPrefix() + QLatin1String( "/lib"SOPRANO_LIB_SUFFIX ); -+ paths << getWinPrefix() + QLatin1String( "/lib" SOPRANO_LIB_SUFFIX ); - #else -- paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX ); -- paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX ); -+ paths << QLatin1String( "/usr/lib" SOPRANO_LIB_SUFFIX ); -+ paths << QLatin1String( "/usr/local/lib" SOPRANO_LIB_SUFFIX ); - paths += Soprano::envDirList( "LD_LIBRARY_PATH" ); - #endif - return paths; --- textproc/soprano/pkg-plist (revision 492190) +++ textproc/soprano/pkg-plist (working copy) @@ -1,5 +1,4 @@ bin/onto2vocabularyclass -bin/sopranocmd bin/sopranod include/Soprano/Backend include/Soprano/BackendFeature @@ -78,13 +77,8 @@ include/soprano/backend.h include/soprano/bindingset.h include/soprano/datastream.h -include/soprano/dbusclient.h include/soprano/dbusexportiterator.h include/soprano/dbusexportmodel.h -include/soprano/dbusmodel.h -include/soprano/dbusnodeiterator.h -include/soprano/dbusqueryresultiterator.h -include/soprano/dbusstatementiterator.h include/soprano/dummymodel.h include/soprano/error.h include/soprano/filtermodel.h @@ -98,7 +92,6 @@ include/soprano/iteratorbackend.h include/soprano/languagetag.h include/soprano/literalvalue.h -include/soprano/localsocketclient.h include/soprano/locator.h include/soprano/model.h include/soprano/mutexmodel.h @@ -128,25 +121,24 @@ include/soprano/soprano_export.h include/soprano/sopranomacros.h include/soprano/sopranotypes.h -include/soprano/sparqlmodel.h include/soprano/statement.h include/soprano/statementiterator.h include/soprano/statementpattern.h include/soprano/storagemodel.h -include/soprano/tcpclient.h include/soprano/version.h include/soprano/vocabulary.h include/soprano/xesam.h include/soprano/xsd.h +lib/cmake/Soprano/SopranoConfig.cmake +lib/cmake/Soprano/SopranoConfigVersion.cmake +lib/cmake/Soprano/SopranoTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Soprano/SopranoTargets.cmake lib/libsoprano.so -lib/libsoprano.so.4 lib/libsoprano.so.4.3.0 -lib/libsopranoclient.so -lib/libsopranoclient.so.1 -lib/libsopranoclient.so.1.2.0 +lib/libsoprano.so.5 lib/libsopranoserver.so -lib/libsopranoserver.so.1 lib/libsopranoserver.so.1.2.0 +lib/libsopranoserver.so.2 lib/soprano/libsoprano_nquadparser.so lib/soprano/libsoprano_nquadserializer.so lib/soprano/libsoprano_raptorparser.so