From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 18 14:20:11 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C4DF16A408 for ; Sun, 18 Feb 2007 14:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 0268A13C461 for ; Sun, 18 Feb 2007 14:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1IEKAxJ035456 for ; Sun, 18 Feb 2007 14:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1IEKA6Q035454; Sun, 18 Feb 2007 14:20:10 GMT (envelope-from gnats) Resent-Date: Sun, 18 Feb 2007 14:20:10 GMT Resent-Message-Id: <200702181420.l1IEKA6Q035454@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ralf van der Enden Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A3AB416A401 for ; Sun, 18 Feb 2007 14:18:55 +0000 (UTC) (envelope-from root@cainites.net) Received: from mail.cainites.net (xs4all.cainites.net [80.126.212.243]) by mx1.freebsd.org (Postfix) with ESMTP id 3EAC213C4B5 for ; Sun, 18 Feb 2007 14:18:55 +0000 (UTC) (envelope-from root@cainites.net) Received: by mail.cainites.net (Postfix, from userid 0) id E8DF22D1; Sun, 18 Feb 2007 15:18:53 +0100 (CET) Message-Id: <20070218141853.E8DF22D1@mail.cainites.net> Date: Sun, 18 Feb 2007 15:18:53 +0100 (CET) From: Ralf van der Enden To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109276: databases/opendbx: update to 1.2.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ralf van der Enden List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Feb 2007 14:20:11 -0000 >Number: 109276 >Category: ports >Synopsis: databases/opendbx: update to 1.2.1 >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: Sun Feb 18 14:20:10 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Ralf van der Enden >Release: FreeBSD 6.2-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD lan.cainites.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #1: Sat Feb 10 10:33:32 CET 2007 root@lan.cainites.net:/usr/obj/usr/src/sys/HELLKERNEL i386 >Description: Update to version 1.2.1 (bumps library version from .1 to .2) Since this new version supports MSSQL through the freetds library add that to the Makefile Fix installation of opendbx.pc file Fix building SQLite 2 and SQLite 3 backends when both were selected Make Gettext support optional (instead of disabled by default) >How-To-Repeat: >Fix: --- opendbx-1.2.1.diff begins here --- Index: distinfo =================================================================== --- distinfo (revision 41) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -MD5 (opendbx-1.0.3.tar.gz) = 13bed4226f49139cd31ab1d924182879 -SHA256 (opendbx-1.0.3.tar.gz) = 7c102f24c30518f5cadce4a83acfb1971f946836069f7e396a58de4080820a21 -SIZE (opendbx-1.0.3.tar.gz) = 409985 +MD5 (opendbx-1.2.1.tar.gz) = 0c455109d6a4a6d758d99ca1d55adb51 +SHA256 (opendbx-1.2.1.tar.gz) = a9ff56ce3291e46c7cc66334e4b2fabdb341a86d52a02038818d833749befbfe +SIZE (opendbx-1.2.1.tar.gz) = 461015 Index: pkg-plist =================================================================== --- pkg-plist (revision 41) +++ pkg-plist (working copy) @@ -2,21 +2,26 @@ lib/libopendbx.a lib/libopendbx.la lib/libopendbx.so -lib/libopendbx.so.1 +lib/libopendbx.so.2 +libdata/pkgconfig/opendbx.pc %%WITHPGSQL%%lib/opendbx/libpgsqlbackend.a %%WITHPGSQL%%lib/opendbx/libpgsqlbackend.la %%WITHPGSQL%%lib/opendbx/libpgsqlbackend.so -%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.so.1 +%%WITHPGSQL%%lib/opendbx/libpgsqlbackend.so.2 %%WITHMYSQL%%lib/opendbx/libmysqlbackend.a %%WITHMYSQL%%lib/opendbx/libmysqlbackend.la %%WITHMYSQL%%lib/opendbx/libmysqlbackend.so -%%WITHMYSQL%%lib/opendbx/libmysqlbackend.so.1 +%%WITHMYSQL%%lib/opendbx/libmysqlbackend.so.2 %%WITHSQLITE%%lib/opendbx/libsqlitebackend.a %%WITHSQLITE%%lib/opendbx/libsqlitebackend.la %%WITHSQLITE%%lib/opendbx/libsqlitebackend.so -%%WITHSQLITE%%lib/opendbx/libsqlitebackend.so.1 +%%WITHSQLITE%%lib/opendbx/libsqlitebackend.so.2 %%WITHSQLITE3%%lib/opendbx/libsqlite3backend.a %%WITHSQLITE3%%lib/opendbx/libsqlite3backend.la %%WITHSQLITE3%%lib/opendbx/libsqlite3backend.so -%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.so.1 +%%WITHSQLITE3%%lib/opendbx/libsqlite3backend.so.2 +%%WITHMSSQL%%lib/opendbx/libmssqlbackend.a +%%WITHMSSQL%%lib/opendbx/libmssqlbackend.la +%%WITHMSSQL%%lib/opendbx/libmssqlbackend.so +%%WITHMSSQL%%lib/opendbx/libmssqlbackend.so.2 @dirrm lib/opendbx Index: Makefile =================================================================== --- Makefile (revision 41) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= opendbx -PORTVERSION= 1.0.3 +PORTVERSION= 1.2.1 CATEGORIES= databases MASTER_SITES= http://www.linuxnetworks.de/opendbx/download/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -17,10 +17,10 @@ USE_GMAKE= YES USE_AUTOTOOLS= libtool:15 -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} -L../lib -L${LOCALBASE}/lib CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --with-backends="${CONFIGURE_MODULES}" --disable-nls +CONFIGURE_ARGS+= --with-backends="${CONFIGURE_MODULES}" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= ${PREFIX}/lib/opendbx @@ -28,7 +28,9 @@ OPTIONS= MYSQL "Support for the MySQL database" on \ PGSQL "Support for the PostgreSQL database" off \ SQLITE "Support for the SQLite 2 database" off \ - SQLITE3 "Support for the SQLite 3 database" off + SQLITE3 "Support for the SQLite 3 database" off \ + MSSQL "Support for the MSSQL database" off \ + GETTEXT "Support for the gettext library" off .include @@ -39,8 +41,8 @@ # ${REINPLACE_CMD} 's/stdint.h/inttypes.h/' ${WRKSRC}/lib/odbx.h .endif -.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_SQLITE3) -IGNORE= you need to select at least one database +.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) && !defined(WITH_SQLITE3) && !defined(WITH_MSSQL) +IGNORE= needs at least one database backend .endif .if defined(WITH_MYSQL) @@ -62,7 +64,7 @@ .endif .if defined(WITH_SQLITE) -USE_SQLITE?= 2 +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_MODULES+= "sqlite" PLIST_SUB+= WITHSQLITE="" .else @@ -70,11 +72,25 @@ .endif .if defined(WITH_SQLITE3) -USE_SQLITE?= 3 +LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 CONFIGURE_MODULES+= "sqlite3" PLIST_SUB+= WITHSQLITE3="" .else PLIST_SUB+= WITHSQLITE3="@comment " .endif +.if defined(WITH_MSSQL) +LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds +CONFIGURE_MODULES+= "mssql" +PLIST_SUB+= WITHMSSQL="" +.else +PLIST_SUB+= WITHMSSQL="@comment " +.endif + +.if defined(WITH_GETTEXT) +USE_GETTEXT= YES +.else +CONFIGURE_ARGS+= --disable-nls +.endif + .include Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 0) +++ files/patch-Makefile.in (revision 0) @@ -0,0 +1,11 @@ +--- Makefile.in.org Mon Feb 12 09:51:32 2007 ++++ Makefile.in Mon Feb 12 09:58:27 2007 +@@ -230,7 +230,7 @@ + opendbx.spec \ + ABOUT-NLS + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(exec_prefix)/libdata/pkgconfig + pkgconfig_DATA = opendbx.pc + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive --- opendbx-1.2.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: