Hello all. Here is a somewhat heavy update of textproc/raptor, joint effort from Amit Kulkarni and me. It was a bit tricky because we need to update (not just bump) a few other ports too, especially, liblrdf.
Yes, this is another prerequisite for KDE 4 update. :) You can see that databases/soprano is set to broken ever; this will be dealt in a few days. Newer version is ready but I do not want to make current update too big, and nothing except KDE 4 needs it. All ports depending on raptor and/or liblrdf are tested, bumps (with some WANTLIB updates, while there) included. Exception is the openoffice3 port: it's excluded from builds anyway and does not differ too much from libreoffice. Also, I do not have Flickr account, so can't test new net/flickcurl. If I recall correctly, maintainer was basically OK with update. Not sure about aqualung update: I preferred adding libpng dependency to patching sources to forcefully disable it. textproc/redland has textproc/rasqal split off from it. I've added @conflict marker to textproc/rasqal and this should be enough: old packages, if any, will still use .libs-redland anyway, and newer ones should depend on rasqal explicitly. textproc/rasqal port will be sent in a separate mail, sorry: I have some problems with mailers ATM. Original textproc/liblrdf upstream is sleeping, so it was decided to use fork made by Taybin Rutkin. Actually, old site says: "As of 2011-07-01, this project may now be found at https://github.com/swh/LRDF."; so this should be done anyway. Tested on amd64 (Amit) and i386 (me). -- WBR, Vadim Zhukov Index: audio/aqualung/Makefile =================================================================== RCS file: /cvs/ports/audio/aqualung/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- audio/aqualung/Makefile 16 Sep 2011 08:26:10 -0000 1.26 +++ audio/aqualung/Makefile 10 Oct 2011 19:53:10 -0000 @@ -3,7 +3,7 @@ COMMENT= advanced music player DISTNAME= aqualung-0.9beta11 -REVISION= 5 +REVISION= 6 EPOCH= 0 CATEGORIES= audio @@ -26,6 +26,7 @@ WANTLIB += vorbis vorbisenc vorbisfile z WANTLIB += gdk_pixbuf-2.0 xml2 lua mac mad mpcdec FLAC avcodec WANTLIB += avformat avutil jack wavpack lrdf oggz speex cddb cdio WANTLIB += cdio_cdda cdio_paranoia modplug +WANTLIB += GL pixman-1 png pthread-stubs xcb xcb-render xcb-shm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqualung/} @@ -42,6 +43,7 @@ LIB_DEPENDS= audio/flac \ audio/speex \ audio/wavpack \ graphics/ffmpeg \ + graphics/png \ lang/lua \ multimedia/oggz \ textproc/liblrdf \ Index: net/flickcurl/Makefile =================================================================== RCS file: /cvs/ports/net/flickcurl/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- net/flickcurl/Makefile 2 Jun 2011 13:41:39 -0000 1.10 +++ net/flickcurl/Makefile 10 Oct 2011 20:17:29 -0000 @@ -2,8 +2,7 @@ COMMENT = flickr API library and utility -DISTNAME = flickcurl-1.14 -REVISION = 2 +DISTNAME = flickcurl-1.21 SHARED_LIBS += flickcurl 1.0 # .1.0 CATEGORIES = net @@ -19,7 +18,7 @@ PERMIT_DISTFILES_FTP = Yes MODULES = devel/gettext -WANTLIB = c crypto curl>=10 idn>=16 m raptor>=2 ssl \ +WANTLIB = c crypto curl>=10 idn>=16 m raptor2 ssl \ xml2>=9 xslt z MASTER_SITES = http://download.dajobe.org/flickcurl/ @@ -33,6 +32,6 @@ LIB_DEPENDS = net/curl \ textproc/raptor CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} --with-raptor +CONFIGURE_ARGS = ${CONFIGURE_SHARED} --with-raptor=2 .include <bsd.port.mk> Index: net/flickcurl/distinfo =================================================================== RCS file: /cvs/ports/net/flickcurl/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- net/flickcurl/distinfo 9 Oct 2009 16:09:31 -0000 1.2 +++ net/flickcurl/distinfo 10 Oct 2011 20:17:29 -0000 @@ -1,5 +1,5 @@ -MD5 (flickcurl-1.14.tar.gz) = 2wfIyIAUcHLljMZ0VA2DhA== -RMD160 (flickcurl-1.14.tar.gz) = vqWVz5hb8KCmeF6TKoETqFYtyk0= -SHA1 (flickcurl-1.14.tar.gz) = ZiXbIf97dqnhdHs8L2CilZn9lDc= -SHA256 (flickcurl-1.14.tar.gz) = AnuSW6GFTNVyizSKrkzDdy4E9cOxudW2L41KnJymb/Y= -SIZE (flickcurl-1.14.tar.gz) = 745082 +MD5 (flickcurl-1.21.tar.gz) = 1NNkIxUF3CKmr0K+e8he3w== +RMD160 (flickcurl-1.21.tar.gz) = WUPQKdmNVAgCoWLquMoTubLpSAo= +SHA1 (flickcurl-1.21.tar.gz) = Qvc3M+dQpUdYvQfbgf3RK5HEMN0= +SHA256 (flickcurl-1.21.tar.gz) = yXt6ug/f0GiOcwQymtrpxxZ6DkL+9aPLxFzJBtYEdkw= +SIZE (flickcurl-1.21.tar.gz) = 1775999 Index: net/flickcurl/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/flickcurl/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- net/flickcurl/pkg/PLIST 8 Nov 2010 21:29:10 -0000 1.3 +++ net/flickcurl/pkg/PLIST 10 Oct 2011 20:17:29 -0000 @@ -15,6 +15,14 @@ share/doc/pkg-readmes/${FULLPKGNAME} share/gtk-doc/ share/gtk-doc/html/ share/gtk-doc/html/flickcurl/ +share/gtk-doc/html/flickcurl/appgarden-commercial-picker.png +share/gtk-doc/html/flickcurl/appgarden-edit-auth-flow-mobile.png +share/gtk-doc/html/flickcurl/appgarden-edit-auth-flow.png +share/gtk-doc/html/flickcurl/appgarden-get-your-api-key.png +share/gtk-doc/html/flickcurl/appgarden-mobile-auth-page.png +share/gtk-doc/html/flickcurl/appgarden-new-api-key-secret.png +share/gtk-doc/html/flickcurl/appgarden-tell-us-about-your-app.png +share/gtk-doc/html/flickcurl/appgarden-test-app-page.png share/gtk-doc/html/flickcurl/flickcurl-auth-authenticate.html share/gtk-doc/html/flickcurl/flickcurl-auth-register.html share/gtk-doc/html/flickcurl/flickcurl-auth-use.html @@ -39,20 +47,24 @@ share/gtk-doc/html/flickcurl/flickcurl-s share/gtk-doc/html/flickcurl/flickcurl-section-core.html share/gtk-doc/html/flickcurl/flickcurl-section-exif.html share/gtk-doc/html/flickcurl/flickcurl-section-favorite.html +share/gtk-doc/html/flickcurl/flickcurl-section-gallery.html share/gtk-doc/html/flickcurl/flickcurl-section-general.html share/gtk-doc/html/flickcurl/flickcurl-section-group.html share/gtk-doc/html/flickcurl/flickcurl-section-machinetags.html share/gtk-doc/html/flickcurl/flickcurl-section-misc.html +share/gtk-doc/html/flickcurl/flickcurl-section-note.html share/gtk-doc/html/flickcurl/flickcurl-section-panda.html share/gtk-doc/html/flickcurl/flickcurl-section-people.html share/gtk-doc/html/flickcurl/flickcurl-section-person.html share/gtk-doc/html/flickcurl/flickcurl-section-photo.html +share/gtk-doc/html/flickcurl/flickcurl-section-photos-people.html share/gtk-doc/html/flickcurl/flickcurl-section-photoset.html share/gtk-doc/html/flickcurl/flickcurl-section-photoslist.html share/gtk-doc/html/flickcurl/flickcurl-section-place.html share/gtk-doc/html/flickcurl/flickcurl-section-prefs.html share/gtk-doc/html/flickcurl/flickcurl-section-reflection.html share/gtk-doc/html/flickcurl/flickcurl-section-serializer.html +share/gtk-doc/html/flickcurl/flickcurl-section-stats.html share/gtk-doc/html/flickcurl/flickcurl-section-tag.html share/gtk-doc/html/flickcurl/flickcurl-section-test.html share/gtk-doc/html/flickcurl/flickcurl-section-upload.html Index: multimedia/gstreamer-0.10/plugins-bad/Makefile =================================================================== RCS file: /cvs/ports/multimedia/gstreamer-0.10/plugins-bad/Makefile,v retrieving revision 1.62 diff -u -p -r1.62 Makefile --- multimedia/gstreamer-0.10/plugins-bad/Makefile 16 Sep 2011 10:31:23 -0000 1.62 +++ multimedia/gstreamer-0.10/plugins-bad/Makefile 10 Oct 2011 19:34:06 -0000 @@ -11,9 +11,9 @@ PKGNAME-main = gstreamer-plugins-bad-${ PKGNAME-neon = gstreamer-neon-${V} PKGNAME-mjpeg = gstreamer-mjpeg-${V} -REVISION-main = 5 -REVISION-neon = 1 -REVISION-mjpeg = 1 +REVISION-main = 6 +REVISION-neon = 2 +REVISION-mjpeg = 2 MULTI_PACKAGES = -main -neon -mjpeg @@ -26,7 +26,7 @@ MODULES = devel/gettext \ devel/dconf WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \ - z m pcre gstreamer-0.10 + z m pcre gstreamer-0.10 ffi .for i in ${MULTI_PACKAGES} REGRESS_DEPENDS += ${BASE_PKGPATH},${i} @@ -45,7 +45,7 @@ WANTLIB-main += freetype gdk_pixbuf-2.0 WANTLIB-main += gstcontroller-0.10 gstinterfaces-0.10 gstpbutils-0.10 WANTLIB-main += gstriff-0.10 gstrtp-0.10 gstsdp-0.10 gsttag-0.10 gstvideo-0.10 WANTLIB-main += idn jasper lrdf mms mpcdec orc-0.4 pango-1.0 pangocairo-1.0 -WANTLIB-main += pangoft2-1.0 pixman-1 png pthread-stubs raptor rsvg-2 +WANTLIB-main += pangoft2-1.0 pixman-1 png pthread-stubs raptor2 rsvg-2 WANTLIB-main += schroedinger-1.0 sndfile sndio ssl stdc++ usbhid vpx WANTLIB-main += xcb xcb-render xcb-shm xslt Index: audio/hydrogen/Makefile =================================================================== RCS file: /cvs/ports/audio/hydrogen/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- audio/hydrogen/Makefile 16 Sep 2011 08:26:10 -0000 1.15 +++ audio/hydrogen/Makefile 10 Oct 2011 19:42:33 -0000 @@ -2,7 +2,7 @@ COMMENT= software drum machine DISTNAME= hydrogen-0.9.4 -REVISION= 2 +REVISION= 3 CATEGORIES= audio HOMEPAGE= http://www.hydrogen-music.org/ MAINTAINER= Jacob Meuser <[email protected]> Index: textproc/liblrdf/Makefile =================================================================== RCS file: /cvs/ports/textproc/liblrdf/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- textproc/liblrdf/Makefile 14 Mar 2011 09:15:34 -0000 1.3 +++ textproc/liblrdf/Makefile 10 Oct 2011 20:37:50 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.3 2011/03/14 09:15:34 sthen Exp $ COMMENT = light RDF manipulation with LADSPA plugin support -DISTNAME = liblrdf-0.4.0 -REVISION = 0 +DISTNAME = swh-LRDF-7ebc032 +PKGNAME = liblrdf-0.5.0 -SHARED_LIBS = lrdf 0.0 # 0.0 +SHARED_LIBS = lrdf 1.0 # 0.0 CATEGORIES = textproc @@ -16,18 +16,23 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = crypto curl idn m raptor ssl xml2 xslt z - -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=lrdf/} +WANTLIB = crypto curl idn m raptor2 ssl xml2 xslt z +HOMEPAGE = http://github.com/swh/LRDF/ +MASTER_SITES = https://github.com/swh/LRDF/tarball/7ebc03286f4ec180acae27565028f8d45055df2e/ MODULES = devel/gettext -BUILD_DEPENDS = audio/ladspa +BUILD_DEPENDS = audio/ladspa LIB_DEPENDS = textproc/raptor -USE_LIBTOOL = yes -CONFIGURE_STYLE = gnu +USE_LIBTOOL = Yes +AUTOCONF_VERSION = 2.68 +AUTOMAKE_VERSION = 1.11 +CONFIGURE_STYLE = autoconf automake gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + +post-patch: + @cd ${WRKBUILD} && env AUTOCONF_VERSION=2.68 AUTOMAKE_VERSION=1.11 ./autogen.sh .include <bsd.port.mk> Index: textproc/liblrdf/distinfo =================================================================== RCS file: /cvs/ports/textproc/liblrdf/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- textproc/liblrdf/distinfo 23 Oct 2010 16:54:23 -0000 1.1.1.1 +++ textproc/liblrdf/distinfo 10 Oct 2011 20:37:50 -0000 @@ -1,5 +1,5 @@ -MD5 (liblrdf-0.4.0.tar.gz) = MnpWdPZxxLNgxjU4ACJodw== -RMD160 (liblrdf-0.4.0.tar.gz) = LLNxyZVSrDBFty4geGSUV13tN9g= -SHA1 (liblrdf-0.4.0.tar.gz) = F85V9pK8Uu0SYFCRuZEGJV+WS18= -SHA256 (liblrdf-0.4.0.tar.gz) = lemOhroG7XOlVxy8/z7ojkgbQDtutyfp6xgocO/ZsgQ= -SIZE (liblrdf-0.4.0.tar.gz) = 336959 +MD5 (swh-LRDF-7ebc032.tar.gz) = AF6iQVJiDafy7oCnjhf3hA== +RMD160 (swh-LRDF-7ebc032.tar.gz) = z665kRQHHBR4xps1+prLXYXo/Wk= +SHA1 (swh-LRDF-7ebc032.tar.gz) = G5/vg8zZpXNy4IWfx55suILWGWE= +SHA256 (swh-LRDF-7ebc032.tar.gz) = ATACuR7yCYJ/6ZVSuMfwtWnN2z1vFDm+29i6/hlWqTw= +SIZE (swh-LRDF-7ebc032.tar.gz) = 283109 Index: textproc/liblrdf/patches/patch-lrdf_h =================================================================== RCS file: textproc/liblrdf/patches/patch-lrdf_h diff -N textproc/liblrdf/patches/patch-lrdf_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ textproc/liblrdf/patches/patch-lrdf_h 10 Oct 2011 20:37:50 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- lrdf.h.orig Tue Sep 6 13:12:47 2011 ++++ lrdf.h Tue Sep 6 13:13:11 2011 +@@ -5,7 +5,7 @@ + extern "C" { + #endif + +-#include <raptor.h> ++#include <raptor2/raptor2.h> + #include <string.h> + #include <sys/types.h> + Index: editors/libreoffice/Makefile =================================================================== RCS file: /cvs/ports/editors/libreoffice/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- editors/libreoffice/Makefile 10 Oct 2011 09:01:42 -0000 1.48 +++ editors/libreoffice/Makefile 10 Oct 2011 19:34:16 -0000 @@ -14,6 +14,7 @@ PKGNAME= libreoffice-${VERSION} PKGNAME-main= libreoffice-${VERSION} PKGNAME-kde= libreoffice-kde-${VERSION} PKGNAME-java= libreoffice-java-${VERSION} +REVISION-main= 0 REVISION-java= 0 CATEGORIES= editors productivity @@ -155,7 +156,7 @@ LIB_DEPENDS-main=x11/gtk+2 \ WANTLIB-main= gdk-x11-2.0>=400.14 gtk-x11-2.0>=400.14 \ db>=4 xslt>=3 curl>=7 neon>=24 \ icuuc>=0 icudata>=0 icui18n icule \ - raptor>=2 rasqal rdf>=0 poppler + raptor2 rasqal rdf>=0 poppler WANTLIB-main+= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \ crypto expat fontconfig freetype gio-2.0 glib-2.0 \ Index: editors/openoffice3/Makefile =================================================================== RCS file: /cvs/ports/editors/openoffice3/Makefile,v retrieving revision 1.77 diff -u -p -r1.77 Makefile --- editors/openoffice3/Makefile 7 Oct 2011 13:54:31 -0000 1.77 +++ editors/openoffice3/Makefile 10 Oct 2011 20:40:53 -0000 @@ -21,7 +21,7 @@ REVISION-kde= 0 REVISION-java= 1 CATEGORIES= editors productivity -REVISION-main= 0 +REVISION-main= 1 MAINTAINER= Robert Nagy <[email protected]> @@ -155,7 +155,7 @@ LIB_DEPENDS-main=x11/gtk+2 \ WANTLIB-main= gdk-x11-2.0>=400.14 gtk-x11-2.0>=400.14 \ db>=4 xslt>=3 curl>=7 neon>=24 \ icuuc>=0 icudata>=0 icui18n icule \ - raptor>=2 rasqal rdf>=0 + raptor2 rasqal rdf>=0 WANTLIB-main+= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \ crypto expat fontconfig freetype gio-2.0 glib-2.0 \ Index: textproc/raptor/Makefile =================================================================== RCS file: /cvs/ports/textproc/raptor/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- textproc/raptor/Makefile 16 Sep 2011 11:41:41 -0000 1.6 +++ textproc/raptor/Makefile 10 Oct 2011 20:19:50 -0000 @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/20 19:56:51 espie Exp $ COMMENT= RDF Parser Toolkit for Redland -DISTNAME= raptor-1.4.18 -REVISION= 2 +DISTNAME= raptor2-2.0.4 +PKGNAME= ${DISTNAME:C/raptor2/raptor/} CATEGORIES= textproc -SHARED_LIBS= raptor 2.0 # .2.0 +SHARED_LIBS= raptor2 0.0 # 0.0 HOMEPAGE= http://librdf.org/ Index: textproc/raptor/distinfo =================================================================== RCS file: /cvs/ports/textproc/raptor/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- textproc/raptor/distinfo 18 Jan 2009 19:07:05 -0000 1.1.1.1 +++ textproc/raptor/distinfo 10 Oct 2011 20:19:50 -0000 @@ -1,5 +1,5 @@ -MD5 (raptor-1.4.18.tar.gz) = KE52ju2g4omLDVv34moBbg== -RMD160 (raptor-1.4.18.tar.gz) = ANQ3Abkqa3vvrPCCu/AaTs/nEnU= -SHA1 (raptor-1.4.18.tar.gz) = 1VOQpCQq1h8DQpHxyFSrA35QgnI= -SHA256 (raptor-1.4.18.tar.gz) = 7f2wc0+3Egvxy7YORaB4ZNstqq31w1kcz3NX8kTYKkA= -SIZE (raptor-1.4.18.tar.gz) = 1657246 +MD5 (raptor2-2.0.4.tar.gz) = A3PvuNhdyHK8e7WxxpKZ+w== +RMD160 (raptor2-2.0.4.tar.gz) = ZD6io2xN0HpbFaJd+SbXlcAkPUo= +SHA1 (raptor2-2.0.4.tar.gz) = eeEon0gMsP519J7CnZ9JGJqKWMI= +SHA256 (raptor2-2.0.4.tar.gz) = NPSdOvo19UM9h3ne3mLkplZ3g+4Fqy1q7Bo2BUxVKm4= +SIZE (raptor2-2.0.4.tar.gz) = 1660320 Index: textproc/raptor/patches/patch-src_raptor_internal_h =================================================================== RCS file: textproc/raptor/patches/patch-src_raptor_internal_h diff -N textproc/raptor/patches/patch-src_raptor_internal_h --- textproc/raptor/patches/patch-src_raptor_internal_h 5 Jul 2011 08:18:30 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_raptor_internal_h,v 1.1 2011/07/05 08:18:30 jasper Exp $ ---- src/raptor_internal.h.orig Tue Jul 5 09:31:34 2011 -+++ src/raptor_internal.h Tue Jul 5 09:31:42 2011 -@@ -786,7 +786,6 @@ int raptor_utf8_is_nfc(const unsigned char *input, siz - - #ifdef RAPTOR_WWW_LIBCURL - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #endif - Index: textproc/raptor/pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/textproc/raptor/pkg/PFRAG.shared,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PFRAG.shared --- textproc/raptor/pkg/PFRAG.shared 18 Jan 2009 19:07:05 -0000 1.1.1.1 +++ textproc/raptor/pkg/PFRAG.shared 10 Oct 2011 20:19:50 -0000 @@ -1,2 +1,2 @@ @comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/01/18 19:07:05 robert Exp $ -@lib lib/libraptor.so.${LIBraptor_VERSION} +@lib lib/libraptor2.so.${LIBraptor2_VERSION} Index: textproc/raptor/pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/raptor/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- textproc/raptor/pkg/PLIST 18 Jan 2009 19:07:05 -0000 1.1.1.1 +++ textproc/raptor/pkg/PLIST 10 Oct 2011 20:19:50 -0000 @@ -1,15 +1,15 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/18 19:07:05 robert Exp $ %%SHARED%% @bin bin/rapper -bin/raptor-config -include/raptor.h -lib/libraptor.a -lib/libraptor.la +include/raptor2/ +include/raptor2/raptor.h +include/raptor2/raptor2.h +lib/libraptor2.a +lib/libraptor2.la lib/pkgconfig/ -lib/pkgconfig/raptor.pc +lib/pkgconfig/raptor2.pc @man man/man1/rapper.1 -@man man/man1/raptor-config.1 -@man man/man3/libraptor.3 +@man man/man3/libraptor2.3 share/gtk-doc/ share/gtk-doc/html/ share/gtk-doc/html/raptor/ @@ -21,19 +21,25 @@ share/gtk-doc/html/raptor/ix01.html share/gtk-doc/html/raptor/left.png share/gtk-doc/html/raptor/parser-grddl.html share/gtk-doc/html/raptor/parser-guess.html +share/gtk-doc/html/raptor/parser-json.html share/gtk-doc/html/raptor/parser-ntriples.html share/gtk-doc/html/raptor/parser-rdfa.html share/gtk-doc/html/raptor/parser-rdfxml.html share/gtk-doc/html/raptor/parser-rss-tag-soup.html share/gtk-doc/html/raptor/parser-trig.html share/gtk-doc/html/raptor/parser-turtle.html +share/gtk-doc/html/raptor/raptor-formats-types-by-parser.html +share/gtk-doc/html/raptor/raptor-formats-types-by-serializer.html +share/gtk-doc/html/raptor/raptor-formats-types-index.html +share/gtk-doc/html/raptor/raptor-formats.html share/gtk-doc/html/raptor/raptor-parsers.html +share/gtk-doc/html/raptor/raptor-section-avltree.html share/gtk-doc/html/raptor/raptor-section-constants.html -share/gtk-doc/html/raptor/raptor-section-feature.html share/gtk-doc/html/raptor/raptor-section-general.html share/gtk-doc/html/raptor/raptor-section-iostream.html share/gtk-doc/html/raptor/raptor-section-locator.html share/gtk-doc/html/raptor/raptor-section-memory.html +share/gtk-doc/html/raptor/raptor-section-option.html share/gtk-doc/html/raptor/raptor-section-parser.html share/gtk-doc/html/raptor/raptor-section-sax2.html share/gtk-doc/html/raptor/raptor-section-sequence.html @@ -41,8 +47,8 @@ share/gtk-doc/html/raptor/raptor-section share/gtk-doc/html/raptor/raptor-section-stringbuffer.html share/gtk-doc/html/raptor/raptor-section-triples.html share/gtk-doc/html/raptor/raptor-section-unicode.html -share/gtk-doc/html/raptor/raptor-section-uri-factory.html share/gtk-doc/html/raptor/raptor-section-uri.html +share/gtk-doc/html/raptor/raptor-section-world.html share/gtk-doc/html/raptor/raptor-section-www.html share/gtk-doc/html/raptor/raptor-section-xml-namespace.html share/gtk-doc/html/raptor/raptor-section-xml-qname.html @@ -50,12 +56,16 @@ share/gtk-doc/html/raptor/raptor-section share/gtk-doc/html/raptor/raptor-serializers.html share/gtk-doc/html/raptor/raptor.devhelp share/gtk-doc/html/raptor/raptor.devhelp2 +share/gtk-doc/html/raptor/raptor2-changes-1-4-21-to-2-0-0.html +share/gtk-doc/html/raptor/raptor2-changes-2-0-3-to-2-0-4.html +share/gtk-doc/html/raptor/raptor2-changes.html share/gtk-doc/html/raptor/reference-manual.html share/gtk-doc/html/raptor/restrict-parser-network-access.html share/gtk-doc/html/raptor/right.png share/gtk-doc/html/raptor/serializer-atom.html share/gtk-doc/html/raptor/serializer-dot.html share/gtk-doc/html/raptor/serializer-json.html +share/gtk-doc/html/raptor/serializer-nquads.html share/gtk-doc/html/raptor/serializer-ntriples.html share/gtk-doc/html/raptor/serializer-rdfxml-abbrev.html share/gtk-doc/html/raptor/serializer-rdfxml-xmp.html Index: textproc/redland/Makefile =================================================================== RCS file: /cvs/ports/textproc/redland/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- textproc/redland/Makefile 20 Nov 2010 19:56:51 -0000 1.5 +++ textproc/redland/Makefile 10 Oct 2011 20:33:28 -0000 @@ -1,12 +1,10 @@ # $OpenBSD: Makefile,v 1.5 2010/11/20 19:56:51 espie Exp $ COMMENT= high-level interface for RDF -DISTNAME= redland-1.0.8 -REVISION= 1 +DISTNAME= redland-1.0.14 CATEGORIES= textproc -SHARED_LIBS= rasqal 1.0 \ - rdf 0.0 +SHARED_LIBS= rdf 1.0 HOMEPAGE= http://librdf.org/ @@ -18,20 +16,27 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto curl idn m ssl xml2 xslt z raptor>=2 +WANTLIB+= c crypto curl idn iodbc iodbcinst ltdl m ssl xml2 +WANTLIB+= xslt z raptor2 rasqal MODULES= devel/gettext -LIB_DEPENDS= textproc/raptor + +LIB_DEPENDS= databases/iodbc \ + devel/libtool,-ltdl \ + textproc/raptor \ + textproc/rasqal CONFIGURE_STYLE= gnu -USE_LIBTOOL= Yes +USE_LIBTOOL= gnu USE_GROFF = Yes CONFIGURE_ARGS= --with-raptor=system \ - --with-rasqal=internal \ + --with-rasqal=system \ --with-threestore=no \ --with-sqlite=no \ --with-mysql=no \ - --with-postgresql=no + --with-postgresql=no \ + --with-ltdl-include=${LOCALBASE}/include \ + --with-ltdl-lib=${LOCALBASE}/lib .include <bsd.port.mk> Index: textproc/redland/distinfo =================================================================== RCS file: /cvs/ports/textproc/redland/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- textproc/redland/distinfo 18 Jan 2009 19:05:35 -0000 1.1.1.1 +++ textproc/redland/distinfo 10 Oct 2011 20:33:28 -0000 @@ -1,5 +1,5 @@ -MD5 (redland-1.0.8.tar.gz) = ymbiYILKuLuBcYWhFtuAmw== -RMD160 (redland-1.0.8.tar.gz) = wEauqJlF454ZF/gzw1y43CcvP2U= -SHA1 (redland-1.0.8.tar.gz) = lQG5WitmgGfi3LCrO9tZ4DdhRN4= -SHA256 (redland-1.0.8.tar.gz) = inf8/SD+osblN2HW3LvuP9s15TCN42wdqg0gFOWpav4= -SIZE (redland-1.0.8.tar.gz) = 3989935 +MD5 (redland-1.0.14.tar.gz) = NABXnRN9qCxBdd6/n21Tug== +RMD160 (redland-1.0.14.tar.gz) = HFj4EQZoLaMXTAXmagx3VnWHvjU= +SHA1 (redland-1.0.14.tar.gz) = JWG/c/APiOOfXHs6m3j41M59qVU= +SHA256 (redland-1.0.14.tar.gz) = Eww/ApCGjfGqgvdkiu5zZ3Jxp+CGcQnLoWdR/RIGhsQ= +SIZE (redland-1.0.14.tar.gz) = 1581695 Index: textproc/redland/patches/patch-src_Makefile_in =================================================================== RCS file: textproc/redland/patches/patch-src_Makefile_in diff -N textproc/redland/patches/patch-src_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ textproc/redland/patches/patch-src_Makefile_in 10 Oct 2011 20:33:28 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- src/Makefile.in.orig Wed Sep 7 02:01:51 2011 ++++ src/Makefile.in Wed Sep 7 02:02:05 2011 +@@ -600,8 +600,7 @@ librdf_la_LIBADD = \ + @LIBRDF_INTERNAL_LIBS@ + + librdf_la_DEPENDENCIES = \ +-@DIGEST_OBJS@ @HASH_OBJS@ \ +-@LIBRDF_INTERNAL_LIBS@ ++@DIGEST_OBJS@ @HASH_OBJS@ + + EXTRA_librdf_la_SOURCES = rdf_hash_bdb.c \ + rdf_digest_md5.c rdf_digest_sha1.c \ Index: textproc/redland/pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/textproc/redland/pkg/PFRAG.shared,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PFRAG.shared --- textproc/redland/pkg/PFRAG.shared 18 Jan 2009 19:05:35 -0000 1.1.1.1 +++ textproc/redland/pkg/PFRAG.shared 10 Oct 2011 20:33:28 -0000 @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/01/18 19:05:35 robert Exp $ -@lib lib/librasqal.so.${LIBrasqal_VERSION} +@comment $OpenBSD$ @lib lib/librdf.so.${LIBrdf_VERSION} +lib/redland/librdf_storage_virtuoso.so Index: textproc/redland/pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/redland/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- textproc/redland/pkg/PLIST 18 Jan 2009 19:05:35 -0000 1.1.1.1 +++ textproc/redland/pkg/PLIST 10 Oct 2011 20:33:28 -0000 @@ -1,73 +1,42 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2009/01/18 19:05:35 robert Exp $ %%SHARED%% -bin/rasqal-config @bin bin/rdfproc bin/redland-config @bin bin/redland-db-upgrade -@bin bin/roqet include/librdf.h -include/rasqal/ -include/rasqal/rasqal.h include/rdf_concepts.h include/rdf_digest.h include/rdf_hash.h include/rdf_init.h include/rdf_iterator.h +include/rdf_list.h include/rdf_log.h include/rdf_model.h include/rdf_node.h include/rdf_parser.h include/rdf_query.h +include/rdf_raptor.h include/rdf_serializer.h include/rdf_statement.h include/rdf_storage.h +include/rdf_storage_module.h include/rdf_stream.h include/rdf_uri.h include/rdf_utf8.h include/redland.h -lib/librasqal.a -lib/librasqal.la lib/librdf.a lib/librdf.la lib/pkgconfig/ -lib/pkgconfig/rasqal.pc lib/pkgconfig/redland.pc lib/redland/ -@man man/man1/rasqal-config.1 +lib/redland/librdf_storage_virtuoso.a +lib/redland/librdf_storage_virtuoso.la @man man/man1/rdfproc.1 @man man/man1/redland-config.1 @man man/man1/redland-db-upgrade.1 -@man man/man1/roqet.1 -@man man/man3/librasqal.3 @man man/man3/redland.3 share/gtk-doc/ share/gtk-doc/html/ -share/gtk-doc/html/rasqal/ -share/gtk-doc/html/rasqal/home.png -share/gtk-doc/html/rasqal/index.html -share/gtk-doc/html/rasqal/index.sgml -share/gtk-doc/html/rasqal/ix01.html -share/gtk-doc/html/rasqal/left.png -share/gtk-doc/html/rasqal/pt01.html -share/gtk-doc/html/rasqal/rasqal-section-data.html -share/gtk-doc/html/rasqal/rasqal-section-expression.html -share/gtk-doc/html/rasqal/rasqal-section-general.html -share/gtk-doc/html/rasqal/rasqal-section-graph-pattern.html -share/gtk-doc/html/rasqal/rasqal-section-literal.html -share/gtk-doc/html/rasqal/rasqal-section-prefix.html -share/gtk-doc/html/rasqal/rasqal-section-query-results-formatter.html -share/gtk-doc/html/rasqal/rasqal-section-query-results.html -share/gtk-doc/html/rasqal/rasqal-section-query.html -share/gtk-doc/html/rasqal/rasqal-section-triple.html -share/gtk-doc/html/rasqal/rasqal-section-triples-source.html -share/gtk-doc/html/rasqal/rasqal-section-variable.html -share/gtk-doc/html/rasqal/rasqal-section-xsd.html -share/gtk-doc/html/rasqal/rasqal.devhelp -share/gtk-doc/html/rasqal/rasqal.devhelp2 -share/gtk-doc/html/rasqal/rasqal.html -share/gtk-doc/html/rasqal/right.png -share/gtk-doc/html/rasqal/style.css -share/gtk-doc/html/rasqal/up.png share/gtk-doc/html/redland/ share/gtk-doc/html/redland/home.png share/gtk-doc/html/redland/index.html @@ -76,6 +45,9 @@ share/gtk-doc/html/redland/indexes.html share/gtk-doc/html/redland/introduction.html share/gtk-doc/html/redland/left.png share/gtk-doc/html/redland/objects.html +share/gtk-doc/html/redland/redland-changes-1-0-12-to-1-0-13.html +share/gtk-doc/html/redland/redland-changes-1-0-13-to-1-0-14.html +share/gtk-doc/html/redland/redland-changes.html share/gtk-doc/html/redland/redland-concepts.html share/gtk-doc/html/redland/redland-digest.html share/gtk-doc/html/redland/redland-files.html @@ -99,6 +71,7 @@ share/gtk-doc/html/redland/redland-stora share/gtk-doc/html/redland/redland-storage-module-sqlite.html share/gtk-doc/html/redland/redland-storage-module-tstore.html share/gtk-doc/html/redland/redland-storage-module-uri.html +share/gtk-doc/html/redland/redland-storage-module-virtuoso.html share/gtk-doc/html/redland/redland-storage-modules.html share/gtk-doc/html/redland/redland-storage.html share/gtk-doc/html/redland/redland-stream.html @@ -111,6 +84,7 @@ share/gtk-doc/html/redland/redland.html share/gtk-doc/html/redland/reference-manual.html share/gtk-doc/html/redland/right.png share/gtk-doc/html/redland/style.css +share/gtk-doc/html/redland/tutorial-introduction.html share/gtk-doc/html/redland/tutorial.html share/gtk-doc/html/redland/up.png share/redland/ Index: databases/soprano/Makefile =================================================================== RCS file: /cvs/ports/databases/soprano/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- databases/soprano/Makefile 15 Nov 2010 00:22:54 -0000 1.6 +++ databases/soprano/Makefile 10 Oct 2011 20:43:29 -0000 @@ -1,5 +1,6 @@ # $OpenBSD: Makefile,v 1.6 2010/11/15 00:22:54 espie Exp $ +BROKEN = waits for KDE 4 update SHARED_ONLY = Yes COMMENT = rdf framework CATEGORIES = databases devel textproc sysutils
