Update to version 0.9.18

PR:		ports/70119
Submitted by:	Ports Fury

5 files changed, 34 insertions, 36 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 3d3a5d518a1c..ae006b165210 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.16
-PORTREVISION=	1
+PORTVERSION=	0.9.18
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -20,21 +19,25 @@ COMMENT=	A high-level interface for RDF
 LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41 \
 		raptor.2:${PORTSDIR}/textproc/raptor
 
-USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GNOME=	gnomehack gnometarget lthack pkgconfig
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_INC_LIBTOOL_VER=	13
+LIBTOOLFILES=	configure raptor/configure rasqal/configure
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-bdb-lib="${LOCALBASE}/lib" \
 		--with-bdb-include="${LOCALBASE}/include/db41" \
 		--with-bdb-dbname="db41" \
-		--with-libwww \
-		--with-raptor=system
+		--with-raptor=system \
+		--with-rasqal=internal \
+		--with-threestore=no \
+		--with-mysql=no
 INSTALLS_SHLIB=	yes
 
-MAN1=		rdfproc.1 redland-config.1 redland-db-upgrade.1
-MAN3=		redland.3
+MAN1=		rasqal-config.1 rdfproc.1 redland-config.1 \
+		redland-db-upgrade.1 roqet.1
+MAN3=		librasqal.3 redland.3
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index 79ddfc99389b..f36b9c5b10e9 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1,2 +1,2 @@
-MD5 (redland-0.9.16.tar.gz) = d78c768825df2727aec8336fe9772d8d
-SIZE (redland-0.9.16.tar.gz) = 1615586
+MD5 (redland-0.9.18.tar.gz) = 64ab895d0d9f5ad8540357e26dc46253
+SIZE (redland-0.9.18.tar.gz) = 2012458
diff --git a/textproc/rasqal/files/patch-Makefile.in b/textproc/rasqal/files/patch-Makefile.in
index f6b3728a121e..eb18debc2f80 100644
--- a/textproc/rasqal/files/patch-Makefile.in
+++ b/textproc/rasqal/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Feb  1 03:20:27 2004
-+++ Makefile.in	Sun Feb  1 10:55:32 2004
-@@ -264,7 +264,7 @@
- man_MANS = redland-config.1
- 
- # Subdirectories to build/install etc.
--SUBDIRS = @SD_PRE@ librdf examples utils @SD_POST@ demos docs
-+SUBDIRS = @SD_PRE@ librdf utils @SD_POST@ demos docs
- CONFIG_SUBDIRS = raptor
- # Subdirectories to use for distribution
- DIST_SUBDIRS = librdf docs examples \
+--- Makefile.in.orig	Wed Aug  4 12:17:19 2004
++++ Makefile.in	Wed Aug  4 12:18:49 2004
+@@ -257,7 +257,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf utils demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ README      NEWS      LICENSE.txt  TODO \
+ README.html NEWS.html LICENSE.html TODO.html \
diff --git a/textproc/rasqal/files/patch-ltmain.sh b/textproc/rasqal/files/patch-ltmain.sh
deleted file mode 100644
index 6768ded2463d..000000000000
--- a/textproc/rasqal/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Jul 19 07:09:02 2002
-+++ ltmain.sh	Fri Apr 18 21:33:19 2003
-@@ -4274,10 +4274,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index 5937fcee67e3..b4db302c388b 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -1,10 +1,14 @@
+bin/rasqal-config
 bin/rdfproc
 bin/redland-config
 bin/redland-db-upgrade
+bin/roqet
 include/librdf.h
+include/rasqal.h
 include/rdf_concepts.h
 include/rdf_init.h
 include/rdf_iterator.h
+include/rdf_log.h
 include/rdf_model.h
 include/rdf_node.h
 include/rdf_parser.h
@@ -16,7 +20,13 @@ include/rdf_stream.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
+lib/librasqal.a
+lib/librasqal.so
+lib/librasqal.so.0
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
+libdata/pkgconfig/rasqal.pc
 libdata/pkgconfig/redland.pc
+%%DATADIR%%/Redland.i
+@dirrm %%DATADIR%%