From 8ab90c08a841bde6b277b359cb2dcadc98e83c79 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Thu, 12 Jun 2003 20:21:09 +0000 Subject: * Update to 0.12.1 [1] * Add support for for database options in libgda2 [2] Submitted by: netchild [1] (based on) netchild [2] --- databases/libgda2/Makefile | 186 ++++++++++++++++++++++++++++---- databases/libgda2/distinfo | 2 +- databases/libgda2/files/patch-ltmain.sh | 21 ++-- databases/libgda2/pkg-plist | 12 ++- databases/libgda3/Makefile | 186 ++++++++++++++++++++++++++++---- databases/libgda3/distinfo | 2 +- databases/libgda3/files/patch-ltmain.sh | 21 ++-- databases/libgda3/pkg-plist | 12 ++- databases/libgnomedb/Makefile | 2 +- databases/libgnomedb/distinfo | 2 +- databases/libgnomedb/pkg-plist | 5 +- databases/mergeant/Makefile | 2 +- databases/mergeant/distinfo | 2 +- 13 files changed, 394 insertions(+), 61 deletions(-) (limited to 'databases') diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 7322953ce5af..ad9363b32791 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -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 @@ -27,50 +27,200 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-odbc # iODBC support seems broken CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" 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_MYSQL3) && defined(WITH_MYSQL3) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -PLIST_SUB= MYSQL="" -.else +PLIST_SUB= MYSQL:="" +.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 +PLIST_SUB+= 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 -PLIST_SUB+= POSTGRES="@comment " .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="" +PLIST_SUB+= LDAP:="" .else CONFIGURE_ARGS+= --without-ldap -PLIST_SUB+= LDAP="@comment " +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_MYSQL40) + @${ECHO_MSG} "You can enable support for MySQL 4.0 databases by defining WITH_MYSQL40." .endif -.if !defined(WITH_POSTGRES) - @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES." +.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 -.include +.include diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo index 8b3718c56376..6336f087aa19 100644 --- a/databases/libgda2/distinfo +++ b/databases/libgda2/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgda-0.12.0.tar.bz2) = 445b26d782468c11f5cf3a972a710e42 +MD5 (gnome2/libgda-0.12.1.tar.bz2) = d98597ca9746d36db8e455ce7de48ac0 diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh index 1c2fba5d533f..7e58857add5a 100644 --- a/databases/libgda2/files/patch-ltmain.sh +++ b/databases/libgda2/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Sun Jun 8 14:16:41 2003 ++++ ltmain.sh Thu Jun 12 15:52:33 2003 +@@ -1072,7 +1072,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1082,8 +1082,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2498,6 +2506,9 @@ + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) @@ -27,7 +36,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ +@@ -4325,10 +4336,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index 79b708c75a8c..7621ee4fea41 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -74,9 +74,15 @@ lib/libgdasql.a lib/libgdasql.so lib/libgdasql.so.0 lib/libgda/providers/libgda-default.so -%%LDAP%%lib/libgda/providers/libgda-ldap.so -%%MYSQL%%lib/libgda/providers/libgda-mysql.so -%%POSTGRES%%lib/libgda/providers/libgda-postgres.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 diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 7322953ce5af..ad9363b32791 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -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 @@ -27,50 +27,200 @@ USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-odbc # iODBC support seems broken CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" 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_MYSQL3) && defined(WITH_MYSQL3) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -PLIST_SUB= MYSQL="" -.else +PLIST_SUB= MYSQL:="" +.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 +PLIST_SUB+= 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 -PLIST_SUB+= POSTGRES="@comment " .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="" +PLIST_SUB+= LDAP:="" .else CONFIGURE_ARGS+= --without-ldap -PLIST_SUB+= LDAP="@comment " +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_MYSQL40) + @${ECHO_MSG} "You can enable support for MySQL 4.0 databases by defining WITH_MYSQL40." .endif -.if !defined(WITH_POSTGRES) - @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES." +.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 -.include +.include diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo index 8b3718c56376..6336f087aa19 100644 --- a/databases/libgda3/distinfo +++ b/databases/libgda3/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgda-0.12.0.tar.bz2) = 445b26d782468c11f5cf3a972a710e42 +MD5 (gnome2/libgda-0.12.1.tar.bz2) = d98597ca9746d36db8e455ce7de48ac0 diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh index 1c2fba5d533f..7e58857add5a 100644 --- a/databases/libgda3/files/patch-ltmain.sh +++ b/databases/libgda3/files/patch-ltmain.sh @@ -1,6 +1,15 @@ ---- ltmain.sh.orig Fri Sep 13 15:38:11 2002 -+++ ltmain.sh Fri Oct 11 01:44:24 2002 -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Sun Jun 8 14:16:41 2003 ++++ ltmain.sh Thu Jun 12 15:52:33 2003 +@@ -1072,7 +1072,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1082,8 +1082,16 @@ continue ;; @@ -17,8 +26,8 @@ continue ;; -@@ -2502,6 +2510,9 @@ - *-*-openbsd*) +@@ -2498,6 +2506,9 @@ + *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) @@ -27,7 +36,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test $build_libtool_need_lc = "yes"; then -@@ -4286,10 +4297,12 @@ +@@ -4325,10 +4336,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist index 79b708c75a8c..7621ee4fea41 100644 --- a/databases/libgda3/pkg-plist +++ b/databases/libgda3/pkg-plist @@ -74,9 +74,15 @@ lib/libgdasql.a lib/libgdasql.so lib/libgdasql.so.0 lib/libgda/providers/libgda-default.so -%%LDAP%%lib/libgda/providers/libgda-ldap.so -%%MYSQL%%lib/libgda/providers/libgda-mysql.so -%%POSTGRES%%lib/libgda/providers/libgda-postgres.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 diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index f639f35818d4..e86820e1e228 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -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 diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index 02744428221c..193e8575caff 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomedb-0.12.0.tar.bz2) = 152461ff1fdc78cac3151dafbe20c830 +MD5 (gnome2/libgnomedb-0.12.1.tar.bz2) = 78816530d0740016dd1b98effb56c811 diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist index b67c30fbb72c..fa8b481cfeae 100644 --- a/databases/libgnomedb/pkg-plist +++ b/databases/libgnomedb/pkg-plist @@ -38,9 +38,10 @@ include/libgnomedb/gnome-db-window.h include/libgnomedb/libgnomedb.h lib/bonobo/monikers/libmoniker_database.so lib/gnome-vfs-2.0/modules/libdatabase.so +lib/libglade/2.0/libgnomedb.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 @@ -152,6 +153,8 @@ share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo share/locale/ru/LC_MESSAGES/libgnomedb-2.mo share/locale/sk/LC_MESSAGES/libgnomedb-2.mo share/locale/sl/LC_MESSAGES/libgnomedb-2.mo +share/locale/sr/LC_MESSAGES/libgnomedb-2.mo +share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo share/locale/sv/LC_MESSAGES/libgnomedb-2.mo share/locale/ta/LC_MESSAGES/libgnomedb-2.mo share/locale/tr/LC_MESSAGES/libgnomedb-2.mo diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 3b12b1e7b345..4cc29a5b9bbe 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -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 diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index 0cccbb998664..188ebf6b9cb0 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1 +1 @@ -MD5 (gnome2/mergeant-0.12.0.tar.bz2) = 93bb562a010c2fbab600bed9626f7e15 +MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca -- cgit v1.2.3