Index: textproc/raptor/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/raptor/Makefile,v retrieving revision 1.50 diff -u -r1.50 Makefile --- textproc/raptor/Makefile 11 May 2010 12:23:22 -0000 1.50 +++ textproc/raptor/Makefile 7 Jun 2011 14:07:28 -0000 @@ -6,10 +6,10 @@ # PORTNAME= raptor -PORTVERSION= 1.4.21 +PORTVERSION= 2.0.3 CATEGORIES= textproc -MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \ - http://download.librdf.org/source/ +MASTER_SITES= http://download.librdf.org/source/ +DISTNAME= ${PORTNAME}2-${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= RDF Parser Toolkit for Redland @@ -25,7 +25,7 @@ USE_LDCONFIG= yes -MAN1= rapper.1 raptor-config.1 -MAN3= libraptor.3 +MAN1= rapper.1 +MAN3= libraptor2.3 .include Index: textproc/raptor/distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/raptor/distinfo,v retrieving revision 1.28 diff -u -r1.28 distinfo --- textproc/raptor/distinfo 11 May 2010 12:23:22 -0000 1.28 +++ textproc/raptor/distinfo 7 Jun 2011 14:03:12 -0000 @@ -1,3 +1,2 @@ -MD5 (raptor-1.4.21.tar.gz) = 992061488af7a9e2d933df6b694bb876 -SHA256 (raptor-1.4.21.tar.gz) = db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca -SIZE (raptor-1.4.21.tar.gz) = 1651843 +SHA256 (raptor2-2.0.3.tar.gz) = e221e62dd0df01eb4bdcbf7844444d0a5d5babc88a9cf3f167a38dfe03788ec5 +SIZE (raptor2-2.0.3.tar.gz) = 1652679 Index: textproc/raptor/pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/raptor/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- textproc/raptor/pkg-plist 11 May 2010 12:23:22 -0000 1.15 +++ textproc/raptor/pkg-plist 7 Jun 2011 14:09:29 -0000 @@ -1,15 +1,12 @@ bin/rapper -bin/raptor-config -include/raptor.h -lib/libraptor.a -lib/libraptor.la -lib/libraptor.so -lib/libraptor.so.3 -libdata/pkgconfig/raptor.pc @exec mkdir -p %D/share/gtk-doc/html/raptor -share/gtk-doc/html/raptor/parser-rdfa.html -share/gtk-doc/html/raptor/serializer-json.html -share/gtk-doc/html/raptor/raptor-section-sax2.html +include/raptor2/raptor2.h +include/raptor2/raptor.h +lib/libraptor2.so.0 +lib/libraptor2.so +lib/libraptor2.la +lib/libraptor2.a +libdata/pkgconfig/raptor2.pc share/gtk-doc/html/raptor/home.png share/gtk-doc/html/raptor/index.html share/gtk-doc/html/raptor/index.sgml @@ -18,39 +15,50 @@ 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.devhelp -share/gtk-doc/html/raptor/raptor.devhelp2 +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 share/gtk-doc/html/raptor/raptor-section-serializer.html -share/gtk-doc/html/raptor/raptor-serializers.html 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 share/gtk-doc/html/raptor/raptor-section-xml.html +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.html +share/gtk-doc/html/raptor/right.png 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 @@ -59,10 +67,8 @@ share/gtk-doc/html/raptor/serializer-turtle.html share/gtk-doc/html/raptor/style.css share/gtk-doc/html/raptor/tutorial-initialising-finishing.html -share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html -share/gtk-doc/html/raptor/tutorial.html -share/gtk-doc/html/raptor/tutorial-parse-strictness.html share/gtk-doc/html/raptor/tutorial-parser-abort.html +share/gtk-doc/html/raptor/tutorial-parse-strictness.html share/gtk-doc/html/raptor/tutorial-parser-content.html share/gtk-doc/html/raptor/tutorial-parser-create.html share/gtk-doc/html/raptor/tutorial-parser-destroy.html @@ -72,21 +78,24 @@ share/gtk-doc/html/raptor/tutorial-parser-set-error-warning-handlers.html share/gtk-doc/html/raptor/tutorial-parser-set-id-handler.html share/gtk-doc/html/raptor/tutorial-parser-set-namespace-handler.html -share/gtk-doc/html/raptor/tutorial-parser-static-info.html share/gtk-doc/html/raptor/tutorial-parser-set-triple-handler.html share/gtk-doc/html/raptor/tutorial-parsing.html +share/gtk-doc/html/raptor/tutorial-parser-static-info.html share/gtk-doc/html/raptor/tutorial-querying-functionality.html share/gtk-doc/html/raptor/tutorial-serializer-create.html share/gtk-doc/html/raptor/tutorial-serializer-declare-namespace.html share/gtk-doc/html/raptor/tutorial-serializer-destroy.html share/gtk-doc/html/raptor/tutorial-serializer-example.html share/gtk-doc/html/raptor/tutorial-serializer-features.html +share/gtk-doc/html/raptor/tutorial-serializer-get-triples.html share/gtk-doc/html/raptor/tutorial-serializer-runtime-info.html share/gtk-doc/html/raptor/tutorial-serializer-send-triples.html -share/gtk-doc/html/raptor/tutorial-serializer-set-error-warning-handlers.html share/gtk-doc/html/raptor/tutorial-serializer-to-destination.html +share/gtk-doc/html/raptor/tutorial-serializer-set-error-warning-handlers.html share/gtk-doc/html/raptor/tutorial-serializing.html +share/gtk-doc/html/raptor/tutorial.html share/gtk-doc/html/raptor/up.png @dirrm share/gtk-doc/html/raptor @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc +@dirrmtry include/raptor2 Index: textproc/rasqal/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/rasqal/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- textproc/rasqal/Makefile 23 Oct 2010 20:05:11 -0000 1.38 +++ textproc/rasqal/Makefile 7 Jun 2011 14:11:44 -0000 @@ -7,15 +7,14 @@ # PORTNAME= rasqal -PORTVERSION= 0.9.20 +PORTVERSION= 0.9.25 CATEGORIES= textproc -MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \ - http://download.librdf.org/source/ +MASTER_SITES= http://download.librdf.org/source/ MAINTAINER= kde@FreeBSD.org COMMENT= A high-level interface for RDF -LIB_DEPENDS= raptor.3:${PORTSDIR}/textproc/raptor \ +LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor \ pcre.0:${PORTSDIR}/devel/pcre USE_GNOME= gnomehack gnometarget lthack pkgconfig @@ -25,7 +24,7 @@ CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-raptor=system USE_LDCONFIG= yes Index: textproc/rasqal/distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/rasqal/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- textproc/rasqal/distinfo 23 Oct 2010 20:05:11 -0000 1.20 +++ textproc/rasqal/distinfo 7 Jun 2011 14:01:22 -0000 @@ -1,3 +1,2 @@ -MD5 (rasqal-0.9.20.tar.gz) = c45b6cd784298e264e8757d14355ecce -SHA256 (rasqal-0.9.20.tar.gz) = 48075b9e9a4962fece8395d8c7c72bf883d13b0cd07ac90cea2b4b1f310cfe2d -SIZE (rasqal-0.9.20.tar.gz) = 1270144 +SHA256 (rasqal-0.9.25.tar.gz) = daf6874a795ed446c9d44b96942d17ff237a4fd79f7830428fe4391eda0bd540 +SIZE (rasqal-0.9.25.tar.gz) = 1429683 Index: textproc/rasqal/pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/rasqal/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- textproc/rasqal/pkg-plist 11 May 2010 12:23:22 -0000 1.15 +++ textproc/rasqal/pkg-plist 7 Jun 2011 14:16:20 -0000 @@ -4,13 +4,18 @@ lib/librasqal.a lib/librasqal.la lib/librasqal.so -lib/librasqal.so.2 +lib/librasqal.so.3 libdata/pkgconfig/rasqal.pc 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/indexes.html share/gtk-doc/html/rasqal/left.png +share/gtk-doc/html/rasqal/rasqal-changes-0-9-21-to-0-9-22.html +share/gtk-doc/html/rasqal/rasqal-changes-0-9-22-to-0-9-23.html +share/gtk-doc/html/rasqal/rasqal-changes-0-9-23-to-0-9-24.html +share/gtk-doc/html/rasqal/rasqal-changes-0-9-24-to-0-9-25.html +share/gtk-doc/html/rasqal/rasqal-changes.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 @@ -21,6 +26,7 @@ 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-row.html +share/gtk-doc/html/rasqal/rasqal-section-service.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-updates.html Index: textproc/liblrdf/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/liblrdf/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- textproc/liblrdf/Makefile 4 Dec 2010 07:33:46 -0000 1.23 +++ textproc/liblrdf/Makefile 7 Jun 2011 14:43:49 -0000 @@ -6,7 +6,7 @@ PORTNAME= liblrdf PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/lrdf/${PORTNAME}/${PORTVERSION} @@ -14,7 +14,7 @@ COMMENT= Library for manipulating RDF files describing LADSPA plugins BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -LIB_DEPENDS= raptor.3:${PORTSDIR}/textproc/raptor +LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor USE_AUTOTOOLS= libtool USE_GNOME= gnomehack gnometarget Index: textproc/liblrdf/files/patch-raptor2.diff =================================================================== RCS file: textproc/liblrdf/files/patch-raptor2.diff diff -N textproc/liblrdf/files/patch-raptor2.diff --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ textproc/liblrdf/files/patch-raptor2.diff 7 Jun 2011 14:46:03 -0000 @@ -0,0 +1,248 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 71e164d..2237a29 100644 +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la + noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h + + liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c +-liblrdf_la_LIBADD = -lraptor ++liblrdf_la_LIBADD = -lraptor2 + liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@ +diff --git a/src/lrdf.c b/src/lrdf.c +index 0bb7b22..8849e43 100644 +--- src/lrdf.c.orig ++++ src/lrdf.c +@@ -18,6 +18,7 @@ + static unsigned int lrdf_uid = 0; /* A unique(ish) id to append to genid's to + * avoid clashses */ + ++static raptor_world *world = NULL; + static lrdf_statement *triples = NULL; + static lrdf_statement *free_triples; + static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE]; +@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl, + lrdf_hash hash, lrdf_statement * s); + static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl, + lrdf_hash subject, lrdf_hash object); +-static void lrdf_store(void *user_data, +- const raptor_statement * statement); ++static void lrdf_store(void *user_data, raptor_statement * statement); + void lrdf_free_statements(lrdf_statement * s); + void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to); + void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl, +@@ -71,7 +71,7 @@ void lrdf_init() + unsigned int i; + struct timeval tv; + +- raptor_init(); ++ world = raptor_new_world(); + lrdf_more_triples(256); + + /* A UID to add to genids to make them safer */ +@@ -112,7 +112,8 @@ void lrdf_more_triples(int count) + + void lrdf_cleanup() + { +- raptor_finish(); ++ raptor_free_world(world); ++ world = NULL; + + lrdf_free_string_hash(resources_hash); + lrdf_free_string_hash(literals_hash); +@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern) + } + } + +-static void lrdf_store(void *user_data, const raptor_statement * statement) ++static const char *lrdf_term_as_string(char *tmp, int tmp_len, ++ const raptor_term *term) ++{ ++ switch (term->type) { ++ case RAPTOR_TERM_TYPE_URI: ++ return (const char *) raptor_uri_as_string(term->value.uri); ++ case RAPTOR_TERM_TYPE_LITERAL: ++ return (const char *) term->value.literal.string; ++ case RAPTOR_TERM_TYPE_BLANK: ++ snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid); ++ return tmp; ++ default: ++ return "(?)"; ++ } ++} ++ ++static void lrdf_store(void *user_data, raptor_statement * statement) + { + lrdf_statement *s = lrdf_alloc_statement(); + char tmps[128], tmpp[128], tmpo[128]; +- char *subj = (char *) statement->subject, +- *pred = (char *) statement->predicate, +- *obj = (char *) statement->object; +- +- if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { +- snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid); +- subj = tmps; +- } +- if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { +- snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid); +- pred = tmpp; +- } +- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) { +- snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid); +- obj = tmpo; +- } ++ const char *subj = lrdf_term_as_string(tmps, 128, statement->subject), ++ *pred = lrdf_term_as_string(tmpp, 128, statement->predicate), ++ *obj = lrdf_term_as_string(tmpo, 128, statement->object); + + s->shash = lrdf_gen_hash(subj); + s->phash = lrdf_gen_hash(pred); +@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement) + + s->subject = lrdf_check_hash(resources_hash, s->shash, subj); + s->predicate = lrdf_check_hash(resources_hash, s->phash, pred); +- if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) { ++ if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) { + s->object = lrdf_check_hash(literals_hash, s->ohash, obj); + s->object_type = lrdf_literal; + } else { +@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl, + free(pathto); + } + +-static void lrdf_error_handler(void *data, raptor_locator * locator, +- const char *message); ++static void lrdf_log_handler(void *data, raptor_log_message *message); + +-static void lrdf_error_handler(void *data, raptor_locator * locator, +- const char *message) ++static void lrdf_log_handler(void *data, raptor_log_message *message) + { +- fprintf(stderr, "liblrdf: error - "); +- raptor_print_locator(stderr, locator); +- fprintf(stderr, " - %s\n", message); +- +- raptor_parse_abort((raptor_parser*)data); +-} ++ const char *severity = "error"; ++ if (message->level == RAPTOR_LOG_LEVEL_WARN) { ++ severity = "warning"; ++ } + +-static void lrdf_warning_handler(void *data, raptor_locator * locator, +- const char *message); ++ fprintf(stderr, "liblrdf: %s - ", severity); ++ raptor_locator_print(message->locator, stderr); ++ fprintf(stderr, " - %s\n", message->text); + +-static void lrdf_warning_handler(void *data, raptor_locator * locator, +- const char *message) +-{ +- fprintf(stderr, "liblrdf: warning - "); +- raptor_print_locator(stderr, locator); +- fprintf(stderr, " - %s\n", message); ++ if (message->level != RAPTOR_LOG_LEVEL_WARN) { ++ raptor_parser_parse_abort((raptor_parser*)data); ++ } + } + + +@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri) + lrdf_hash source; + + //printf("lrdf: reading %s\n", uri); +- ruri = raptor_new_uri(uri); +- furi = raptor_new_uri(uri); ++ ruri = raptor_new_uri(world, (const unsigned char *) uri); ++ furi = raptor_new_uri(world, (const unsigned char *) uri); + source = lrdf_gen_hash(uri); + lrdf_check_hash(resources_hash, source, uri); + + if (strstr(uri, ".rdf")) { +- parser = raptor_new_parser("rdfxml"); ++ parser = raptor_new_parser(world, "rdfxml"); + } else { +- parser = raptor_new_parser("ntriples"); ++ parser = raptor_new_parser(world, "ntriples"); + } + if (!parser) { + fprintf(stderr, "liblrdf: failed to create parser\n"); +@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri) + return 1; + } + +- raptor_set_error_handler(parser, parser, lrdf_error_handler); +- raptor_set_warning_handler(parser, NULL, lrdf_warning_handler); +- raptor_set_statement_handler(parser, &source, lrdf_store); +- raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid); ++ raptor_world_set_log_handler(world, parser, lrdf_log_handler); ++ raptor_parser_set_statement_handler(parser, &source, lrdf_store); ++ raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid); + +- if (raptor_parse_file(parser, furi, ruri)) { ++ if (raptor_parser_parse_file(parser, furi, ruri)) { + raptor_free_uri(furi); + raptor_free_uri(ruri); + raptor_free_parser(parser); +--- configure.orig 2011-06-07 16:43:03.000000000 +0200 ++++ configure 2011-06-07 16:43:20.000000000 +0200 +@@ -19647,23 +19647,23 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for raptor >= 0.9.11" >&5 +-echo $ECHO_N "checking for raptor >= 0.9.11... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for raptor2 >= 0.9.11" >&5 ++echo $ECHO_N "checking for raptor2 >= 0.9.11... $ECHO_C" >&6 + +- if $PKG_CONFIG --exists "raptor >= 0.9.11" ; then ++ if $PKG_CONFIG --exists "raptor2 >= 0.9.11" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking RAPTOR_CFLAGS" >&5 + echo $ECHO_N "checking RAPTOR_CFLAGS... $ECHO_C" >&6 +- RAPTOR_CFLAGS=`$PKG_CONFIG --cflags "raptor >= 0.9.11"` ++ RAPTOR_CFLAGS=`$PKG_CONFIG --cflags "raptor2 >= 0.9.11"` + echo "$as_me:$LINENO: result: $RAPTOR_CFLAGS" >&5 + echo "${ECHO_T}$RAPTOR_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking RAPTOR_LIBS" >&5 + echo $ECHO_N "checking RAPTOR_LIBS... $ECHO_C" >&6 +- RAPTOR_LIBS=`$PKG_CONFIG --libs "raptor >= 0.9.11"` ++ RAPTOR_LIBS=`$PKG_CONFIG --libs "raptor2 >= 0.9.11"` + echo "$as_me:$LINENO: result: $RAPTOR_LIBS" >&5 + echo "${ECHO_T}$RAPTOR_LIBS" >&6 + else +@@ -19671,7 +19671,7 @@ + RAPTOR_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- RAPTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "raptor >= 0.9.11"` ++ RAPTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "raptor2 >= 0.9.11"` + echo $RAPTOR_PKG_ERRORS + fi + +@@ -19686,8 +19686,8 @@ + if test $succeeded = yes; then + : + else +- { { echo "$as_me:$LINENO: error: Library requirements (raptor >= 0.9.11) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (raptor >= 0.9.11) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} ++ { { echo "$as_me:$LINENO: error: Library requirements (raptor2 >= 0.9.11) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 ++echo "$as_me: error: Library requirements (raptor2 >= 0.9.11) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } + fi + +--- src/Makefile.in.orig 2011-06-07 16:45:49.000000000 +0200 ++++ src/Makefile.in 2011-06-07 16:45:55.000000000 +0200 +@@ -182,7 +182,7 @@ + lib_LTLIBRARIES = liblrdf.la + noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h + liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c +-liblrdf_la_LIBADD = -lraptor ++liblrdf_la_LIBADD = -lraptor2 + liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@ + all: all-am + Index: textproc/redland/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/redland/Makefile,v retrieving revision 1.38 diff -u -r1.38 Makefile --- textproc/redland/Makefile 4 Dec 2010 07:33:49 -0000 1.38 +++ textproc/redland/Makefile 7 Jun 2011 14:29:12 -0000 @@ -7,15 +7,15 @@ # PORTNAME= redland -PORTVERSION= 1.0.12 +PORTVERSION= 1.0.13 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ MAINTAINER= kde@FreeBSD.org COMMENT= A high-level interface for RDF -LIB_DEPENDS= raptor.3:${PORTSDIR}/textproc/raptor \ - rasqal.2:${PORTSDIR}/textproc/rasqal +LIB_DEPENDS= raptor2.0:${PORTSDIR}/textproc/raptor \ + rasqal.3:${PORTSDIR}/textproc/rasqal USE_BDB= yes WITH_BDB_HIGHEST= yes @@ -28,7 +28,7 @@ CPPFLAGS= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-raptor=system \ --with-threestore=no Index: textproc/redland/distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/redland/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- textproc/redland/distinfo 23 Oct 2010 20:05:24 -0000 1.20 +++ textproc/redland/distinfo 7 Jun 2011 13:58:29 -0000 @@ -1,3 +1,2 @@ -MD5 (redland-1.0.12.tar.gz) = 40f37a5ad97fdfbf984f78dcea0c6115 -SHA256 (redland-1.0.12.tar.gz) = 89041031aa5809a2422987fe6cd10c40c22614d6db4f81c55e49c925c5d80523 -SIZE (redland-1.0.12.tar.gz) = 1552241 +SHA256 (redland-1.0.13.tar.gz) = bad6e8b39cece09d90d31bc33e023f6181147cfe46ffafed9e037b69b92c4498 +SIZE (redland-1.0.13.tar.gz) = 1554764 Index: textproc/redland/pkg-plist =================================================================== RCS file: /home/pcvs/ports/textproc/redland/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- textproc/redland/pkg-plist 11 May 2010 12:23:23 -0000 1.15 +++ textproc/redland/pkg-plist 7 Jun 2011 14:30:51 -0000 @@ -46,6 +46,8 @@ 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.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 Index: textproc/redland/files/patch-Makefile.in =================================================================== RCS file: /home/pcvs/ports/textproc/redland/files/patch-Makefile.in,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile.in --- textproc/redland/files/patch-Makefile.in 11 May 2010 12:23:23 -0000 1.4 +++ textproc/redland/files/patch-Makefile.in 7 Jun 2011 13:59:52 -0000 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Aug 4 12:17:19 2004 -+++ Makefile.in Wed Aug 4 12:18:49 2004 -@@ -288,7 +288,7 @@ +--- Makefile.in.orig 2011-06-07 15:59:37.000000000 +0200 ++++ Makefile.in 2011-06-07 15:59:44.000000000 +0200 +@@ -360,7 +360,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc # Subdirectories to build/install/distribute etc. --SUBDIRS = $(subdirs) src examples utils demos docs data -+SUBDIRS = $(subdirs) src utils demos docs data +-SUBDIRS = $(subdirs) src examples utils demos docs data scripts ++SUBDIRS = $(subdirs) src utils demos docs data scripts EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \ - ChangeLog.5 ChangeLog.6 ChangeLog.7 \ + ChangeLog.5 ChangeLog.6 ChangeLog.7 ChangeLog.8 ChangeLog.9 ChangeLog.10 \ README NEWS LICENSE.txt TODO \ Index: textproc/redland-bindings/Makefile =================================================================== RCS file: /home/pcvs/ports/textproc/redland-bindings/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- textproc/redland-bindings/Makefile 23 Oct 2010 20:06:17 -0000 1.19 +++ textproc/redland-bindings/Makefile 7 Jun 2011 14:39:01 -0000 @@ -6,7 +6,7 @@ # PORTNAME= redland-bindings -PORTVERSION= 1.0.10.1 +PORTVERSION= 1.0.13.1 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ @@ -22,8 +22,6 @@ GNU_CONFIGURE= yes -IGNORE= does not compatible with redland-1.0.12 - .include .if defined(WITH_PERL) @@ -73,6 +71,7 @@ USE_RUBY= yes CONFIGURE_ARGS+= --with-ruby PLIST_SUB+= WITH_RUBY="" +CFLAGS+= -I${RUBY_SITEARCHLIBDIR} .else PLIST_SUB+= WITH_RUBY="@comment " .endif Index: textproc/redland-bindings/distinfo =================================================================== RCS file: /home/pcvs/ports/textproc/redland-bindings/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- textproc/redland-bindings/distinfo 11 May 2010 12:23:23 -0000 1.9 +++ textproc/redland-bindings/distinfo 7 Jun 2011 14:34:14 -0000 @@ -1,3 +1,2 @@ -MD5 (redland-bindings-1.0.10.1.tar.gz) = 4b70555996b230c9e6671fc6e416e123 -SHA256 (redland-bindings-1.0.10.1.tar.gz) = 66361a05d85c0cbbc9b845341f709821c58add8307bde1eb5bdb7bb3bf761e94 -SIZE (redland-bindings-1.0.10.1.tar.gz) = 726598 +SHA256 (redland-bindings-1.0.13.1.tar.gz) = 1c5ae133b32e22db729c7faf8fdac5ef1aa195987ebd6a6ee27d4d96fd1a74a7 +SIZE (redland-bindings-1.0.13.1.tar.gz) = 776744