Page MenuHomeFreeBSD
Files F151133894

D42769.id130575.diff
No OneTemporary
Actions

D42769.id130575.diff
View Options

diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -1,6 +1,6 @@
PORTNAME= redland
PORTVERSION= 1.0.17
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= http://download.librdf.org/source/
@@ -17,62 +17,37 @@
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
-BDB_USES= bdb
-BDB_CONFIGURE_OFF= --with-bdb=no
+OPTIONS_DEFINE= THREADS
+OPTIONS_DEFAULT= SQLITE
-THREADS_CONFIGURE_ENABLE= threads
+OPTIONS_GROUP= STORAGE
+OPTIONS_GROUP_STORAGE= BDB MYSQL PGSQL SQLITE
+
+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
+BDB_CONFIGURE_OFF= --with-bdb=no
-#.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_ENABLE= threads
.include <bsd.port.mk>
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
--- /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
--- a/textproc/redland/pkg-plist
+++ b/textproc/redland/pkg-plist
@@ -32,8 +32,6 @@
%%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
@@ -91,6 +89,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 7:51 AM (2 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31019461
Default Alt Text
D42769.id130575.diff (3 KB)

Event Timeline