- Update to version 0.9.14

PR:		56637
Submitted by:	Ports Fury

10 files changed, 70 insertions, 32 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index ed7961004919..565e55b7fe7a 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.14
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -17,33 +17,25 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		raptor.0:${PORTSDIR}/textproc/raptor
+		raptor.1:${PORTSDIR}/textproc/raptor
 
 USE_OPENSSL=	yes
-USE_REINPLACE=	yes
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bdb-lib="${LOCALBASE}/lib" \
 		--with-bdb-include="${LOCALBASE}/include/db2" \
 		--with-bdb-dbname="db2" \
-		--with-libwww
+		--with-libwww \
+		--with-raptor=system
 INSTALLS_SHLIB=	yes
 
-MAN1=		redland-config.1 redland-db-upgrade.1
+MAN1=		rdfproc.1 redland-config.1 redland-db-upgrade.1
 MAN3=		redland.3
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|ac_subdirs_all raptor|ac_subdirs_all|g ; \
-		 s|-I\\$$(top_srcdir)/raptor||g ; \
-		 s|\\$$(top_builddir)/raptor/libraptor.la|-lraptor|g' \
-			${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|SUBDIRS = raptor|SUBDIRS =|g ; \
-		 s|$$(top_builddir)/raptor/libraptor.la|-lraptor|g'
-
 .include <bsd.port.mk>
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index 776c604411fd..6484498d1b05 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.13.tar.gz) = 090d3da7a8a063c5292243637e4719b9
+MD5 (redland-0.9.14.tar.gz) = 25047248a273138225737e50fa211165
diff --git a/textproc/rasqal/files/patch-Makefile.in b/textproc/rasqal/files/patch-Makefile.in
new file mode 100644
index 000000000000..3ce0d5a91a3b
--- /dev/null
+++ b/textproc/rasqal/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Sep  9 00:06:26 2003
++++ Makefile.in	Tue Sep  9 08:53:42 2003
+@@ -165,7 +165,7 @@
+ man_MANS = redland-config.1
+ 
+ # Subdirectories to build/install etc.
+-SUBDIRS = librdf examples utils demos @SD@
++SUBDIRS = librdf utils demos @SD@
+ CONFIG_SUBDIRS = raptor
+ # Subdirectories to use for distribution
+ DIST_SUBDIRS = librdf docs examples \
diff --git a/textproc/rasqal/files/patch-configure b/textproc/rasqal/files/patch-configure
new file mode 100644
index 000000000000..bdb0881dd344
--- /dev/null
+++ b/textproc/rasqal/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	Tue Sep  9 00:06:31 2003
++++ configure	Tue Sep  9 09:03:46 2003
+@@ -12735,9 +12735,9 @@
+   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
+ fi
+ 
+-LIBS=
+-CPPFLAGS=
+-LDFLAGS=
++LIBS="$LIBS"
++CPPFLAGS="$CPPFLAGS"
++LDFLAGS="$LDFLAGS"
+ 
+ LIBRDF_LIBTOOLLIBS=librdf.la
+ 
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index b9bea624a62d..ccacfcbaed5c 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -1,3 +1,4 @@
+bin/rdfproc
 bin/redland-config
 bin/redland-db-upgrade
 include/librdf.h
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index ed7961004919..565e55b7fe7a 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.14
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -17,33 +17,25 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
-		raptor.0:${PORTSDIR}/textproc/raptor
+		raptor.1:${PORTSDIR}/textproc/raptor
 
 USE_OPENSSL=	yes
-USE_REINPLACE=	yes
+USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bdb-lib="${LOCALBASE}/lib" \
 		--with-bdb-include="${LOCALBASE}/include/db2" \
 		--with-bdb-dbname="db2" \
-		--with-libwww
+		--with-libwww \
+		--with-raptor=system
 INSTALLS_SHLIB=	yes
 
-MAN1=		redland-config.1 redland-db-upgrade.1
+MAN1=		rdfproc.1 redland-config.1 redland-db-upgrade.1
 MAN3=		redland.3
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|ac_subdirs_all raptor|ac_subdirs_all|g ; \
-		 s|-I\\$$(top_srcdir)/raptor||g ; \
-		 s|\\$$(top_builddir)/raptor/libraptor.la|-lraptor|g' \
-			${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|SUBDIRS = raptor|SUBDIRS =|g ; \
-		 s|$$(top_builddir)/raptor/libraptor.la|-lraptor|g'
-
 .include <bsd.port.mk>
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index 776c604411fd..6484498d1b05 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1 +1 @@
-MD5 (redland-0.9.13.tar.gz) = 090d3da7a8a063c5292243637e4719b9
+MD5 (redland-0.9.14.tar.gz) = 25047248a273138225737e50fa211165
diff --git a/textproc/redland/files/patch-Makefile.in b/textproc/redland/files/patch-Makefile.in
new file mode 100644
index 000000000000..3ce0d5a91a3b
--- /dev/null
+++ b/textproc/redland/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Sep  9 00:06:26 2003
++++ Makefile.in	Tue Sep  9 08:53:42 2003
+@@ -165,7 +165,7 @@
+ man_MANS = redland-config.1
+ 
+ # Subdirectories to build/install etc.
+-SUBDIRS = librdf examples utils demos @SD@
++SUBDIRS = librdf utils demos @SD@
+ CONFIG_SUBDIRS = raptor
+ # Subdirectories to use for distribution
+ DIST_SUBDIRS = librdf docs examples \
diff --git a/textproc/redland/files/patch-configure b/textproc/redland/files/patch-configure
new file mode 100644
index 000000000000..bdb0881dd344
--- /dev/null
+++ b/textproc/redland/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	Tue Sep  9 00:06:31 2003
++++ configure	Tue Sep  9 09:03:46 2003
+@@ -12735,9 +12735,9 @@
+   CFLAGS="$MAINTAINER_CFLAGS $CFLAGS"
+ fi
+ 
+-LIBS=
+-CPPFLAGS=
+-LDFLAGS=
++LIBS="$LIBS"
++CPPFLAGS="$CPPFLAGS"
++LDFLAGS="$LDFLAGS"
+ 
+ LIBRDF_LIBTOOLLIBS=librdf.la
+ 
diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist
index b9bea624a62d..ccacfcbaed5c 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -1,3 +1,4 @@
+bin/rdfproc
 bin/redland-config
 bin/redland-db-upgrade
 include/librdf.h