diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index a4d1ee191970..4a9ed73772dd 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -1,78 +1,53 @@ PORTNAME= redland PORTVERSION= 1.0.17 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ MAINTAINER= kde@FreeBSD.org COMMENT= High-level interface for RDF WWW= https://librdf.org # 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= libltdl.so:devel/libltdl \ libraptor2.so:textproc/raptor2 \ librasqal.so:textproc/rasqal -USE_PERL5= build USES= gmake libtool pathfix perl5 pkgconfig shebangfix +USE_LDCONFIG= yes +USE_PERL5= build SHEBANG_FILES= scripts/touch-mtime.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-threestore=no -USE_LDCONFIG= yes -OPTIONS_DEFINE= BDB THREADS -OPTIONS_DEFAULT= BDB +INSTALL_TARGET= install-strip +TEST_TARGET= check + +OPTIONS_DEFINE= THREADS +OPTIONS_DEFAULT= SQLITE -BDB_USES= bdb -BDB_CONFIGURE_OFF= --with-bdb=no +OPTIONS_GROUP= STORAGE +OPTIONS_GROUP_STORAGE= BDB MYSQL PGSQL SQLITE -THREADS_CONFIGURE_ENABLE= threads +OPTIONS_SUB= YES -# 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 +BDB_USES= bdb:5 +BDB_CONFIGURE_WITH= bdb -#.if defined(WITH_MYSQL) -#USE_MYSQL= yes -#CONFIGURE_ARGS+=--with-mysql=yes -#CPPFLAGS+= -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H -#LIBS+= -L${LOCALBASE}/lib/mysql -#PLIST_SUB+= MYSQL="" -#.else -CONFIGURE_ARGS+=--with-mysql=no -PLIST_SUB+= MYSQL="@comment " -#.endif +MYSQL_LIB_DEPENDS= libunwind.so:devel/libunwind +MYSQL_USES= mysql ssl +MYSQL_CONFIGURE_WITH= mysql -#.if defined(WITH_PGSQL) -#USES+= pgsql -#CONFIGURE_ARGS+=--with-postgresql=yes -#PLIST_SUB+= PGSQL="" -#.else -CONFIGURE_ARGS+=--with-postgresql=no -PLIST_SUB+= PGSQL="@comment " -#.endif +PGSQL_USES= pgsql +PGSQL_CONFIGURE_WITH= postgresql -#.if defined(WITH_SQLITE) -#USES+= sqlite:3 -#CONFIGURE_ARGS+=--with-sqlite=3 -#PLIST_SUB+= SQLITE="" -#.else -CONFIGURE_ARGS+=--with-sqlite=no -PLIST_SUB+= SQLITE="@comment " -#.endif +SQLITE_USES= sqlite:3 +SQLITE_CONFIGURE_WITH= sqlite -#.if defined(WITH_VIRTUOSO) -#CONFIGURE_ARGS+=--with-virtuoso=yes -#LIB_DEPENDS+= iodbc.3:databases/libiodbc -#PLIST_SUB+= VIRTUOSO="" -#.else -CONFIGURE_ARGS+=--with-virtuoso=no -PLIST_SUB+= VIRTUOSO="@comment " -#.endif +THREADS_CONFIGURE_WITH= threads .include diff --git a/textproc/redland/files/patch-src_rdf__storage__mysql.c b/textproc/redland/files/patch-src_rdf__storage__mysql.c new file mode 100644 index 000000000000..e338c891b4b3 --- /dev/null +++ b/textproc/redland/files/patch-src_rdf__storage__mysql.c @@ -0,0 +1,11 @@ +--- src/rdf_storage_mysql.c.orig 2023-11-25 15:00:04 UTC ++++ src/rdf_storage_mysql.c +@@ -447,7 +447,7 @@ librdf_storage_mysql_get_handle(librdf_storage* storag + + #ifdef HAVE_MYSQL_OPT_RECONNECT + if(1) { +- my_bool value=(context->reconnect) ? 1 : 0; ++ bool value=(context->reconnect) ? 1 : 0; + mysql_options(connection->handle, MYSQL_OPT_RECONNECT, &value); + } + #endif diff --git a/textproc/redland/pkg-plist b/textproc/redland/pkg-plist index 285a2834bc27..587fb3a0f663 100644 --- a/textproc/redland/pkg-plist +++ b/textproc/redland/pkg-plist @@ -1,96 +1,94 @@ bin/rdfproc bin/redland-config bin/redland-db-upgrade include/librdf.h include/rdf_concepts.h include/rdf_digest.h include/rdf_hash.h include/rdf_init.h include/rdf_iterator.h include/rdf_list.h include/rdf_log.h include/rdf_model.h include/rdf_node.h include/rdf_parser.h include/rdf_query.h include/rdf_raptor.h include/rdf_serializer.h include/rdf_statement.h include/rdf_storage.h include/rdf_storage_module.h include/rdf_stream.h include/rdf_uri.h include/rdf_utf8.h include/redland.h lib/librdf.a 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.so %%PGSQL%%lib/redland/librdf_storage_postgresql.a %%PGSQL%%lib/redland/librdf_storage_postgresql.so %%SQLITE%%lib/redland/librdf_storage_sqlite.a %%SQLITE%%lib/redland/librdf_storage_sqlite.so -%%VIRTUOSO%%lib/redland/librdf_storage_virtuoso.a -%%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 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-1-0-15-to-1-0-16.html share/gtk-doc/html/redland/redland-changes-1-0-16-to-1-0-16.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 share/gtk-doc/html/redland/redland-list.html share/gtk-doc/html/redland/redland-log.html share/gtk-doc/html/redland/redland-model.html share/gtk-doc/html/redland/redland-node.html share/gtk-doc/html/redland/redland-parser.html 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-module-file.html share/gtk-doc/html/redland/redland-storage-module-hashes.html share/gtk-doc/html/redland/redland-storage-module-memory.html share/gtk-doc/html/redland/redland-storage-module-mysql.html share/gtk-doc/html/redland/redland-storage-module-postgresql.html share/gtk-doc/html/redland/redland-storage-module-sqlite.html 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 share/gtk-doc/html/redland/redland-world.html share/gtk-doc/html/redland/redland.devhelp2 share/gtk-doc/html/redland/redland.html share/gtk-doc/html/redland/reference-manual.html share/gtk-doc/html/redland/right.png share/gtk-doc/html/redland/style.css share/gtk-doc/html/redland/tutorial-introduction.html share/gtk-doc/html/redland/tutorial.html share/gtk-doc/html/redland/up.png -%%MYSQL%%share/redland/mysql-v1.ttl -%%MYSQL%%share/redland/mysql-v2.ttl +%%MYSQL%%%%DATADIR%%/mysql-v1.ttl +%%MYSQL%%%%DATADIR%%/mysql-v2.ttl %%DATADIR%%/Redland.i