Date: Fri, 2 Sep 2005 15:40:31 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: delphij@FreeBSD.org Subject: ports/85661: Update port: databases/libdbi-drivers to 0.8.0 Message-ID: <200509021840.j82IeVSn005995@marcus.grupos.com.br> Resent-Message-ID: <200509021850.j82IoIPW062396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85661
>Category: ports
>Synopsis: Update port: databases/libdbi-drivers to 0.8.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 02 18:50:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 6.0-BETA3 i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-BETA3 FreeBSD 6.0-BETA3 #34: Fri Sep 2 11:10:54 BRT 2005 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386
>Description:
- Update to 0.8.0
- Add SQLite3 and Firebird support
>How-To-Repeat:
>Fix:
--- libdbi-drivers.patch begins here ---
diff -ruN libdbi-drivers.orig/Makefile libdbi-drivers/Makefile
--- libdbi-drivers.orig/Makefile Sun Jan 30 22:35:41 2005
+++ libdbi-drivers/Makefile Fri Sep 2 15:32:07 2005
@@ -7,8 +7,8 @@
#
PORTNAME= libdbi-drivers
-PORTVERSION= 0.7.1
-PORTREVISION= 2
+PORTVERSION= 0.8.0
+PORTREVISION= 0
CATEGORIES= databases devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -25,14 +25,17 @@
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-OPTIONS= MYSQL "With MySQL Driver" on \
- MSQL "With MSQL Driver" off \
- PGSQL "With PostgreSQL Driver" on \
- SQLITE "With SQLite Driver" on
+OPTIONS= MYSQL "With MySQL Driver" on \
+ MSQL "With MSQL Driver" off \
+ PGSQL "With PostgreSQL Driver" on \
+ SQLITE3 "With SQLite 3 Driver" on \
+ SQLITE2 "With SQLite 2 Driver" off \
+ FIREBIRD "With Firebird Driver" off
.include <bsd.port.pre.mk>
-.if defined(WITHOUT_MYSQL) && defined(WITHOUT_PGSQL) && defined(WITHOUT_SQLITE) && defined(WITHOUT_MSQL)
+.if defined(WITHOUT_MYSQL) && defined(WITHOUT_MSQL) && defined(WITHOUT_PGSQL) \
+ && defined(WITHOUT_SQLITE2) && defined(WITHOUT_SQLITE3) && defined(WITHOUT_FIREBIRD)
IGNORE= You must choose at least one driver
.endif
@@ -44,6 +47,14 @@
PLIST_SUB+= MYSQL="@comment "
.endif
+.if defined(WITH_MSQL)
+LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql
+CONFIGURE_ARGS+= --with-msql
+PLIST_SUB+= MSQL=""
+.else
+PLIST_SUB+= MSQL="@comment "
+.endif
+
.if defined(WITH_PGSQL)
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-pgsql
@@ -52,23 +63,31 @@
PLIST_SUB+= PGSQL="@comment "
.endif
-.if defined(WITH_SQLITE)
+.if defined(WITH_SQLITE2)
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
CONFIGURE_ARGS+= --with-sqlite
-PLIST_SUB+= SQLITE=""
+PLIST_SUB+= SQLITE2=""
.else
-PLIST_SUB+= SQLITE="@comment "
+PLIST_SUB+= SQLITE2="@comment "
.endif
-.if defined(WITH_MSQL)
-LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql
-CONFIGURE_ARGS+= --with-msql
-PLIST_SUB+= MSQL=""
+.if defined(WITH_SQLITE3)
+LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+= --with-sqlite3
+PLIST_SUB+= SQLITE3=""
.else
-PLIST_SUB+= MSQL="@comment "
+PLIST_SUB+= SQLITE3="@comment "
+.endif
+
+.if defined(WITH_FIREBIRD)
+LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird-client
+CONFIGURE_ARGS+= --with-firebird
+PLIST_SUB+= FIREBIRD=""
+.else
+PLIST_SUB+= FIREBIRD="@comment "
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|-O20|$$CFLAGS|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' ${WRKSRC}/configure
.include <bsd.port.post.mk>
diff -ruN libdbi-drivers.orig/distinfo libdbi-drivers/distinfo
--- libdbi-drivers.orig/distinfo Fri Mar 26 11:41:14 2004
+++ libdbi-drivers/distinfo Thu Sep 1 22:44:55 2005
@@ -1,2 +1,2 @@
-MD5 (libdbi-drivers-0.7.1.tar.gz) = f11020119ceb7a6dee3969cb0589d4bc
-SIZE (libdbi-drivers-0.7.1.tar.gz) = 488642
+MD5 (libdbi-drivers-0.8.0.tar.gz) = cac2d09b90d2c58b01425d5e855f5499
+SIZE (libdbi-drivers-0.8.0.tar.gz) = 1115598
diff -ruN libdbi-drivers.orig/pkg-plist libdbi-drivers/pkg-plist
--- libdbi-drivers.orig/pkg-plist Thu Oct 30 02:22:19 2003
+++ libdbi-drivers/pkg-plist Fri Sep 2 15:35:50 2005
@@ -1,6 +1,8 @@
%%MYSQL%%lib/dbd/libmysql.so
%%PGSQL%%lib/dbd/libpgsql.so
-%%SQLITE%%lib/dbd/libsqlite.so
+%%SQLITE2%%lib/dbd/libsqlite.so
+%%SQLITE3%%lib/dbd/libsqlite3.so
+%%FIREBIRD%%lib/dbd/libfirebird.so
@unexec rmdir %D/lib/dbd 2>/dev/null || true
%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c128.html
@@ -22,18 +24,30 @@
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/intro.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite.pdf
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c119.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c32.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c43.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/c98.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/f21.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/index.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x122.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x198.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x46.html
-%%SQLITE%%%%DOCSDIR%%/dbd_sqlite/x60.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c101.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c122.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c35.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c46.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f24.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x125.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x201.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x49.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x63.html
+%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c115.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c26.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c39.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c94.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f15.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x118.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x190.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
+%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
-%%SQLITE%%@dirrm %%DOCSDIR%%/dbd_sqlite
+%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
+%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
--- libdbi-drivers.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?200509021840.j82IeVSn005995>