Re: update for the RDF libraries: redland etc.
Thanks Stuart. I have been struggling to build the entire ports tree
to identify any more candidates which can be safely merged without
causing conflicts with kde3. I will have a list for you guys soon.
On Mon, Nov 12, 2012 at 5:29 AM, Stuart Henderson wrote:
> This is merged from various work from dlg and openbsd-wip, it has
> successfully been through a bulk build. The API has changed for 2.x
> but seeing as all users either work directly with the new version
> (WANTLIB sync only) or can be updated fairly easily for this,
> no point keeping the old one.
>
> databases/soprano (update; kde4 thingy not currently linked to the build)
> editors/libreoffice (wantlib sync)
> multimedia/gstreamer-0.10/plugins-bad (wantlib sync)
> net/flickcurl (update)
> textproc/liblrdf (update)
> textproc/raptor (update)
> textproc/redland (update)
> textproc/rasqal (new port)
>
> Comments? Any OKs (at least for the new port textproc/rasqal so I can
> import it with the update)?
>
>
> Index: databases/soprano/Makefile
> ===
> RCS file: /cvs/ports/databases/soprano/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- databases/soprano/Makefile 29 Mar 2012 13:38:13 - 1.7
> +++ databases/soprano/Makefile 12 Nov 2012 11:14:19 -
> @@ -1,17 +1,16 @@
> -# $OpenBSD: Makefile,v 1.7 2012/03/29 13:38:13 sthen Exp $
> +# $OpenBSD: Makefile,v 1.6 2010/11/15 00:22:54 espie Exp $
>
> SHARED_ONLY = Yes
> -COMMENT = rdf framework
> +COMMENT = RDF framework
> CATEGORIES = databases devel textproc sysutils
>
> -SHARED_LIBS += soprano 0.0 # .4.0
> -SHARED_LIBS += sopranoclient 0.0 # .1.0
> -SHARED_LIBS += sopranoindex0.0 # .1.0
> -SHARED_LIBS += sopranoserver 0.0 # .1.0
> +SHARED_LIBS = soprano 1.0 # 1.0
> +SHARED_LIBS += sopranoclient 1.0 # 1.0
> +SHARED_LIBS += sopranoindex 1.0 # 1.0
> +SHARED_LIBS += sopranoserver 1.0 # 1.0
>
> HOMEPAGE = http://soprano.sourceforge.net/
> -DISTNAME = soprano-2.4.3
> -REVISION = 0
> +DISTNAME = soprano-2.8.0
> EXTRACT_SUFX = .tar.bz2
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=soprano/}
>
> @@ -21,20 +20,30 @@ PERMIT_PACKAGE_FTP =Yes
> PERMIT_DISTFILES_CDROM =Yes
> PERMIT_DISTFILES_FTP = Yes
>
> -MODULES += devel/cmake x11/qt4
> -CONFIGURE_STYLE = cmake
> -SEPARATE_BUILD = Yes
> +WANTLIB = c m stdc++
> +WANTLIB += lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtXml
> +WANTLIB += clucene-core iodbc raptor2 rdf
> +
> +MODULES =devel/cmake x11/qt4
> +CONFIGURE_STYLE = cmake
> +SEPARATE_BUILD = Yes
>
> -LIB_DEPENDS += textproc/clucene \
> - databases/iodbc,-main \
> +LIB_DEPENDS += textproc/clucene \
> + databases/iodbc,-main \
> textproc/raptor \
> textproc/redland
>
> -post-extract:
> - cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake
> MacroPushRequiredVars.cmake
> +RUN_DEPENDS = devel/desktop-file-utils
> +
> +# No Java, thanks
> +CONFIGURE_ARGS = -DSOPRANO_DISABLE_SESAME2_BACKEND:Bool=Yes \
> + -DSOPRANO_BUILD_TESTS:Bool=Yes
>
> -WANTLIB += c clucene iodbc lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtNetwork \
> - lib/qt4/QtXml m pthread raptor rdf stdc++
> +REGRESS_DEPENDS = x11/dbus
> +REGRESS_IS_INTERACTIVE = X11
>
> +post-extract:
> + cd ${WRKDIST}/cmake/modules && \
> + rm FindQt4.cmake MacroPushRequiredVars.cmake
>
> .include
> Index: databases/soprano/distinfo
> ===
> RCS file: /cvs/ports/databases/soprano/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- databases/soprano/distinfo 16 Jun 2010 13:42:24 - 1.3
> +++ databases/soprano/distinfo 12 Nov 2012 11:14:19 -
> @@ -1,5 +1,2 @@
> -MD5 (soprano-2.4.3.tar.bz2) = 4r+heaA4EK9gYYEQ9fgy4g==
> -RMD160 (soprano-2.4.3.tar.bz2) = UutEN5HMCTxaBp9aJE/g8dYxR9s=
> -SHA1 (soprano-2.4.3.tar.bz2) = PA6T0rZi00B9ozuMBmoD5mLRh9s=
> -SHA256 (soprano-2.4.3.tar.bz2) = OQxSm9H0agA2Ltmrkykz0k0mS0uJiASFSVWPWtUsqgg=
> -SIZE (soprano-2.4.3.tar.bz2) = 1944785
> +SHA256 (soprano-2.8.0.tar.bz2) = UJ016xDxJZYFYYUFHb0MlAYBl7JuviY6rGRlOrVWWcc=
> +SIZE (soprano-2.8.0.tar.bz2) = 1957014
> Index: databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
> ===
> RCS file: databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
> diff -N databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ databases/soprano/patches/patch-cmake_modules_FindRedland_cmake 12
> Nov 2012 11:14:19 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- cmake/modules/FindRedland.cmake.orig Mon Oct 15 16:40:54 2012
> cmake/modules/FindRedland.cmakeMon Oct 15 17:23
update for the RDF libraries: redland etc.
This is merged from various work from dlg and openbsd-wip, it has
successfully been through a bulk build. The API has changed for 2.x
but seeing as all users either work directly with the new version
(WANTLIB sync only) or can be updated fairly easily for this,
no point keeping the old one.
databases/soprano (update; kde4 thingy not currently linked to the build)
editors/libreoffice (wantlib sync)
multimedia/gstreamer-0.10/plugins-bad (wantlib sync)
net/flickcurl (update)
textproc/liblrdf (update)
textproc/raptor (update)
textproc/redland (update)
textproc/rasqal (new port)
Comments? Any OKs (at least for the new port textproc/rasqal so I can
import it with the update)?
Index: databases/soprano/Makefile
===
RCS file: /cvs/ports/databases/soprano/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- databases/soprano/Makefile 29 Mar 2012 13:38:13 - 1.7
+++ databases/soprano/Makefile 12 Nov 2012 11:14:19 -
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.7 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/15 00:22:54 espie Exp $
SHARED_ONLY = Yes
-COMMENT = rdf framework
+COMMENT = RDF framework
CATEGORIES = databases devel textproc sysutils
-SHARED_LIBS += soprano 0.0 # .4.0
-SHARED_LIBS += sopranoclient 0.0 # .1.0
-SHARED_LIBS += sopranoindex0.0 # .1.0
-SHARED_LIBS += sopranoserver 0.0 # .1.0
+SHARED_LIBS = soprano 1.0 # 1.0
+SHARED_LIBS += sopranoclient 1.0 # 1.0
+SHARED_LIBS += sopranoindex 1.0 # 1.0
+SHARED_LIBS += sopranoserver 1.0 # 1.0
HOMEPAGE = http://soprano.sourceforge.net/
-DISTNAME = soprano-2.4.3
-REVISION = 0
+DISTNAME = soprano-2.8.0
EXTRACT_SUFX = .tar.bz2
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=soprano/}
@@ -21,20 +20,30 @@ PERMIT_PACKAGE_FTP =Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-MODULES += devel/cmake x11/qt4
-CONFIGURE_STYLE = cmake
-SEPARATE_BUILD = Yes
+WANTLIB = c m stdc++
+WANTLIB += lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtXml
+WANTLIB += clucene-core iodbc raptor2 rdf
+
+MODULES =devel/cmake x11/qt4
+CONFIGURE_STYLE = cmake
+SEPARATE_BUILD = Yes
-LIB_DEPENDS += textproc/clucene \
- databases/iodbc,-main \
+LIB_DEPENDS += textproc/clucene \
+ databases/iodbc,-main \
textproc/raptor \
textproc/redland
-post-extract:
- cd ${WRKDIST}/cmake/modules && rm FindQt4.cmake
MacroPushRequiredVars.cmake
+RUN_DEPENDS = devel/desktop-file-utils
+
+# No Java, thanks
+CONFIGURE_ARGS = -DSOPRANO_DISABLE_SESAME2_BACKEND:Bool=Yes \
+ -DSOPRANO_BUILD_TESTS:Bool=Yes
-WANTLIB += c clucene iodbc lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtNetwork \
- lib/qt4/QtXml m pthread raptor rdf stdc++
+REGRESS_DEPENDS = x11/dbus
+REGRESS_IS_INTERACTIVE = X11
+post-extract:
+ cd ${WRKDIST}/cmake/modules && \
+ rm FindQt4.cmake MacroPushRequiredVars.cmake
.include
Index: databases/soprano/distinfo
===
RCS file: /cvs/ports/databases/soprano/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- databases/soprano/distinfo 16 Jun 2010 13:42:24 - 1.3
+++ databases/soprano/distinfo 12 Nov 2012 11:14:19 -
@@ -1,5 +1,2 @@
-MD5 (soprano-2.4.3.tar.bz2) = 4r+heaA4EK9gYYEQ9fgy4g==
-RMD160 (soprano-2.4.3.tar.bz2) = UutEN5HMCTxaBp9aJE/g8dYxR9s=
-SHA1 (soprano-2.4.3.tar.bz2) = PA6T0rZi00B9ozuMBmoD5mLRh9s=
-SHA256 (soprano-2.4.3.tar.bz2) = OQxSm9H0agA2Ltmrkykz0k0mS0uJiASFSVWPWtUsqgg=
-SIZE (soprano-2.4.3.tar.bz2) = 1944785
+SHA256 (soprano-2.8.0.tar.bz2) = UJ016xDxJZYFYYUFHb0MlAYBl7JuviY6rGRlOrVWWcc=
+SIZE (soprano-2.8.0.tar.bz2) = 1957014
Index: databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
===
RCS file: databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
diff -N databases/soprano/patches/patch-cmake_modules_FindRedland_cmake
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/soprano/patches/patch-cmake_modules_FindRedland_cmake 12 Nov
2012 11:14:19 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- cmake/modules/FindRedland.cmake.orig Mon Oct 15 16:40:54 2012
cmake/modules/FindRedland.cmakeMon Oct 15 17:23:56 2012
+@@ -108,7 +108,7 @@ if(NOT WIN32)
+ try_run(_TEST_EXITCODE _TEST_COMPILED
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/CheckLibraryLoads.c"
+- CMAKE_FLAGS "-DLINK_LIBRARIES=dl"
++ CMAKE_FLAGS "-DLINK_LIBRARIES=pthread"
+ RUN_OUTPUT_VARIABLE _OUTPUT
+ ARGS ${_REDLAND_STORAGE_LIBS}
+ )
Index: databases/soprano/patches/patch-test_sopranoliteraltest_cpp
===
