From 0bd1f08d66d4ac2e3fad0b6e47569f42d67d9798 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Sat, 30 Sep 2023 04:14:57 +0200 Subject: [PATCH] textproc/raptor: Remove expired port 2023-09-30 textproc/raptor: No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2 --- MOVED | 1 + textproc/Makefile | 1 - textproc/raptor/Makefile | 32 -- textproc/raptor/distinfo | 2 - textproc/raptor/files/patch-configure | 19 - textproc/raptor/files/patch-cve-2012-0037 | 410 ---------------------- textproc/raptor/pkg-descr | 4 - textproc/raptor/pkg-plist | 89 ----- 8 files changed, 1 insertion(+), 557 deletions(-) delete mode 100644 textproc/raptor/Makefile delete mode 100644 textproc/raptor/distinfo delete mode 100644 textproc/raptor/files/patch-configure delete mode 100644 textproc/raptor/files/patch-cve-2012-0037 delete mode 100644 textproc/raptor/pkg-descr delete mode 100644 textproc/raptor/pkg-plist diff --git a/MOVED b/MOVED index 905630157ac1e..d2e231d1d7f45 100644 --- a/MOVED +++ b/MOVED @@ -7920,3 +7920,4 @@ www/fnord||2023-09-30|Has expired: Deprecated upstream, consider using www/apach www/grafana8|www/grafana9|2023-09-30|Has expired: EOLed upstream www/mediawiki138|www/mediawiki139|2023-09-30|Has expired: end of life upstream www/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats +textproc/raptor||2023-09-30|Has expired: No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2 diff --git a/textproc/Makefile b/textproc/Makefile index 95a689b834f46..d8900e07052ca 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1658,7 +1658,6 @@ SUBDIR += rand SUBDIR += randlm SUBDIR += rapidxml - SUBDIR += raptor SUBDIR += raptor2 SUBDIR += rasqal SUBDIR += re-flex diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile deleted file mode 100644 index 88112094d13df..0000000000000 --- a/textproc/raptor/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -PORTNAME= raptor -PORTVERSION= 1.4.21 -PORTREVISION= 8 -CATEGORIES= textproc -MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \ - http://download.librdf.org/source/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= RDF Parser Toolkit for Redland -WWW= https://librdf.org/raptor/ - -DEPRECATED= No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2 -EXPIRATION_DATE=2023-09-30 - -LIB_DEPENDS= libcurl.so:ftp/curl - -USES= gnome libtool pathfix -USE_GNOME= libxml2 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \ - --with-curl-config=${LOCALBASE}/bin/curl-config \ - --with-html-dir=${PREFIX}/share/doc \ - --with-xml-parser=libxml --with-www=curl -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e 's|utils ||' ${WRKSRC}/Makefile.in - -.include diff --git a/textproc/raptor/distinfo b/textproc/raptor/distinfo deleted file mode 100644 index edbb4b616c800..0000000000000 --- a/textproc/raptor/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (raptor-1.4.21.tar.gz) = db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca -SIZE (raptor-1.4.21.tar.gz) = 1651843 diff --git a/textproc/raptor/files/patch-configure b/textproc/raptor/files/patch-configure deleted file mode 100644 index d6055b3fb7f5d..0000000000000 --- a/textproc/raptor/files/patch-configure +++ /dev/null @@ -1,19 +0,0 @@ ---- configure.orig 2010-01-30 11:23:01.000000000 +1000 -+++ configure 2011-08-08 00:14:06.216624213 +1100 -@@ -14556,7 +14556,7 @@ - AM_BACKSLASH='\' - - --ac_config_files="$ac_config_files Makefile raptor.spec raptor.rdf data/Makefile docs/Makefile docs/version.xml examples/Makefile src/Makefile tests/Makefile tests/feeds/Makefile tests/grddl/Makefile tests/ntriples/Makefile tests/rdfa/Makefile tests/rdfxml/Makefile tests/turtle/Makefile tests/trig/Makefile utils/Makefile win32/Makefile librdfa/Makefile raptor.pc" -+ac_config_files="$ac_config_files Makefile raptor.spec raptor.rdf data/Makefile docs/Makefile docs/version.xml examples/Makefile src/Makefile tests/Makefile tests/feeds/Makefile tests/grddl/Makefile tests/ntriples/Makefile tests/rdfa/Makefile tests/rdfxml/Makefile tests/turtle/Makefile tests/trig/Makefile win32/Makefile librdfa/Makefile raptor.pc" - - ac_config_files="$ac_config_files src/raptor-config" - -@@ -16020,7 +16020,6 @@ - "tests/rdfxml/Makefile") CONFIG_FILES="$CONFIG_FILES tests/rdfxml/Makefile" ;; - "tests/turtle/Makefile") CONFIG_FILES="$CONFIG_FILES tests/turtle/Makefile" ;; - "tests/trig/Makefile") CONFIG_FILES="$CONFIG_FILES tests/trig/Makefile" ;; -- "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; - "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;; - "librdfa/Makefile") CONFIG_FILES="$CONFIG_FILES librdfa/Makefile" ;; - "raptor.pc") CONFIG_FILES="$CONFIG_FILES raptor.pc" ;; diff --git a/textproc/raptor/files/patch-cve-2012-0037 b/textproc/raptor/files/patch-cve-2012-0037 deleted file mode 100644 index b9dc07edcaef5..0000000000000 --- a/textproc/raptor/files/patch-cve-2012-0037 +++ /dev/null @@ -1,410 +0,0 @@ -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor.h raptor-1.4.21/src/raptor.h ---- src/raptor.h 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor.h 2012-02-04 15:29:56.000000000 -0800 -@@ -407,6 +407,7 @@ - * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples) - * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI. If given, generate an Atom Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found. - * @RAPTOR_FEATURE_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 documents with prefixed elements, otherwise unprefixed. -+ * @RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: When reading XML, load external entities. - * @RAPTOR_FEATURE_LAST: Internal - * - * Raptor parser, serializer or XML writer features. -@@ -448,7 +449,8 @@ - RAPTOR_FEATURE_RSS_TRIPLES, - RAPTOR_FEATURE_ATOM_ENTRY_URI, - RAPTOR_FEATURE_PREFIX_ELEMENTS, -- RAPTOR_FEATURE_LAST = RAPTOR_FEATURE_PREFIX_ELEMENTS -+ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -+ RAPTOR_FEATURE_LAST = RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES - } raptor_feature; - - -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_feature.c raptor-1.4.21/src/raptor_feature.c ---- src/raptor_feature.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_feature.c 2012-02-04 15:29:56.000000000 -0800 -@@ -93,7 +93,8 @@ - { RAPTOR_FEATURE_JSON_EXTRA_DATA , 6, "jsonExtraData", "JSON serializer extra data" }, - { RAPTOR_FEATURE_RSS_TRIPLES , 6, "rssTriples", "Atom/RSS serializer writes extra RDF triples" }, - { RAPTOR_FEATURE_ATOM_ENTRY_URI , 6, "atomEntryUri", "Atom serializer Entry URI" }, -- { RAPTOR_FEATURE_PREFIX_ELEMENTS , 2, "prefixElements", "Atom/RSS serializers write namespace-prefixed elements" } -+ { RAPTOR_FEATURE_PREFIX_ELEMENTS , 2, "prefixElements", "Atom/RSS serializers write namespace-prefixed elements" }, -+ { RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, 1, "loadExternalEntities", "Load external XML entities." } - }; - - -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_internal.h raptor-1.4.21/src/raptor_internal.h ---- src/raptor_internal.h 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_internal.h 2012-02-04 15:30:55.000000000 -0800 -@@ -852,7 +852,6 @@ - - #ifdef RAPTOR_WWW_LIBCURL - #include --#include - #include - #endif - -@@ -1060,6 +1059,14 @@ - - /* sax2 init failed - do not try to do anything with it */ - int failed; -+ -+ /* call SAX2 handlers if non-0 */ -+ int enabled; -+ -+ /* FEATURE: -+ * non 0 if XML entities should be loaded -+ */ -+ int feature_load_external_entities; - }; - - int raptor_sax2_init(raptor_world* world); -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_libxml.c raptor-1.4.21/src/raptor_libxml.c ---- src/raptor_libxml.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_libxml.c 2012-02-22 12:29:38.000000000 -0800 -@@ -142,18 +142,120 @@ - - static xmlParserInputPtr - raptor_libxml_resolveEntity(void* user_data, -- const xmlChar *publicId, const xmlChar *systemId) { -- raptor_sax2* sax2=(raptor_sax2*)user_data; -- return libxml2_resolveEntity(sax2->xc, publicId, systemId); -+ const xmlChar *publicId, const xmlChar *systemId) -+{ -+ raptor_sax2* sax2 = (raptor_sax2*)user_data; -+ xmlParserCtxtPtr ctxt = sax2->xc; -+ const unsigned char *uri_string = NULL; -+ xmlParserInputPtr entity_input; -+ int load_entity = 0; -+ -+ if(!ctxt) -+ return NULL; -+ -+ if(ctxt->input) -+ uri_string = (const unsigned char *)ctxt->input->filename; -+ -+ if(!uri_string) -+ uri_string = (const unsigned char *)ctxt->directory; -+ -+ load_entity = sax2->feature_load_external_entities; -+ -+ if(load_entity) { -+ entity_input = xmlLoadExternalEntity((const char*)uri_string, -+ (const char*)publicId, -+ ctxt); -+ } else { -+ RAPTOR_DEBUG4("Not loading entity URI %s by policy for publicId '%s' systemId '%s'\n", uri_string, publicId, systemId); -+ } -+ -+ return entity_input; - } - - - static xmlEntityPtr --raptor_libxml_getEntity(void* user_data, const xmlChar *name) { -- raptor_sax2* sax2=(raptor_sax2*)user_data; -- return libxml2_getEntity(sax2->xc, name); --} -+raptor_libxml_getEntity(void* user_data, const xmlChar *name) -+{ -+ raptor_sax2* sax2 = (raptor_sax2*)user_data; -+ xmlParserCtxtPtr xc = sax2->xc; -+ xmlEntityPtr ret = NULL; -+ -+ if(!xc) -+ return NULL; - -+ if(!xc->inSubset) { -+ /* looks for hardcoded set of entity names - lt, gt etc. */ -+ ret = xmlGetPredefinedEntity(name); -+ if(ret) { -+ RAPTOR_DEBUG2("Entity '%s' found in predefined set\n", name); -+ return ret; -+ } -+ } -+ -+ /* This section uses xmlGetDocEntity which looks for entities in -+ * memory only, never from a file or URI -+ */ -+ if(xc->myDoc && (xc->myDoc->standalone == 1)) { -+ RAPTOR_DEBUG2("Entity '%s' document is standalone\n", name); -+ /* Document is standalone: no entities are required to interpret doc */ -+ if(xc->inSubset == 2) { -+ xc->myDoc->standalone = 0; -+ ret = xmlGetDocEntity(xc->myDoc, name); -+ xc->myDoc->standalone = 1; -+ } else { -+ ret = xmlGetDocEntity(xc->myDoc, name); -+ if(!ret) { -+ xc->myDoc->standalone = 0; -+ ret = xmlGetDocEntity(xc->myDoc, name); -+ xc->myDoc->standalone = 1; -+ } -+ } -+ } else { -+ ret = xmlGetDocEntity(xc->myDoc, name); -+ } -+ -+ if(ret && !ret->children && -+ (ret->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY)) { -+ /* Entity is an external general parsed entity. It may be in a -+ * catalog file, user file or user URI -+ */ -+ int val = 0; -+ xmlNodePtr children; -+ int load_entity = 0; -+ -+ load_entity = sax2->feature_load_external_entities; -+ -+ if(!load_entity) { -+ RAPTOR_DEBUG2("Not getting entity URI %s by policy\n", ret->URI); -+ children = xmlNewText((const xmlChar*)""); -+ } else { -+ /* Disable SAX2 handlers so that the SAX2 events do not all get -+ * sent to callbacks during dealing with the entity parsing. -+ */ -+ sax2->enabled = 0; -+ val = xmlParseCtxtExternalEntity(xc, ret->URI, ret->ExternalID, &children); -+ sax2->enabled = 1; -+ } -+ -+ if(!val) { -+ xmlAddChildList((xmlNodePtr)ret, children); -+ } else { -+ xc->validate = 0; -+ return NULL; -+ } -+ -+ ret->owner = 1; -+ -+#if LIBXML_VERSION >= 20627 -+ /* Mark this entity as having been checked - never do this again */ -+ if(!ret->checked) -+ ret->checked = 1; -+ } -+#endif -+ -+ return ret; -+} -+ - - static xmlEntityPtr - raptor_libxml_getParameterEntity(void* user_data, const xmlChar *name) { -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_parse.c raptor-1.4.21/src/raptor_parse.c ---- src/raptor_parse.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_parse.c 2012-02-04 15:29:56.000000000 -0800 -@@ -1443,6 +1443,7 @@ - case RAPTOR_FEATURE_MICROFORMATS: - case RAPTOR_FEATURE_HTML_LINK: - case RAPTOR_FEATURE_WWW_TIMEOUT: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - parser->features[(int)feature]=value; - break; - -@@ -1564,6 +1565,7 @@ - case RAPTOR_FEATURE_MICROFORMATS: - case RAPTOR_FEATURE_HTML_LINK: - case RAPTOR_FEATURE_WWW_TIMEOUT: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - result = parser->features[(int)feature]; - break; - -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_rdfxml.c raptor-1.4.21/src/raptor_rdfxml.c ---- src/raptor_rdfxml.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_rdfxml.c 2012-02-04 15:29:56.000000000 -0800 -@@ -1130,6 +1130,9 @@ - raptor_sax2_set_feature(rdf_xml_parser->sax2, - RAPTOR_FEATURE_NO_NET, - rdf_parser->features[RAPTOR_FEATURE_NO_NET]); -+ raptor_sax2_set_feature(rdf_xml_parser->sax2, -+ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -+ rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]); - - raptor_sax2_parse_start(rdf_xml_parser->sax2, uri); - -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_rss.c raptor-1.4.21/src/raptor_rss.c ---- src/raptor_rss.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_rss.c 2012-02-04 15:29:56.000000000 -0800 -@@ -247,6 +247,9 @@ - raptor_sax2_set_feature(rss_parser->sax2, - RAPTOR_FEATURE_NO_NET, - rdf_parser->features[RAPTOR_FEATURE_NO_NET]); -+ raptor_sax2_set_feature(rss_parser->sax2, -+ RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES, -+ rdf_parser->features[RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES]); - - raptor_sax2_parse_start(rss_parser->sax2, uri); - -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_sax2.c raptor-1.4.21/src/raptor_sax2.c ---- src/raptor_sax2.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_sax2.c 2012-02-04 15:29:56.000000000 -0800 -@@ -106,6 +106,8 @@ - - sax2->user_data=user_data; - -+ sax2->enabled = 1; -+ - sax2->locator=error_handlers->locator; - - sax2->error_handlers=error_handlers; -@@ -721,6 +723,10 @@ - sax2->feature_no_net=value; - break; - -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: -+ sax2->feature_load_external_entities=value; -+ break; -+ - case RAPTOR_FEATURE_SCANNING: - case RAPTOR_FEATURE_ASSUME_IS_RDF: - case RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES: -@@ -802,7 +808,7 @@ - unsigned char *xml_language=NULL; - raptor_uri *xml_base=NULL; - -- if(sax2->failed) -+ if(sax2->failed || !sax2->enabled) - return; - - #ifdef RAPTOR_XML_EXPAT -@@ -1031,7 +1037,7 @@ - raptor_sax2* sax2=(raptor_sax2*)user_data; - raptor_xml_element* xml_element; - -- if(sax2->failed) -+ if(sax2->failed || !sax2->enabled) - return; - - #ifdef RAPTOR_XML_EXPAT -@@ -1069,7 +1075,11 @@ - raptor_sax2_characters(void* user_data, const unsigned char *s, int len) - { - raptor_sax2* sax2=(raptor_sax2*)user_data; -- if(!sax2->failed && sax2->characters_handler) -+ -+ if(sax2->failed || !sax2->enabled) -+ return; -+ -+ if(sax2->characters_handler) - sax2->characters_handler(sax2->user_data, sax2->current_element, s, len); - } - -@@ -1085,7 +1095,10 @@ - #endif - #endif - -- if(!sax2->failed && sax2->cdata_handler) -+ if(sax2->failed || !sax2->enabled) -+ return; -+ -+ if(sax2->cdata_handler) - sax2->cdata_handler(sax2->user_data, sax2->current_element, s, len); - } - -@@ -1095,7 +1108,11 @@ - raptor_sax2_comment(void* user_data, const unsigned char *s) - { - raptor_sax2* sax2=(raptor_sax2*)user_data; -- if(!sax2->failed && sax2->comment_handler) -+ -+ if(sax2->failed || !sax2->enabled) -+ return; -+ -+ if(sax2->comment_handler) - sax2->comment_handler(sax2->user_data, sax2->current_element, s); - } - -@@ -1110,7 +1127,11 @@ - const unsigned char* notationName) - { - raptor_sax2* sax2=(raptor_sax2*)user_data; -- if(!sax2->failed && sax2->unparsed_entity_decl_handler) -+ -+ if(sax2->failed || !sax2->enabled) -+ return; -+ -+ if(sax2->unparsed_entity_decl_handler) - sax2->unparsed_entity_decl_handler(sax2->user_data, - entityName, base, systemId, - publicId, notationName); -@@ -1127,7 +1148,7 @@ - { - raptor_sax2* sax2=(raptor_sax2*)user_data; - -- if(sax2->failed) -+ if(sax2->failed || !sax2->enabled) - return 0; - - if(sax2->external_entity_ref_handler) -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_serialize.c raptor-1.4.21/src/raptor_serialize.c ---- src/raptor_serialize.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_serialize.c 2012-02-04 15:29:56.000000000 -0800 -@@ -974,6 +974,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -@@ -1081,6 +1082,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -@@ -1222,6 +1224,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -@@ -1324,6 +1327,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_WRITER_AUTO_INDENT: -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_turtle_writer.c raptor-1.4.21/src/raptor_turtle_writer.c ---- src/raptor_turtle_writer.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_turtle_writer.c 2012-02-04 15:29:56.000000000 -0800 -@@ -740,6 +740,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_RELATIVE_URIS: -@@ -854,6 +855,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_RELATIVE_URIS: -diff -urN -X /home/dajobe/dev/dontdiff -x raptor.rdf -x file1.txt -x xmlent1.rdf -x rapper -x rdfdiff raptor-1.4.21.orig/src/raptor_xml_writer.c raptor-1.4.21/src/raptor_xml_writer.c ---- src/raptor_xml_writer.c 2010-01-29 15:54:42.000000000 -0800 -+++ src/raptor_xml_writer.c 2012-02-04 15:29:56.000000000 -0800 -@@ -973,6 +973,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_RELATIVE_URIS: -@@ -1094,6 +1095,7 @@ - - /* Shared */ - case RAPTOR_FEATURE_NO_NET: -+ case RAPTOR_FEATURE_LOAD_EXTERNAL_ENTITIES: - - /* XML writer features */ - case RAPTOR_FEATURE_RELATIVE_URIS: diff --git a/textproc/raptor/pkg-descr b/textproc/raptor/pkg-descr deleted file mode 100644 index 08019394b535b..0000000000000 --- a/textproc/raptor/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Raptor is the RDF Parser Toolkit for Redland and currently consists of two -parsers: RDF/XML and N-Triples. Raptor is designed to integrate closely -with Redland and also work entirely standalone, in which case it will use -simple internal routines to perform the functions. diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist deleted file mode 100644 index 8a15be701d87d..0000000000000 --- a/textproc/raptor/pkg-plist +++ /dev/null @@ -1,89 +0,0 @@ -bin/raptor-config -include/raptor.h -lib/libraptor.a -lib/libraptor.so -lib/libraptor.so.1 -lib/libraptor.so.1.2.0 -libdata/pkgconfig/raptor.pc -man/man1/raptor-config.1.gz -man/man3/libraptor.3.gz -%%PORTDOCS%%%%DOCSDIR%%/parser-rdfa.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-json.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-sax2.html -%%PORTDOCS%%%%DOCSDIR%%/home.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/introduction.html -%%PORTDOCS%%%%DOCSDIR%%/ix01.html -%%PORTDOCS%%%%DOCSDIR%%/left.png -%%PORTDOCS%%%%DOCSDIR%%/parser-grddl.html -%%PORTDOCS%%%%DOCSDIR%%/parser-guess.html -%%PORTDOCS%%%%DOCSDIR%%/parser-ntriples.html -%%PORTDOCS%%%%DOCSDIR%%/parser-rdfxml.html -%%PORTDOCS%%%%DOCSDIR%%/parser-rss-tag-soup.html -%%PORTDOCS%%%%DOCSDIR%%/parser-trig.html -%%PORTDOCS%%%%DOCSDIR%%/parser-turtle.html -%%PORTDOCS%%%%DOCSDIR%%/raptor.devhelp -%%PORTDOCS%%%%DOCSDIR%%/raptor.devhelp2 -%%PORTDOCS%%%%DOCSDIR%%/raptor-parsers.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-constants.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-feature.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-general.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-iostream.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-locator.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-memory.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-parser.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-sequence.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-serializer.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-serializers.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-stringbuffer.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-triples.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-unicode.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-uri-factory.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-uri.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-world.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-www.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml-namespace.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml-qname.html -%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml.html -%%PORTDOCS%%%%DOCSDIR%%/reference-manual.html -%%PORTDOCS%%%%DOCSDIR%%/restrict-parser-network-access.html -%%PORTDOCS%%%%DOCSDIR%%/right.png -%%PORTDOCS%%%%DOCSDIR%%/serializer-atom.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-dot.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-ntriples.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml-abbrev.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml-xmp.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-rss-1-0.html -%%PORTDOCS%%%%DOCSDIR%%/serializer-turtle.html -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/tutorial-initialising-finishing.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-get-triples.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parse-strictness.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-abort.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-content.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-create.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-destroy.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-example.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-features.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-runtime-info.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-error-warning-handlers.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-id-handler.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-namespace-handler.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-static-info.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-triple-handler.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-parsing.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-querying-functionality.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-create.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-declare-namespace.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-destroy.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-example.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-features.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-runtime-info.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-send-triples.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-set-error-warning-handlers.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-to-destination.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializing.html -%%PORTDOCS%%%%DOCSDIR%%/up.png