Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 06 Jan 2014 14:09:36 +0100
From:      Ralf van der Enden <tremere@cainites.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/185532: [MAINTAINER] databases/opendbx: update to 1.4.6
Message-ID:  <E1W09w0-0006qm-0D@cainites.net>
Resent-Message-ID: <201401061310.s06DA0ew077613@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185532
>Category:       ports
>Synopsis:       [MAINTAINER] databases/opendbx: update to 1.4.6
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 06 13:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Ralf van der Enden
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lan.cainites.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255981: Wed Oct  2 10:15:07
>Description:
- Update to 1.4.6
- add LICENSE
- Stage support
- Fix SQLite 2/3 OPTIONS
- Use options helpers to simplify Makefile
- Hopefully fix compilation on FreeBSD 10

Generated with FreeBSD Port Tools 0.99_11 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- opendbx-1.4.6.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 338873)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opendbx
-PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTVERSION=	1.4.6
 CATEGORIES=	databases
 MASTER_SITES=	http://www.linuxnetworks.de/opendbx/download/
 
@@ -10,6 +9,8 @@
 MAINTAINER=	tremere@cainites.net
 COMMENT=	A C library for accessing databases with a single API
 
+LICENSE=	LGPL
+
 USE_GMAKE=	YES
 USE_AUTOTOOLS=	libtool
 
@@ -21,71 +22,54 @@
 
 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 "
+CONFIGURE_MODULES+=	sybase
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 338873)
+++ distinfo	(working copy)
@@ -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
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 338873)
+++ pkg-plist	(working copy)
@@ -17,30 +17,30 @@
 %%NLS%%share/locale/de/LC_MESSAGES/opendbx-utils.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/opendbx.mo
 %%NLS%%share/locale/en@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%%
--- opendbx-1.4.6.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1W09w0-0006qm-0D>