8 files changed, 66 insertions, 18 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index d4b37d2da6c3..a1ff845d9b4d 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -15,16 +15,25 @@ MASTER_SITE_SUBDIR=	librdf
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xmlparse.1:${PORTSDIR}/www/libwww \
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db \
+		gdbm.2:${PORTSDIR}/databases/gdbm \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		db2:${PORTSDIR}/databases/db
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		xmlparse.1:${PORTSDIR}/www/libwww
+
+LIBWWW_CONFIG?=	${LOCALBASE}/bin/libwww-config
 
 USE_OPENSSL=	yes
-LIBWWW_CONFIG=	${LOCALBASE}/bin/libwww-config
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} `${LIBWWW_CONFIG} --cflags` -I${LOCALBASE}/include/db2" \
-		LDFLAGS="`${LIBWWW_CONFIG} --libs`"
+USE_PERL5=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bdb=${LOCALBASE} --with-libwww
+INSTALLS_SHLIB=	yes
+
+MAN3=		redland.3
+
+CPPFLAGS=	-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include \
+		`${LIBWWW_CONFIG} --cflags`
+LDFLAGS=	-L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
 
 .include <bsd.port.mk>
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index a01b3fbe81ed..afadccae632e 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.10.tar.gz) = ad7016755bd1b4203649d002f8715193
+MD5 (redland-0.9.11.tar.gz) = 3aa452e98b6a16f804843ba9df106daf
diff --git a/textproc/rasqal/files/patch-configure b/textproc/rasqal/files/patch-configure
new file mode 100644
index 000000000000..c101d5ce12cc
--- /dev/null
+++ b/textproc/rasqal/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Jun  9 05:34:13 2002
++++ configure	Tue Jul 16 04:47:28 2002
+@@ -5610,6 +5610,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index e4ee08508c4e..a245c351ea57 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -14,6 +14,9 @@ include/rdf_list.h
 include/rdf_model.h
 include/rdf_node.h
 include/rdf_parser.h
+include/rdf_query.h
+include/rdf_query_triples.h
+include/rdf_serializer.h
 include/rdf_statement.h
 include/rdf_storage.h
 include/rdf_storage_hashes.h
@@ -24,3 +27,5 @@ include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
 lib/librdf.a
+lib/librdf.so
+lib/librdf.so.0
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index d4b37d2da6c3..a1ff845d9b4d 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -15,16 +15,25 @@ MASTER_SITE_SUBDIR=	librdf
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xmlparse.1:${PORTSDIR}/www/libwww \
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db \
+		gdbm.2:${PORTSDIR}/databases/gdbm \
 		expat.2:${PORTSDIR}/textproc/expat2 \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		db2:${PORTSDIR}/databases/db
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		xmlparse.1:${PORTSDIR}/www/libwww
+
+LIBWWW_CONFIG?=	${LOCALBASE}/bin/libwww-config
 
 USE_OPENSSL=	yes
-LIBWWW_CONFIG=	${LOCALBASE}/bin/libwww-config
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} `${LIBWWW_CONFIG} --cflags` -I${LOCALBASE}/include/db2" \
-		LDFLAGS="`${LIBWWW_CONFIG} --libs`"
+USE_PERL5=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bdb=${LOCALBASE} --with-libwww
+INSTALLS_SHLIB=	yes
+
+MAN3=		redland.3
+
+CPPFLAGS=	-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include \
+		`${LIBWWW_CONFIG} --cflags`
+LDFLAGS=	-L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
 
 .include <bsd.port.mk>
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index a01b3fbe81ed..afadccae632e 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.10.tar.gz) = ad7016755bd1b4203649d002f8715193
+MD5 (redland-0.9.11.tar.gz) = 3aa452e98b6a16f804843ba9df106daf
diff --git a/textproc/redland/files/patch-configure b/textproc/redland/files/patch-configure
new file mode 100644
index 000000000000..c101d5ce12cc
--- /dev/null
+++ b/textproc/redland/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Jun  9 05:34:13 2002
++++ configure	Tue Jul 16 04:47:28 2002
+@@ -5610,6 +5610,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist
index e4ee08508c4e..a245c351ea57 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -14,6 +14,9 @@ include/rdf_list.h
 include/rdf_model.h
 include/rdf_node.h
 include/rdf_parser.h
+include/rdf_query.h
+include/rdf_query_triples.h
+include/rdf_serializer.h
 include/rdf_statement.h
 include/rdf_storage.h
 include/rdf_storage_hashes.h
@@ -24,3 +27,5 @@ include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
 lib/librdf.a
+lib/librdf.so
+lib/librdf.so.0