svn commit: r340229 - in head/databases/opendbx: . files
Danilo Egea Gondolfo
danilo at FreeBSD.org
Sun Jan 19 02:36:26 UTC 2014
Author: danilo
Date: Sun Jan 19 02:36:25 2014
New Revision: 340229
URL: http://svnweb.freebsd.org/changeset/ports/340229
QAT: https://qat.redports.org/buildarchive/r340229/
Log:
- Update from 1.4.5 to 1.4.6
- Use options helpers
- Add stage support
while here
- Define LICENSE properly
- Convert USE_GMAKE to USES
- Remove the indefinite article from COMMENT
PR: ports/185532
Submitted by: Ralf van der Enden <tremere at cainites.net> (maintainer)
Modified:
head/databases/opendbx/Makefile
head/databases/opendbx/distinfo
head/databases/opendbx/files/patch-Makefile.in
head/databases/opendbx/pkg-plist
Modified: head/databases/opendbx/Makefile
==============================================================================
--- head/databases/opendbx/Makefile Sun Jan 19 02:20:23 2014 (r340228)
+++ head/databases/opendbx/Makefile Sun Jan 19 02:36:25 2014 (r340229)
@@ -2,15 +2,16 @@
# $FreeBSD$
PORTNAME= opendbx
-PORTVERSION= 1.4.5
-PORTREVISION= 2
+PORTVERSION= 1.4.6
CATEGORIES= databases
MASTER_SITES= http://www.linuxnetworks.de/opendbx/download/
MAINTAINER= tremere at cainites.net
-COMMENT= A C library for accessing databases with a single API
+COMMENT= C library for accessing databases with a single API
-USE_GMAKE= YES
+LICENSE= LGPL21
+
+USES= gmake
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -21,71 +22,54 @@ USE_LDCONFIG= ${PREFIX}/lib/opendbx
OPTIONS_DEFINE= NLS
OPTIONS_MULTI= DRIVER
-OPTIONS_MULTI_DRIVER= MYSQL PGSQL SQLITE2 MSSQL SYBASE
+OPTIONS_MULTI_DRIVER= MYSQL PGSQL SQLITE SQLITE3 MSSQL SYBASE
OPTIONS_DEFAULT= MYSQL
-SQLITE2_DESC= SQLite 2 database
-SYBASE_DESC= Sybase database
+SQLITE_DESC= SQLite 2 database support
+SYBASE_DESC= Sybase database support
DRIVER_DESC= Database drivers
-NO_STAGE= yes
+OPTIONS_SUB= YES
+MYSQL_USE= MYSQL=YES
+MYSQL_CPPFLAGS= -I${LOCALBASE}/include/mysql
+MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
+
+PGSQL_USE= PGSQL=YES
+
+SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2
+
+SQLITE3_USE= SQLITE=3
+
+MSSQL_LIB_DEPENDS= sybdb:${PORTSDIR}/databases/freetds
+
+SYBASE_LIB_DEPENDS= ct:${PORTSDIR}/databases/freetds
+
+NLS_USES= gettext
+NLS_CONFIGURE_DISABLE= nls
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL?= YES
-CONFIGURE_MODULES+= "mysql"
-CPPFLAGS+= -I${LOCALBASE}/include/mysql
-LDFLAGS+= -L${LOCALBASE}/lib/mysql
-PLIST_SUB+= WITHMYSQL=""
-.else
-PLIST_SUB+= WITHMYSQL="@comment "
+CONFIGURE_MODULES+= mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL?= YES
-CONFIGURE_MODULES+= "pgsql"
-PLIST_SUB+= WITHPGSQL=""
-.else
-PLIST_SUB+= WITHPGSQL="@comment "
+CONFIGURE_MODULES+= pgsql
.endif
.if ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite2
-CONFIGURE_MODULES+= "sqlite"
-PLIST_SUB+= WITHSQLITE=""
-.else
-PLIST_SUB+= WITHSQLITE="@comment "
+CONFIGURE_MODULES+= sqlite
.endif
.if ${PORT_OPTIONS:MSQLITE3}
-LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3
-CONFIGURE_MODULES+= "sqlite3"
-PLIST_SUB+= WITHSQLITE3=""
-.else
-PLIST_SUB+= WITHSQLITE3="@comment "
+CONFIGURE_MODULES+= sqlite3
.endif
.if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds
-CONFIGURE_MODULES+= "mssql"
-PLIST_SUB+= WITHMSSQL=""
-.else
-PLIST_SUB+= WITHMSSQL="@comment "
+CONFIGURE_MODULES+= mssql
.endif
.if ${PORT_OPTIONS:MSYBASE}
-LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds
-CONFIGURE_MODULES+= "sybase"
-PLIST_SUB+= WITHSYBASE=""
-.else
-PLIST_SUB+= WITHSYBASE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
+CONFIGURE_MODULES+= sybase
.endif
.include <bsd.port.mk>
Modified: head/databases/opendbx/distinfo
==============================================================================
--- head/databases/opendbx/distinfo Sun Jan 19 02:20:23 2014 (r340228)
+++ head/databases/opendbx/distinfo Sun Jan 19 02:36:25 2014 (r340229)
@@ -1,2 +1,2 @@
-SHA256 (opendbx-1.4.5.tar.gz) = 206c998f370d1677a5692a64941470205dc6cd8ad95be1af6b033df50a6431cd
-SIZE (opendbx-1.4.5.tar.gz) = 582915
+SHA256 (opendbx-1.4.6.tar.gz) = 2246a03812c7d90f10194ad01c2213a7646e383000a800277c6fb8d2bf81497c
+SIZE (opendbx-1.4.6.tar.gz) = 587514
Modified: head/databases/opendbx/files/patch-Makefile.in
==============================================================================
--- head/databases/opendbx/files/patch-Makefile.in Sun Jan 19 02:20:23 2014 (r340228)
+++ head/databases/opendbx/files/patch-Makefile.in Sun Jan 19 02:36:25 2014 (r340229)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2009-08-07 22:52:54.000000000 -0300
-+++ Makefile.in 2009-08-07 22:54:01.000000000 -0300
-@@ -260,7 +260,7 @@
+--- ./Makefile.in.orig 2012-06-10 18:33:53.000000000 -0300
++++ ./Makefile.in 2014-01-19 00:08:50.000000000 -0200
+@@ -308,7 +308,7 @@
opendbx.spec \
ABOUT-NLS
Modified: head/databases/opendbx/pkg-plist
==============================================================================
--- head/databases/opendbx/pkg-plist Sun Jan 19 02:20:23 2014 (r340228)
+++ head/databases/opendbx/pkg-plist Sun Jan 19 02:36:25 2014 (r340229)
@@ -17,30 +17,30 @@ libdata/pkgconfig/opendbxplus.pc
%%NLS%%share/locale/de/LC_MESSAGES/opendbx-utils.mo
%%NLS%%share/locale/en at quot/LC_MESSAGES/opendbx.mo
%%NLS%%share/locale/en at quot/LC_MESSAGES/opendbx-utils.mo
-%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.a
-%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.la
-%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.so
-%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.so.3
-%%WITHMYSQL%%lib/opendbx/libmysqlbackend.a
-%%WITHMYSQL%%lib/opendbx/libmysqlbackend.la
-%%WITHMYSQL%%lib/opendbx/libmysqlbackend.so
-%%WITHMYSQL%%lib/opendbx/libmysqlbackend.so.3
-%%WITHSQLITE%%lib/opendbx/libsqlitebackend.a
-%%WITHSQLITE%%lib/opendbx/libsqlitebackend.la
-%%WITHSQLITE%%lib/opendbx/libsqlitebackend.so
-%%WITHSQLITE%%lib/opendbx/libsqlitebackend.so.3
-%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.a
-%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.la
-%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.so
-%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.so.3
-%%WITHMSSQL%%lib/opendbx/libmssqlbackend.a
-%%WITHMSSQL%%lib/opendbx/libmssqlbackend.la
-%%WITHMSSQL%%lib/opendbx/libmssqlbackend.so
-%%WITHMSSQL%%lib/opendbx/libmssqlbackend.so.3
-%%WITHSYBASE%%lib/opendbx/libsybasebackend.a
-%%WITHSYBASE%%lib/opendbx/libsybasebackend.la
-%%WITHSYBASE%%lib/opendbx/libsybasebackend.so
-%%WITHSYBASE%%lib/opendbx/libsybasebackend.so.3
+%%PGSQL%%lib/opendbx/libpgsqlbackend.a
+%%PGSQL%%lib/opendbx/libpgsqlbackend.la
+%%PGSQL%%lib/opendbx/libpgsqlbackend.so
+%%PGSQL%%lib/opendbx/libpgsqlbackend.so.3
+%%MYSQL%%lib/opendbx/libmysqlbackend.a
+%%MYSQL%%lib/opendbx/libmysqlbackend.la
+%%MYSQL%%lib/opendbx/libmysqlbackend.so
+%%MYSQL%%lib/opendbx/libmysqlbackend.so.3
+%%SQLITE%%lib/opendbx/libsqlitebackend.a
+%%SQLITE%%lib/opendbx/libsqlitebackend.la
+%%SQLITE%%lib/opendbx/libsqlitebackend.so
+%%SQLITE%%lib/opendbx/libsqlitebackend.so.3
+%%SQLITE3%%lib/opendbx/libsqlite3backend.a
+%%SQLITE3%%lib/opendbx/libsqlite3backend.la
+%%SQLITE3%%lib/opendbx/libsqlite3backend.so
+%%SQLITE3%%lib/opendbx/libsqlite3backend.so.3
+%%MSSQL%%lib/opendbx/libmssqlbackend.a
+%%MSSQL%%lib/opendbx/libmssqlbackend.la
+%%MSSQL%%lib/opendbx/libmssqlbackend.so
+%%MSSQL%%lib/opendbx/libmssqlbackend.so.3
+%%SYBASE%%lib/opendbx/libsybasebackend.a
+%%SYBASE%%lib/opendbx/libsybasebackend.la
+%%SYBASE%%lib/opendbx/libsybasebackend.so
+%%SYBASE%%lib/opendbx/libsybasebackend.so.3
@dirrm include/opendbx
@dirrm lib/opendbx
@dirrm %%DATADIR%%
More information about the svn-ports-all
mailing list