[80889] trunk/dports/www/redland

[pixilla at macports.org]

Revision: 80889
          http://trac.macports.org/changeset/80889
Author:   pixilla at macports.org
Date:     2011-07-20 08:03:15 -0700 (Wed, 20 Jul 2011)
Log Message:
-----------
www/redland: Fix raptor2 headers patch.

Modified Paths:
--------------
    trunk/dports/www/redland/Portfile

Added Paths:
-----------
    trunk/dports/www/redland/files/
    trunk/dports/www/redland/files/patch-redland-raptor2-headers.diff

Modified: trunk/dports/www/redland/Portfile
===================================================================
--- trunk/dports/www/redland/Portfile	2011-07-20 07:44:31 UTC (rev 80888)
+++ trunk/dports/www/redland/Portfile	2011-07-20 15:03:15 UTC (rev 80889)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name                redland
 version             1.0.13
+revision            1
 description         Redland RDF Library
 long_description    Redland is a set of free software libraries that provide \
                     support for the Resource Description Framework (RDF).
@@ -15,6 +16,10 @@
 checksums           sha1    f1b0db76eb02946a1f794b35db726ddfdc936ad6 \
                     rmd160  1ebc4a9eb73e022691a34677c5eaf5f17da56d32
 
+patchfiles          patch-redland-raptor2-headers.diff
+
+patch.pre_args      -p1
+
 depends_lib         port:curl \
                     port:libiconv \
                     port:libxml2 \
@@ -62,21 +67,24 @@
 
 variant db44 conflicts db46 db47 {
     configure.args-delete   --with-bdb=no
-    configure.args-append   --with-bdb-include=${prefix}/include/db44 \
+    configure.args-append   --with-bdb=${prefix} \
+                            --with-bdb-include=${prefix}/include/db44 \
                             --with-bdb-lib=${prefix}/lib/db44
     depends_lib-append      port:db44
 }
 
 variant db46 conflicts db44 db47 {
     configure.args-delete   --with-bdb=no
-    configure.args-append   --with-bdb-include=${prefix}/include/db46 \
+    configure.args-append   --with-bdb=${prefix} \
+                            --with-bdb-include=${prefix}/include/db46 \
                             --with-bdb-lib=${prefix}/lib/db46
     depends_lib-append      port:db46
 }
 
 variant db47 conflicts db44 db46 {
     configure.args-delete   --with-bdb=no
-    configure.args-append   --with-bdb-include=${prefix}/include/db47 \
+    configure.args-append   --with-bdb=${prefix} \
+                            --with-bdb-include=${prefix}/include/db47 \
                             --with-bdb-lib=${prefix}/lib/db47
     depends_lib-append      port:db47
 }

Added: trunk/dports/www/redland/files/patch-redland-raptor2-headers.diff
===================================================================
--- trunk/dports/www/redland/files/patch-redland-raptor2-headers.diff	                        (rev 0)
+++ trunk/dports/www/redland/files/patch-redland-raptor2-headers.diff	2011-07-20 15:03:15 UTC (rev 80889)
@@ -0,0 +1,84 @@
+diff -ur a/src/librdf.h b/src/librdf.h
+--- a/src/librdf.h	2011-07-19 16:54:49.000000000 -0700
++++ b/src/librdf.h	2011-07-19 18:06:34.000000000 -0700
+@@ -28,7 +28,7 @@
+ 
+ #ifndef LIBRDF_OBJC_FRAMEWORK
+ /* raptor */
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ /* rasqal: uses raptor */
+ #include <rasqal.h>
+ /* librdf: uses rasqal and raptor */
+diff -ur a/src/librdf.h.in b/src/librdf.h.in
+--- a/src/librdf.h.in	2011-07-19 16:54:49.000000000 -0700
++++ b/src/librdf.h.in	2011-07-19 18:06:34.000000000 -0700
+@@ -28,7 +28,7 @@
+ 
+ #ifndef LIBRDF_OBJC_FRAMEWORK
+ /* raptor */
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ /* rasqal: uses raptor */
+ #include <rasqal.h>
+ /* librdf: uses rasqal and raptor */
+diff -ur a/src/rdf_log.h b/src/rdf_log.h
+--- a/src/rdf_log.h	2011-07-19 16:54:49.000000000 -0700
++++ b/src/rdf_log.h	2011-07-19 18:06:34.000000000 -0700
+@@ -30,7 +30,7 @@
+ extern "C" {
+ #endif
+ 
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ 
+ /**
+  * librdf_log_level:
+diff -ur a/src/rdf_serializer.h b/src/rdf_serializer.h
+--- a/src/rdf_serializer.h	2011-07-19 16:54:49.000000000 -0700
++++ b/src/rdf_serializer.h	2011-07-19 18:06:34.000000000 -0700
+@@ -36,7 +36,7 @@
+ extern "C" {
+ #endif
+ 
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ 
+ /* class methods */
+ REDLAND_API
+diff -ur a/src/rdf_serializer_internal.h b/src/rdf_serializer_internal.h
+--- a/src/rdf_serializer_internal.h	2011-07-19 16:54:49.000000000 -0700
++++ b/src/rdf_serializer_internal.h	2011-07-19 18:06:34.000000000 -0700
+@@ -32,7 +32,7 @@
+ extern "C" {
+ #endif
+ 
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ 
+ struct librdf_serializer_factory_s 
+ {
+diff -ur a/utils/rdfproc.c b/utils/rdfproc.c
+--- a/utils/rdfproc.c	2011-07-19 16:54:49.000000000 -0700
++++ b/utils/rdfproc.c	2011-07-19 18:06:34.000000000 -0700
+@@ -46,7 +46,7 @@
+ #include <unistd.h>
+ 
+ #include <redland.h>
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ 
+ #ifdef NEED_OPTIND_DECLARATION
+ extern int optind;
+diff -ur a/utils/redland-virtuoso-test.c b/utils/redland-virtuoso-test.c
+--- a/utils/redland-virtuoso-test.c	2011-07-19 16:54:49.000000000 -0700
++++ b/utils/redland-virtuoso-test.c	2011-07-19 18:06:32.000000000 -0700
+@@ -76,7 +76,7 @@
+ #include <unistd.h>
+ 
+ #include <redland.h>
+-#include <raptor.h>
++#include <raptor2/raptor2.h>
+ 
+ 
+ int add_triple(librdf_world *world, librdf_node *context, librdf_model* model, const char *s, const char *p, const char *o);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110720/2a35ae77/attachment.html>