[Midnightbsd-cvs] mports [18493] trunk/textproc/redland: fix license

[laffer1 at midnightbsd.org]

Revision: 18493
          http://svnweb.midnightbsd.org/mports/?rev=18493
Author:   laffer1
Date:     2015-03-29 18:19:13 -0400 (Sun, 29 Mar 2015)
Log Message:
-----------
fix license

Modified Paths:
--------------
    trunk/textproc/redland/Makefile
    trunk/textproc/redland/pkg-plist

Modified: trunk/textproc/redland/Makefile
===================================================================
--- trunk/textproc/redland/Makefile	2015-03-29 22:16:47 UTC (rev 18492)
+++ trunk/textproc/redland/Makefile	2015-03-29 22:19:13 UTC (rev 18493)
@@ -2,6 +2,7 @@
 
 PORTNAME=	redland
 PORTVERSION=	1.0.17
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/
 
@@ -8,51 +9,38 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	High-level interface for RDF
 
-LICENSE=	gpl2
+LICENSE=	apache2 gpl2 gpl3 lgpl2.1
+LICENSE_COMB=	dual
 
-LIB_DEPENDS=	raptor2:${PORTSDIR}/textproc/raptor2 \
-		rasqal:${PORTSDIR}/textproc/rasqal
+LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
+		libraptor2.so:${PORTSDIR}/textproc/raptor2 \
+		librasqal.so:${PORTSDIR}/textproc/rasqal
 
-USE_AUTOTOOLS=	libltdl
-USE_GNOME=	gnomehack libxml2 lthack
-USE_OPENSSL=	yes
-USE_PERL5_BUILD=	yes
-USE_PKGCONFIG=	both
+USE_PERL5=	build
+USES=		gmake libtool pathfix perl5 pkgconfig shebangfix
+SHEBANG_FILES=	scripts/touch-mtime.pl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-raptor=system \
-		--with-threestore=no
-USE_GMAKE=	yes
+CONFIGURE_ARGS=	--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
 
-.include <bsd.mport.options.mk>
+BDB_USE=	BDB=yes
+BDB_CONFIGURE_OFF=	--with-bdb=no
 
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	yes
-WITH_BDB_HIGHEST=	yes
-INVALID_BDB_VER=	2
-.else
-CONFIGURE_ARGS+=	--with-bdb=no
-.endif
+THREADS_CONFIGURE_ENABLE=	threads
 
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=	--enable-threads
-.else
-CONFIGURE_ARGS+=	--disable-threads
-.endif
+#		MYSQL "Use MySQL instead of BDB" off \
+#		PGSQL "Use PgSQL instead of BDB" off \
+#		SQLITE "Use SQLite instead of BDB" off \
+#		VIRTUOSO "Use Virtoso instead of BDB" off
 
 #.if defined(WITH_MYSQL)
 #USE_MYSQL=	yes
 #CONFIGURE_ARGS+=--with-mysql=yes
-#CONFIGURE_ENV+=	LIBS="${LIBS}"
-#CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
-#LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+#CPPFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
+#LIBS+=		-L${LOCALBASE}/lib/mysql
 #PLIST_SUB+=	MYSQL=""
 #.else
 CONFIGURE_ARGS+=--with-mysql=no
@@ -60,7 +48,7 @@
 #.endif
 
 #.if defined(WITH_PGSQL)
-#USE_PGSQL=	yes
+#USES+=		pgsql
 #CONFIGURE_ARGS+=--with-postgresql=yes
 #PLIST_SUB+=	PGSQL=""
 #.else
@@ -86,15 +74,4 @@
 PLIST_SUB+=	VIRTUOSO="@comment "
 #.endif
 
-pre-everything::
-.	if ${PORT_OPTIONS:MBDB}
-	@${ECHO_CMD} "You can choose BDB version by setting WITH_BDB_VER to one off:"
-	@${ECHO_CMD} "48+ 5+ (current: ${BDB_VER})"
-.	endif
-.	if defined(WITH_MYSQL)
-	@${ECHO_CMD} "MySQL version to be used: ${MYSQL_VER}"
-	@${ECHO_CMD} "If you don't have MySQL installed you can stop the build now"
-	@${ECHO_CMD} "and set WITH_MYSQL_VER to the desired version"
-.	endif
-
 .include <bsd.port.mk>

Modified: trunk/textproc/redland/pkg-plist
===================================================================
--- trunk/textproc/redland/pkg-plist	2015-03-29 22:16:47 UTC (rev 18492)
+++ trunk/textproc/redland/pkg-plist	2015-03-29 22:19:13 UTC (rev 18493)
@@ -23,20 +23,16 @@
 include/rdf_utf8.h
 include/redland.h
 lib/librdf.a
-lib/librdf.la
 lib/librdf.so
 lib/librdf.so.0
+lib/librdf.so.0.0.0
 %%MYSQL%%lib/redland/librdf_storage_mysql.a
-%%MYSQL%%lib/redland/librdf_storage_mysql.la
 %%MYSQL%%lib/redland/librdf_storage_mysql.so
 %%PGSQL%%lib/redland/librdf_storage_postgresql.a
-%%PGSQL%%lib/redland/librdf_storage_postgresql.la
 %%PGSQL%%lib/redland/librdf_storage_postgresql.so
 %%SQLITE%%lib/redland/librdf_storage_sqlite.a
-%%SQLITE%%lib/redland/librdf_storage_sqlite.la
 %%SQLITE%%lib/redland/librdf_storage_sqlite.so
 %%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.a
-%%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.la
 %%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.so
 libdata/pkgconfig/redland.pc
 man/man1/rdfproc.1.gz
@@ -98,9 +94,3 @@
 %%MYSQL%%share/redland/mysql-v1.ttl
 %%MYSQL%%share/redland/mysql-v2.ttl
 %%DATADIR%%/Redland.i
- at comment @exec mkdir -p %D/lib/redland
- at comment @dirrm lib/redland
- at dirrm %%DATADIR%%
- at dirrm share/gtk-doc/html/redland
- at dirrmtry share/gtk-doc/html
- at dirrmtry share/gtk-doc