Update to 1.0.15

Bug fixes, new features. Requires Raptor V2.

6 files changed, 28 insertions, 31 deletions

diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 8c07a498757..9739431aa1c 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2012/03/03 00:12:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2012/03/19 09:40:08 markd Exp $
 
-DISTNAME=	redland-1.0.12
-PKGREVISION=	3
+DISTNAME=	redland-1.0.15
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
@@ -43,6 +42,6 @@ post-install:
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/raptor/buildlink3.mk"
+.include "../../textproc/raptor2/buildlink3.mk"
 .include "../../textproc/rasqal/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/redland/PLIST b/textproc/redland/PLIST
index 857e7d8ac5a..2a56db8f42c 100644
--- a/textproc/redland/PLIST
+++ b/textproc/redland/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/01/25 20:08:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/19 09:40:08 markd Exp $
 bin/rdfproc
 bin/redland-config
 bin/redland-db-upgrade
@@ -36,9 +36,14 @@ share/gtk-doc/html/redland/indexes.html
 share/gtk-doc/html/redland/introduction.html
 share/gtk-doc/html/redland/left.png
 share/gtk-doc/html/redland/objects.html
+share/gtk-doc/html/redland/redland-changes-1-0-12-to-1-0-13.html
+share/gtk-doc/html/redland/redland-changes-1-0-13-to-1-0-14.html
+share/gtk-doc/html/redland/redland-changes-1-0-14-to-1-0-15.html
+share/gtk-doc/html/redland/redland-changes.html
 share/gtk-doc/html/redland/redland-concepts.html
 share/gtk-doc/html/redland/redland-digest.html
 share/gtk-doc/html/redland/redland-files.html
+share/gtk-doc/html/redland/redland-general.html
 share/gtk-doc/html/redland/redland-hash.html
 share/gtk-doc/html/redland/redland-heuristics.html
 share/gtk-doc/html/redland/redland-iterator.html
@@ -66,7 +71,6 @@ share/gtk-doc/html/redland/redland-stream.html
 share/gtk-doc/html/redland/redland-unicode.html
 share/gtk-doc/html/redland/redland-uri.html
 share/gtk-doc/html/redland/redland-world.html
-share/gtk-doc/html/redland/redland.devhelp
 share/gtk-doc/html/redland/redland.devhelp2
 share/gtk-doc/html/redland/redland.html
 share/gtk-doc/html/redland/reference-manual.html
diff --git a/textproc/redland/buildlink3.mk b/textproc/redland/buildlink3.mk
index 2bb47653a54..bfc16c9ab16 100644
--- a/textproc/redland/buildlink3.mk
+++ b/textproc/redland/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2012/03/03 00:12:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2012/03/19 09:40:08 markd Exp $
 
 BUILDLINK_TREE+=	redland
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.redland?=	redland>=1.0.12nb3
 BUILDLINK_PKGSRCDIR.redland?=	../../textproc/redland
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/raptor/buildlink3.mk"
+.include "../../textproc/raptor2/buildlink3.mk"
 .include "../../textproc/rasqal/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .endif # REDLAND_BUILDLINK3_MK
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index ac50bfa31f4..aceebe6fc30 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/10/16 16:40:03 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/03/19 09:40:08 markd Exp $
 
-SHA1 (redland-1.0.12.tar.gz) = 94b0f972a62c7eed0574c0e46c79cf78ece46570
-RMD160 (redland-1.0.12.tar.gz) = 1af4bd59ae8be265cfeb806eb7b99d8b32f231f5
-Size (redland-1.0.12.tar.gz) = 1552241 bytes
-SHA1 (patch-aa) = 8298d52f722bae2e9620a0e7edebc3b6b4c471ce
-SHA1 (patch-ab) = 5fbf749858fbee77db31656a43161cf4944d5de7
+SHA1 (redland-1.0.15.tar.gz) = e93d6fafaeebdf9f15a1044be6f4a88270f007af
+RMD160 (redland-1.0.15.tar.gz) = 5cd4eca23faf05348c2327f356980aa2f18accea
+Size (redland-1.0.15.tar.gz) = 1600090 bytes
+SHA1 (patch-ab) = 08ace99b46ff0b670a8b03227eeeedc6b08ef877
diff --git a/textproc/redland/patches/patch-aa b/textproc/redland/patches/patch-aa
deleted file mode 100644
index 2dc348b2be2..00000000000
--- a/textproc/redland/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/01/25 20:08:28 markd Exp $
-
---- src/Makefile.in.orig	2010-01-25 09:53:52.000000000 +0000
-+++ src/Makefile.in
-@@ -577,8 +577,7 @@ librdf_la_LIBADD = \
- @LIBRDF_INTERNAL_LIBS@
- 
- librdf_la_DEPENDENCIES = \
--@DIGEST_OBJS@ @HASH_OBJS@ \
--@LIBRDF_INTERNAL_LIBS@
-+@DIGEST_OBJS@ @HASH_OBJS@
- 
- EXTRA_librdf_la_SOURCES = rdf_hash_bdb.c \
- rdf_digest_md5.c rdf_digest_sha1.c \
diff --git a/textproc/redland/patches/patch-ab b/textproc/redland/patches/patch-ab
index d646e4e4125..bd4e2a90cae 100644
--- a/textproc/redland/patches/patch-ab
+++ b/textproc/redland/patches/patch-ab
@@ -1,10 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2010/10/16 16:40:03 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2012/03/19 09:40:08 markd Exp $
 
 Fix unportable test(1) construct.
 
---- configure.orig	2010-10-16 16:30:21.000000000 +0000
+--- configure.orig	2011-12-04 02:43:29.000000000 +0000
 +++ configure
-@@ -13884,7 +13884,7 @@ if test "${with_module_path+set}" = set;
+@@ -13916,7 +13916,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ 
+-      if test "$have_bdb_open_7_args" == Xno; then
++      if test "$have_bdb_open_7_args" = Xno; then
+         # Cannot have 6 args if 7 args worked
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BDB V4.0 DB->open with 6 arguments" >&5
+ $as_echo_n "checking for BDB V4.0 DB->open with 6 arguments... " >&6; }
+@@ -14780,7 +14780,7 @@ if test "${with_module_path+set}" = set;
    withval=$with_module_path; REDLAND_MODULE_PATH="$witheval"
  fi