- Update to 0.9.15

PR:		ports/62268
Submitted by:	Ports Fury

8 files changed, 26 insertions, 48 deletions

diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index a454b797d483..d907b0082538 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.14
+PORTVERSION=	0.9.15
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -16,18 +16,18 @@ MASTER_SITE_SUBDIR=	librdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
+LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41 \
 		raptor.2:${PORTSDIR}/textproc/raptor
 
+USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_OPENSSL=	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_ARGS=	--with-bdb-lib="${LOCALBASE}/lib" \
-		--with-bdb-include="${LOCALBASE}/include/db2" \
-		--with-bdb-dbname="db2" \
+		--with-bdb-include="${LOCALBASE}/include/db41" \
+		--with-bdb-dbname="db41" \
 		--with-libwww \
 		--with-raptor=system
 INSTALLS_SHLIB=	yes
diff --git a/textproc/rasqal/distinfo b/textproc/rasqal/distinfo
index 96b8661c88b3..0b60cc0f54de 100644
--- a/textproc/rasqal/distinfo
+++ b/textproc/rasqal/distinfo
@@ -1,2 +1,2 @@
-MD5 (redland-0.9.14.tar.gz) = 25047248a273138225737e50fa211165
-SIZE (redland-0.9.14.tar.gz) = 1306009
+MD5 (redland-0.9.15.tar.gz) = 0547f601751ed6fce371fe14eea1ca5a
+SIZE (redland-0.9.15.tar.gz) = 1685861
diff --git a/textproc/rasqal/files/patch-Makefile.in b/textproc/rasqal/files/patch-Makefile.in
index 3ce0d5a91a3b..f6b3728a121e 100644
--- a/textproc/rasqal/files/patch-Makefile.in
+++ b/textproc/rasqal/files/patch-Makefile.in
@@ -1,11 +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 @@
+--- 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 = librdf examples utils demos @SD@
-+SUBDIRS = librdf utils demos @SD@
+-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 \
diff --git a/textproc/rasqal/pkg-plist b/textproc/rasqal/pkg-plist
index ccacfcbaed5c..5937fcee67e3 100644
--- a/textproc/rasqal/pkg-plist
+++ b/textproc/rasqal/pkg-plist
@@ -3,31 +3,20 @@ bin/redland-config
 bin/redland-db-upgrade
 include/librdf.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_memory.h
-include/rdf_heuristics.h
 include/rdf_init.h
 include/rdf_iterator.h
-include/rdf_list.h
 include/rdf_model.h
-include/rdf_model_storage.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
-include/rdf_storage_list.h
 include/rdf_stream.h
-include/rdf_types.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
+libdata/pkgconfig/redland.pc
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index a454b797d483..d907b0082538 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	redland
-PORTVERSION=	0.9.14
+PORTVERSION=	0.9.15
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.redland.opensource.ac.uk/dist/source/
@@ -16,18 +16,18 @@ MASTER_SITE_SUBDIR=	librdf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level interface for RDF
 
-LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2 \
+LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41 \
 		raptor.2:${PORTSDIR}/textproc/raptor
 
+USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_OPENSSL=	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_ARGS=	--with-bdb-lib="${LOCALBASE}/lib" \
-		--with-bdb-include="${LOCALBASE}/include/db2" \
-		--with-bdb-dbname="db2" \
+		--with-bdb-include="${LOCALBASE}/include/db41" \
+		--with-bdb-dbname="db41" \
 		--with-libwww \
 		--with-raptor=system
 INSTALLS_SHLIB=	yes
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index 96b8661c88b3..0b60cc0f54de 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1,2 +1,2 @@
-MD5 (redland-0.9.14.tar.gz) = 25047248a273138225737e50fa211165
-SIZE (redland-0.9.14.tar.gz) = 1306009
+MD5 (redland-0.9.15.tar.gz) = 0547f601751ed6fce371fe14eea1ca5a
+SIZE (redland-0.9.15.tar.gz) = 1685861
diff --git a/textproc/redland/files/patch-Makefile.in b/textproc/redland/files/patch-Makefile.in
index 3ce0d5a91a3b..f6b3728a121e 100644
--- a/textproc/redland/files/patch-Makefile.in
+++ b/textproc/redland/files/patch-Makefile.in
@@ -1,11 +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 @@
+--- 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 = librdf examples utils demos @SD@
-+SUBDIRS = librdf utils demos @SD@
+-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 \
diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist
index ccacfcbaed5c..5937fcee67e3 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -3,31 +3,20 @@ bin/redland-config
 bin/redland-db-upgrade
 include/librdf.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_memory.h
-include/rdf_heuristics.h
 include/rdf_init.h
 include/rdf_iterator.h
-include/rdf_list.h
 include/rdf_model.h
-include/rdf_model_storage.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
-include/rdf_storage_list.h
 include/rdf_stream.h
-include/rdf_types.h
 include/rdf_uri.h
 include/rdf_utf8.h
 include/redland.h
 lib/librdf.a
 lib/librdf.so
 lib/librdf.so.0
+libdata/pkgconfig/redland.pc