- Update to 1.0.17

- Support staging [1]
- Set LICENSE
- Convert to the new LIB_DEPENDS format

Submitted by:	Schaich Alonso <alonsoschaich@fastmail.fm>

3 files changed, 18 insertions, 13 deletions

diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index c946869ea9e4..26a229fe3bb6 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -2,30 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	redland
-PORTVERSION=	1.0.16
+PORTVERSION=	1.0.17
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	High-level interface for RDF
 
-LIB_DEPENDS=	raptor2:${PORTSDIR}/textproc/raptor2 \
-		rasqal:${PORTSDIR}/textproc/rasqal
+# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
+# of its licenses is "GPLv2 or newer", which includes GPLv3.
+LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
+LICENSE_COMB=	dual
+
+LIB_DEPENDS=	libraptor2.so:${PORTSDIR}/textproc/raptor2 \
+		librasqal.so:${PORTSDIR}/textproc/rasqal
 
 USE_AUTOTOOLS=	libltdl
 USE_GNOME=	libxml2 lthack
 USE_OPENSSL=	yes
 USE_PERL5=	build
-USES=		gmake pathfix perl5 pkgconfig
+USES=		gmake pathfix perl5 pkgconfig shebangfix
+SHEBANG_FILES=	scripts/touch-mtime.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-raptor=system \
 		--with-threestore=no
 USE_LDCONFIG=	yes
 
-MAN1=		rdfproc.1 redland-config.1 \
-		redland-db-upgrade.1
-MAN3=		redland.3
-
 OPTIONS_DEFINE=	BDB THREADS
 OPTIONS_DEFAULT=	BDB
 #		MYSQL "Use MySQL instead of BDB" off \
@@ -33,7 +35,6 @@ OPTIONS_DEFAULT=	BDB
 #		SQLITE "Use SQLite instead of BDB" off \
 #		VIRTUOSO "Use Virtoso instead of BDB" off
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
diff --git a/textproc/redland/distinfo b/textproc/redland/distinfo
index 3bc47c5fcffc..aa935306c871 100644
--- a/textproc/redland/distinfo
+++ b/textproc/redland/distinfo
@@ -1,2 +1,2 @@
-SHA256 (redland-1.0.16.tar.gz) = d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd
-SIZE (redland-1.0.16.tar.gz) = 1624112
+SHA256 (redland-1.0.17.tar.gz) = de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
+SIZE (redland-1.0.17.tar.gz) = 1621566
diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist
index c2adcc8adcfe..2ad10ea22d41 100644
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -39,6 +39,10 @@ lib/librdf.so.0
 %%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.la
 %%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.so
 libdata/pkgconfig/redland.pc
+man/man1/rdfproc.1.gz
+man/man1/redland-config.1.gz
+man/man1/redland-db-upgrade.1.gz
+man/man3/redland.3.gz
 share/gtk-doc/html/redland/home.png
 share/gtk-doc/html/redland/index.html
 share/gtk-doc/html/redland/index.sgml
@@ -68,7 +72,6 @@ share/gtk-doc/html/redland/redland-query-results.html
 share/gtk-doc/html/redland/redland-query.html
 share/gtk-doc/html/redland/redland-serializer.html
 share/gtk-doc/html/redland/redland-statement.html
-share/gtk-doc/html/redland/redland-storage.html
 share/gtk-doc/html/redland/redland-storage-module-file.html
 share/gtk-doc/html/redland/redland-storage-module-hashes.html
 share/gtk-doc/html/redland/redland-storage-module-memory.html
@@ -79,6 +82,7 @@ share/gtk-doc/html/redland/redland-storage-module-tstore.html
 share/gtk-doc/html/redland/redland-storage-module-uri.html
 share/gtk-doc/html/redland/redland-storage-module-virtuoso.html
 share/gtk-doc/html/redland/redland-storage-modules.html
+share/gtk-doc/html/redland/redland-storage.html
 share/gtk-doc/html/redland/redland-stream.html
 share/gtk-doc/html/redland/redland-unicode.html
 share/gtk-doc/html/redland/redland-uri.html
@@ -97,6 +101,6 @@ share/gtk-doc/html/redland/up.png
 @comment @exec mkdir -p %D/lib/redland
 @comment @dirrm lib/redland
 @dirrm %%DATADIR%%
-@exec mkdir -p %D/share/gtk-doc/html/redland
 @dirrm share/gtk-doc/html/redland
+@dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc