Update to 0.9.12.

PR:		51238
Submitted by:	Ports Fury

8 files changed, 138 insertions, 40 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 5c2ff72..46afbeb 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.11
-PORTREVISION=	2
+PORTVERSION=	0.9.12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -18,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm \
 		expat.4:${PORTSDIR}/textproc/expat2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xmlparse.1:${PORTSDIR}/www/libwww
@@ -27,15 +25,20 @@ LIBWWW_CONFIG?=	${LOCALBASE}/bin/libwww-config
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-bdb=${LOCALBASE} --with-libwww
 INSTALLS_SHLIB=	yes
 
-MAN3=		redland.3
+MAN1=		rapper.1
+MAN3=		libraptor.3 redland.3
 
-CPPFLAGS=	-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include \
-		`${LIBWWW_CONFIG} --cflags`
-LDFLAGS=	-L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|\@INSTALL\@|/usr/bin/install -c|g ; \
+		 s|^CPPFLAGS = -I|CPPFLAGS = \@CPPFLAGS\@ -I|g ; \
+		 s|^LDFLAGS = \@LIBRDF_|LDFLAGS = \@LDFLAGS\@ \@LIBRDF_|g ; \
+		 s|^LIBS = \@LIBRDF_|LIBS = \@LIBS\@ \@LIBRDF_|g'
 
 .include <bsd.port.mk>
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index afadcca..4908993 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.11.tar.gz) = 3aa452e98b6a16f804843ba9df106daf
+MD5 (redland-0.9.12.tar.gz) = 545ffc5e1da2e240392b0dbe32afa821
diff --git a/textproc/rasqal/files/patch-configure b/textproc/rasqal/files/patch-configure
index c101d5c..60d1355 100644
--- a/textproc/rasqal/files/patch-configure
+++ b/textproc/rasqal/files/patch-configure
@@ -1,10 +1,50 @@
---- configure.orig	Sun Jun  9 05:34:13 2002
-+++ configure	Tue Jul 16 04:47:28 2002
-@@ -5610,6 +5610,7 @@
+--- configure.orig	Thu Feb 13 11:00:47 2003
++++ configure	Fri Apr 18 21:32:50 2003
+@@ -6626,9 +6626,9 @@
+ 
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ if test "$have_libdb" != yes; then
+@@ -7294,9 +7294,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ 
+@@ -7730,7 +7730,7 @@
+       have_libxml=0
+     fi
+ 
+-    CPPFLAGS="$LIBRDF_CPPFLAGS"
++    CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
+ 
+   else
+     echo "$ac_t""no" 1>&6
+@@ -8328,9 +8328,9 @@
+   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
+ fi
+ 
+-LIBS=
+-CPPFLAGS=
+-LDFLAGS=
++#LIBS=
++#CPPFLAGS=
++#LDFLAGS=
+ 
  
- # 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 26c1665..61022e5 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -1,11 +1,15 @@
+bin/rapper
+bin/raptor-config
 bin/redland-config
+bin/redland-db-upgrade
 include/librdf.h
+include/ntriples.h
+include/raptor.h
 include/rdf_concepts.h
 include/rdf_digest.h
 include/rdf_files.h
 include/rdf_hash.h
 include/rdf_hash_bdb.h
-include/rdf_hash_gdbm.h
 include/rdf_hash_memory.h
 include/rdf_heuristics.h
 include/rdf_init.h
@@ -26,7 +30,9 @@ include/rdf_types.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
+lib/libraptor.a
+lib/libraptor.so
+lib/libraptor.so.0
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
-@dirrm share/redland
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 5c2ff72..46afbeb 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.11
-PORTREVISION=	2
+PORTVERSION=	0.9.12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -18,7 +17,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm \
 		expat.4:${PORTSDIR}/textproc/expat2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xmlparse.1:${PORTSDIR}/www/libwww
@@ -27,15 +25,20 @@ LIBWWW_CONFIG?=	${LOCALBASE}/bin/libwww-config
 
 USE_OPENSSL=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-bdb=${LOCALBASE} --with-libwww
 INSTALLS_SHLIB=	yes
 
-MAN3=		redland.3
+MAN1=		rapper.1
+MAN3=		libraptor.3 redland.3
 
-CPPFLAGS=	-I${LOCALBASE}/include/db2 -I${LOCALBASE}/include \
-		`${LIBWWW_CONFIG} --cflags`
-LDFLAGS=	-L${LOCALBASE}/lib `${LIBWWW_CONFIG} --libs`
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|\@INSTALL\@|/usr/bin/install -c|g ; \
+		 s|^CPPFLAGS = -I|CPPFLAGS = \@CPPFLAGS\@ -I|g ; \
+		 s|^LDFLAGS = \@LIBRDF_|LDFLAGS = \@LDFLAGS\@ \@LIBRDF_|g ; \
+		 s|^LIBS = \@LIBRDF_|LIBS = \@LIBS\@ \@LIBRDF_|g'
 
 .include <bsd.port.mk>
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index afadcca..4908993 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.11.tar.gz) = 3aa452e98b6a16f804843ba9df106daf
+MD5 (redland-0.9.12.tar.gz) = 545ffc5e1da2e240392b0dbe32afa821
diff --git a/textproc/redland/files/patch-configure b/textproc/redland/files/patch-configure
index c101d5c..60d1355 100644
--- a/textproc/redland/files/patch-configure
+++ b/textproc/redland/files/patch-configure
@@ -1,10 +1,50 @@
---- configure.orig	Sun Jun  9 05:34:13 2002
-+++ configure	Tue Jul 16 04:47:28 2002
-@@ -5610,6 +5610,7 @@
+--- configure.orig	Thu Feb 13 11:00:47 2003
++++ configure	Fri Apr 18 21:32:50 2003
+@@ -6626,9 +6626,9 @@
+ 
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ if test "$have_libdb" != yes; then
+@@ -7294,9 +7294,9 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-CPPFLAGS="$LIBRDF_CPPFLAGS"
+-LDFLAGS="$LIBRDF_LDFLAGS"
+-LIBS="$LIBRDF_LIBS"
++CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$LIBRDF_LDFLAGS $LDFLAGS"
++LIBS="$LIBRDF_LIBS $LIBS"
+ 
+ 
+ 
+@@ -7730,7 +7730,7 @@
+       have_libxml=0
+     fi
+ 
+-    CPPFLAGS="$LIBRDF_CPPFLAGS"
++    CPPFLAGS="$LIBRDF_CPPFLAGS $CPPFLAGS"
+ 
+   else
+     echo "$ac_t""no" 1>&6
+@@ -8328,9 +8328,9 @@
+   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
+ fi
+ 
+-LIBS=
+-CPPFLAGS=
+-LDFLAGS=
++#LIBS=
++#CPPFLAGS=
++#LDFLAGS=
+ 
  
- # 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 26c1665..61022e5 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -1,11 +1,15 @@
+bin/rapper
+bin/raptor-config
 bin/redland-config
+bin/redland-db-upgrade
 include/librdf.h
+include/ntriples.h
+include/raptor.h
 include/rdf_concepts.h
 include/rdf_digest.h
 include/rdf_files.h
 include/rdf_hash.h
 include/rdf_hash_bdb.h
-include/rdf_hash_gdbm.h
 include/rdf_hash_memory.h
 include/rdf_heuristics.h
 include/rdf_init.h
@@ -26,7 +30,9 @@ include/rdf_types.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
+lib/libraptor.a
+lib/libraptor.so
+lib/libraptor.so.0
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
-@dirrm share/redland