From owner-freebsd-gnome@FreeBSD.ORG Tue Jun 10 07:35:48 2003 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6073B37B401; Tue, 10 Jun 2003 07:35:48 -0700 (PDT) Received: from mailout08.sul.t-online.com (mailout08.sul.t-online.com [194.25.134.20]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEA4243F75; Tue, 10 Jun 2003 07:35:42 -0700 (PDT) (envelope-from Alexander@Leidinger.net) Received: from fwd00.aul.t-online.de by mailout08.sul.t-online.com with smtp id 19PkDr-0005Ia-05; Tue, 10 Jun 2003 16:35:39 +0200 Received: from Andro-Beta.Leidinger.net (SUrEX-ZrQetc25C9nEqinlbZRAMFLC4mPw0Bsow59Cax8IAGH3MHgr@[80.131.127.146]) by fmrl00.sul.t-online.com with esmtp id 19PkDj-0DEGtE0; Tue, 10 Jun 2003 16:35:31 +0200 Received: from Magelan.Leidinger.net (Magelan [192.168.1.1]) h5AEZUoM059425; Tue, 10 Jun 2003 16:35:30 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from Magelan.Leidinger.net (netchild@localhost [127.0.0.1]) by Magelan.Leidinger.net (8.12.9/8.12.9) with SMTP id h5AEZToF063916; Tue, 10 Jun 2003 16:35:29 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Date: Tue, 10 Jun 2003 16:35:29 +0200 From: Alexander Leidinger To: Joe Marcus Clarke Message-Id: <20030610163529.33565513.Alexander@Leidinger.net> In-Reply-To: <20030609110218.D30408@shumai.marcuscom.com> References: <20030608205841.7f5a4f2b.Alexander@Leidinger.net> <20030608175012.Y5841@shumai.marcuscom.com> <20030609083831.2edb7559.Alexander@Leidinger.net> <20030609110218.D30408@shumai.marcuscom.com> X-Mailer: Sylpheed version 0.8.10claws (GTK+ 1.2.10; i386-portbld-freebsd5.0) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00" X-Seen: false X-ID: SUrEX-ZrQetc25C9nEqinlbZRAMFLC4mPw0Bsow59Cax8IAGH3MHgr@t-dialin.net cc: gnome@freebsd.org Subject: Re: libgda2 autodetecting already installed DBSs (patch) X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2003 14:35:48 -0000 This is a multi-part message in MIME format. --Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 9 Jun 2003 11:02:53 -0400 (EDT) Joe Marcus Clarke wrote: > > > This looks nice, Alexander. I'll commit it when I get back from vacation. > > > > Committing it myself isn't an option? > > It would be, but the gnome-db people just release 0.12.1 of everything, > and I want to get everything in one fell swoop. Patch attached. The plist isn't really checked, I only corrected the libgnomedb major version (it's an entry in the announcement, so I looked at it). Bye, Alexander. -- Weird enough for government work. http://www.Leidinger.net Alexander @ Leidinger.net GPG fingerprint = C518 BC70 E67F 143F BE91 3365 79E2 9C60 B006 3FE7 --Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00 Content-Type: text/plain; name="libgnomedb.diff" Content-Disposition: attachment; filename="libgnomedb.diff" Content-Transfer-Encoding: 8bit Index: Makefile =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgnomedb/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 1 Jun 2003 00:33:20 -0000 1.15 +++ Makefile 10 Jun 2003 14:10:35 -0000 @@ -6,7 +6,7 @@ # PORTNAME= libgnomedb -PORTVERSION= 0.12.0 +PORTVERSION= 0.12.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/libgnomedb/0.12 Index: distinfo =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgnomedb/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 1 Jun 2003 00:33:20 -0000 1.8 +++ distinfo 10 Jun 2003 14:10:56 -0000 @@ -1 +1 @@ -MD5 (gnome2/libgnomedb-0.12.0.tar.bz2) = 152461ff1fdc78cac3151dafbe20c830 +MD5 (gnome2/libgnomedb-0.12.1.tar.bz2) = 78816530d0740016dd1b98effb56c811 Index: pkg-plist =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgnomedb/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- pkg-plist 2 Jun 2003 18:18:02 -0000 1.10 +++ pkg-plist 10 Jun 2003 14:19:38 -0000 @@ -40,7 +40,7 @@ lib/gnome-vfs-2.0/modules/libdatabase.so lib/libgnomedb-2.a lib/libgnomedb-2.so -lib/libgnomedb-2.so.2 +lib/libgnomedb-2.so.3 libdata/pkgconfig/libgnomedb.pc libdata/bonobo/servers/GNOME_Database_Components.server libdata/bonobo/servers/GNOME_Database_Monikers.server --Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00 Content-Type: text/plain; name="libgda2.diff" Content-Disposition: attachment; filename="libgda2.diff" Content-Transfer-Encoding: 8bit Index: Makefile =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgda2/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- Makefile 1 Jun 2003 00:31:46 -0000 1.40 +++ Makefile 10 Jun 2003 14:02:25 -0000 @@ -6,7 +6,7 @@ # PORTNAME= libgda2 -PORTVERSION= 0.12.0 +PORTVERSION= 0.12.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.12 @@ -34,26 +34,99 @@ MAN1= gda-config-tool.1 MAN5= gda-config.5 -.if defined(WITH_MYSQL) +.include + +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) +WITH_MYSQL3= yes +.endif + +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.12) +WITH_MYSQL40= yes +.endif + +.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +WITH_MYSQL41= yes +.endif + +.if exists(${LOCALBASE}/lib/libpq.so.3) +WITH_POSTGRES7= yes +.endif + +.if exists(${LOCALBASE}/lib/libpgeasy.so.2) +WITH_POSTGRES72=yes +.endif + +.if exists(${LOCALBASE}/lib/libldap.so.2) +WITH_LDAP=yes +.endif + +.if exists(${LOCALBASE}/firebird/lib/libgds.so.1) +WITH_FIREBIRD= yes +.endif + +.if exists(${LOCALBASE}/lib/libtds.so.2) +WITH_FREETDS= yes +.endif + +.if exists(${LOCALBASE}/lib/libsybdb.so.3) +WITH_SYBASE= yes +.endif + +.if exists(${LOCALBASE}/lib/libmdbsql.so.0) +WITH_MDB= yes +.endif + +.if exists(${LOCALBASE}/lib/libODBC.so.1) +WITH_ODBC= yes +.endif + +.if exists(${LOCALBASE}/lib/libsqlite.so.2) +WITH_SQLITE= yes +.endif + +.if !defined(WITHOUT_MYe.so.2) +WITH_SQLITE= yes ) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB= MYSQL="" -.else +.endif + +.if !defined(WITHOUT_MYSQL40) && defined(WITH_MYSQL40) +LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client +CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} +PLIST_SUB= MYSQL="" +.endif + +.if !defined(WITHOUT_MYSQL41) && defined(WITH_MYSQL41) +LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client +CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} +PLIST_SUB= MYSQL="" +.endif + +.if !defined(WITH_MYSQL3) && !defined(WITH_MYSQL40) && !defined(WITH_MYSQL41) +PLIST_SUB+= MYSQL="@comment " CONFIGURE_ARGS+= --without-mysql -PLIST_SUB= MYSQL="@comment " .endif -.if defined(WITH_POSTGRES) +.if !defined(WITHOUT_POSTGRES7) && defined(WITH_POSTGRES7) POSTGRESQL_PORT?= databases/postgresql7 LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} PLIST_SUB+= POSTGRES="" -.else -CONFIGURE_ARGS+= --without-postgres +.endif + +.if !defined(WITHOUT_POSTGRES72) && defined(WITH_POSTGRES72) +POSTGRESQL_PORT?= databases/postgresql72 +LIB_DEPENDS+= pqeasy.2:${PORTSDIR}/${POSTGRESQL_PORT} +CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} +PLIST_SUB+= POSTGRES="" +.endif + +.if !defined(WITH_POSTGRES7) && !defined(WITH_POSTGRES72) PLIST_SUB+= POSTGRES="@comment " +CONFIGURE_ARGS+= --without-postgres .endif -.if defined(WITH_LDAP) +.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP) LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} PLIST_SUB+= LDAP="" @@ -62,19 +135,98 @@ PLIST_SUB+= LDAP="@comment " .endif +.if !defined(WITHOUT_FIREBIRD) && defined(WITH_FIREBIRD) +LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird +CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird +PLIST_SUB+= FIREBIRD:="" +.else +CONFIGURE_ARGS+= --without-interbase +PLIST_SUB+= FIREBIRD:="@comment " +.endif + +.if !defined(WITHOUT_FREETDS) && defined(WITH_FREETDS) +LIB_DEPENDS+= tds.2:${PORTSDIR}/databases/freetds +CONFIGURE_ARGS+= --with-tds=${LOCALBASE} +PLIST_SUB+= FREETDS:="" +.else +CONFIGURE_ARGS+= --without-tds +PLIST_SUB+= FREETDS:="@comment " +.endif + +.if !defined(WITHOUT_SYBASE) && defined(WITH_SYBASE) +LIB_DEPENDS+= sybdb.3:${PORTSDIR}/databases/freetds +CONFIGURE_ARGS+= --with-sybase=${LOCALBASE} +PLIST_SUB+= SYBASE:="" +.else +CONFIGURE_ARGS+= --without-sybase +PLIST_SUB+= SYBASE:="@comment " +.endif + +.if !defined(WITHOUT_MDB) && defined(WITH_MDB) +LIB_DEPENDS+= mdbsql.0:${PORTSDIR}/databases/mdbtools +CONFIGURE_ARGS+= --with-mdb=${LOCALBASE} +PLIST_SUB+= MDB:="" +.else +CONFIGURE_ARGS+= --without-mdb +PLIST_SUB+= MDB:="@comment " +.endif + +.if !defined(WITHOUT_ODBC) && defined(WITH_ODBC) +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-odbc=${LOCALBASE} +PLIST_SUB+= ODBC:="" +.else +CONFIGURE_ARGS+= --without-odbc +PLIST_SUB+= ODBC:="@comment " +.endif + +.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} +PLIST_SUB+= SQLITE:="" +.else +CONFIGURE_ARGS+= --without-sqlite +PLIST_SUB+= SQLITE:="@comment " +.endif + pre-everything:: -.if !defined(WITH_MYSQL) - @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." +.if !defined(WITH_MYSQL3) + @${ECHO_MSG} "You can enable support for MySQL 3 databases by defining WITH_MYSQL3." .endif -.if !defined(WITH_POSTGRES) - @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES." +.if !defined(WITH_MYSQL40) + @${ECHO_MSG} "You can enable support for MySQL 4.0 databases by defining WITH_MYSQL40." +.endif +.if !defined(WITH_MYSQL41) + @${ECHO_MSG} "You can enable support for MySQL 4.1 databases by defining WITH_MYSQL41." +.endif +.if !defined(WITH_POSTGRES7) + @${ECHO_MSG} "You can enable support for Postgres 7.0 databases by defining WITH_POSTGRES7." +.endif +.if !defined(WITH_POSTGRES72) + @${ECHO_MSG} "You can enable support for Postgres 7.2 databases by defining WITH_POSTGRES72." .endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif +.if !defined(WITH_FREETDS) + @${ECHO_MSG} "You can enable support for TDS databases by defining WITH_FREETDS." +.endif +.if !defined(WITH_SYBASE) + @${ECHO_MSG} "You can enable support for Sybase databases by defining WITH_SYBASE." +.endif +.if !defined(WITH_MDB) + @${ECHO_MSG} "You can enable support for MDB databases by defining WITH_MDB." +.endif +.if !defined(WITH_ODBC) + @${ECHO_MSG} "You can enable support for ODBC databases by defining WITH_ODBC." +.endif +.if !defined(WITH_SQLITE) + @${ECHO_MSG} "You can enable support for SQLITE databases by defining WITH_SQLITE." +.endif + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure -.include +.include Index: distinfo =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgda2/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 1 Jun 2003 00:31:46 -0000 1.20 +++ distinfo 10 Jun 2003 14:02:57 -0000 @@ -1 +1 @@ -MD5 (gnome2/libgda-0.12.0.tar.bz2) = 445b26d782468c11f5cf3a972a710e42 +MD5 (gnome2/libgda-0.12.1.tar.bz2) = d98597ca9746d36db8e455ce7de48ac0 Index: pkg-plist =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/libgda2/pkg-plist,v retrieving revision 1.23 diff -u -r1.23 pkg-plist --- pkg-plist 2 Jun 2003 18:18:02 -0000 1.23 +++ pkg-plist 9 Jun 2003 07:45:58 -0000 @@ -74,9 +74,15 @@ lib/libgdasql.so lib/libgdasql.so.0 lib/libgda/providers/libgda-default.so +%%FIREBIRD%%lib/libgda/providers/libgda-firebird.so +%%FREETDS%%lib/libgda/providers/libgda-freetds.so %%LDAP%%lib/libgda/providers/libgda-ldap.so +%%MDB%%lib/libgda/providers/libgda-mdb.so %%MYSQL%%lib/libgda/providers/libgda-mysql.so +%%ODBC%%lib/libgda/providers/libgda-odbc.so %%POSTGRES%%lib/libgda/providers/libgda-postgres.so +%%SYBASE%%lib/libgda/providers/libgda-sybase.so +%%SQLITE%%lib/libgda/providers/libgda-sqlite.so libdata/pkgconfig/libgda.pc share/doc/libgda/architecture.html share/doc/libgda/c689.html --Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00 Content-Type: text/plain; name="mergeant.diff" Content-Disposition: attachment; filename="mergeant.diff" Content-Transfer-Encoding: 8bit Index: Makefile =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/mergeant/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 1 Jun 2003 00:34:12 -0000 1.11 +++ Makefile 10 Jun 2003 14:21:08 -0000 @@ -6,7 +6,7 @@ # PORTNAME= mergeant -PORTVERSION= 0.12.0 +PORTVERSION= 0.12.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12 Index: distinfo =================================================================== RCS file: /big/FreeBSD-CVS/ports/databases/mergeant/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 1 Jun 2003 00:34:12 -0000 1.6 +++ distinfo 10 Jun 2003 14:21:40 -0000 @@ -1 +1 @@ -MD5 (gnome2/mergeant-0.12.0.tar.bz2) = 93bb562a010c2fbab600bed9626f7e15 +MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca --Multipart_Tue__10_Jun_2003_16:35:29_+0200_08f0da00--