Date: Wed, 6 Mar 2002 02:12:54 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35567: update port: databases/dbconnect Message-ID: <20020305181254.581AC3E9E80@utopia.leeym.com>
next in thread | raw e-mail | index | archive | help
>Number: 35567
>Category: ports
>Synopsis: update port: databases/dbconnect
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 05 12:20:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 4.5-STABLE FreeBSD 4.5-STABLE #39: Sat Mar 2 15:33:23 CST 2002 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386
>Description:
update dbconnect to 0.2.3
add msql/pgsql/oracle8 support
>How-To-Repeat:
>Fix:
diff -ruN --exclude CVS /usr/ports/databases/dbconnect/Makefile dbconnect/Makefile
--- /usr/ports/databases/dbconnect/Makefile Mon Jul 23 15:51:29 2001
+++ dbconnect/Makefile Wed Mar 6 02:07:41 2002
@@ -7,7 +7,7 @@
#
PORTNAME= dbconnect
-PORTVERSION= 0.2.0
+PORTVERSION= 0.2.3
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,13 +16,51 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
+INSTALLS_SHLIB= yes
-.if defined(WITH_MYSQL)
-LIB_DEPENDS= mysqlclient:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+= --with-mysql=yes --with-mysqldir=${LOCALBASE}
+WITH_MYSQL= yes
+WITH_PGSQL= no
+WITH_PYTHON= no
+WITH_MSQL= no
+WITH_ORACLE8= no
+
+.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no
+LIB_DEPENDS+= mysqlclient:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-mysql=yes --with-mysqlinclude=${LOCALBASE}/include/mysql --with-mysqllib=${LOCALBASE}/lib/mysql
PLIST_SUB+= MYSQL=""
.else
PLIST_SUB+= MYSQL="@comment "
+.endif
+
+.if defined(WITH_PGSQL) && ${WITH_PGSQL:L} != no
+LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+= --with-pgsql=yes --with-pgsqlinclude=${LOCALBASE}/include --with-pgsqllib=${LOCALBASE}/lib
+PLIST_SUB+= PGSQL=""
+.else
+PLIST_SUB+= PGSQL="@comment "
+.endif
+
+.if defined(WITH_PYTHON) && ${WITH_PYTHON:L} != no
+USE_PYTHON= yes
+CONFIGURE_ARGS+= --with-python=yes
+PLIST_SUB+= PYTHON=""
+.else
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.if defined(WITH_MSQL) && ${WITH_MSQL:L} != no
+LIB_DEPENDS+= msql:${PORTSDIR}/databases/msql
+CONFIGURE_ARGS+= --with-msql=yes --with-msqlinclude=${LOCALBASE}/include --with-msqllib=${LOCALBASE}/lib
+PLIST_SUB+= MSQL=""
+.else
+PLIST_SUB+= MSQL="@comment "
+.endif
+
+.if defined(WITH_ORACLE8) && ${WITH_ORACLE8:L} != no
+CONFIGURE_ARGS+= --with-oracle8_0_5=yes --with-oracle8home=/home/oracle
+PLIST_SUB+= ORACLE8=""
+.else
+PLIST_SUB+= ORACLE8="@comment "
.endif
.include <bsd.port.mk>
diff -ruN --exclude CVS /usr/ports/databases/dbconnect/distinfo dbconnect/distinfo
--- /usr/ports/databases/dbconnect/distinfo Mon Jul 23 15:51:29 2001
+++ dbconnect/distinfo Wed Mar 6 01:43:39 2002
@@ -1 +1 @@
-MD5 (dbconnect-0.2.0.tar.gz) = c782a100ae10aeb7de16970986db66c8
+MD5 (dbconnect-0.2.3.tar.gz) = b04069751c013cf9dfca08fd827b5ef2
diff -ruN --exclude CVS /usr/ports/databases/dbconnect/files/patch-Makefile.in dbconnect/files/patch-Makefile.in
--- /usr/ports/databases/dbconnect/files/patch-Makefile.in Thu Jan 1 08:00:00 1970
+++ dbconnect/files/patch-Makefile.in Wed Mar 6 02:04:14 2002
@@ -0,0 +1,42 @@
+--- Makefile.in.orig Wed Oct 3 23:32:24 2001
++++ Makefile.in Wed Mar 6 02:04:12 2002
+@@ -49,12 +49,12 @@
+ (cd ./lib && $(AR) -x libdbconn.a && gcc @SHARED@ -o ../python/dbconnc@SHARED_EXT@ *.o ../python/dbconn_wrap.o $(COMPILE_LIBS) && rm -f *.o) || exit 1; \
+
+ includes:
+- @cp ./base/*.h ./include
++ @$(BSD_INSTALL_DATA) ./base/*.h ./include
+ @for driver in $(DRIVERS); \
+ do \
+- ( cd $$driver && cp *.h ../include ) || exit 1; \
++ ( cd $$driver && $(BSD_INSTALL_DATA) *.h ../include ) || exit 1; \
+ done
+- @cp ./dbconn/*.h ./include
++ @$(BSD_INSTALL_DATA) ./dbconn/*.h ./include
+
+ libs:
+ @echo "Creating Static Library"
+@@ -92,17 +92,17 @@
+ @echo "Installing dbConnect C++ API"
+ @echo "Installing dbConnect include files to @prefix@/include"
+ mkdir -p @prefix@/include
+- cp -f ./include/*.h @prefix@/include/.
++ $(BSD_INSTALL_DATA) ./include/*.h @prefix@/include/.
+ @echo "Installing dbConnect libraries to @prefix@/lib"
+ mkdir -p @prefix@/lib
+- cp -f ./lib/*.a @prefix@/lib/.
+- cp -f ./lib/*.so @prefix@/lib/.
++ $(BSD_INSTALL_DATA) ./lib/*.a @prefix@/lib/.
++ $(BSD_INSTALL_DATA) ./lib/*.so @prefix@/lib/.
+ @if [ "@python@" = "pythonint" ] ; then \
+ echo ""; \
+ echo "Installing PYTHON module"; \
+- cp -f ./python/dbconn.py @pythonsitedir@/.; \
+- cp -f ./python/dbconnAPI20.py @pythonsitedir@/.; \
+- cp -f ./python/dbconnc.so @pythonsitedir@/.; \
++ $(BSD_INSTALL_DATA) ./python/dbconn.py @pythonsitedir@/.; \
++ $(BSD_INSTALL_DATA) ./python/dbconnAPI20.py @pythonsitedir@/.; \
++ $(BSD_INSTALL_DATA) ./python/dbconnc.so @pythonsitedir@/.; \
+ fi
+
+ @echo ""
diff -ruN --exclude CVS /usr/ports/databases/dbconnect/files/patch-configure dbconnect/files/patch-configure
--- /usr/ports/databases/dbconnect/files/patch-configure Thu Jan 1 08:00:00 1970
+++ dbconnect/files/patch-configure Wed Mar 6 02:04:16 2002
@@ -0,0 +1,10 @@
+--- configure.orig Wed Sep 19 23:23:14 2001
++++ configure Wed Mar 6 02:03:18 2002
+@@ -634,7 +634,6 @@
+
+
+
+-prefix="/usr/local/dbconnect"
+
+
+
diff -ruN --exclude CVS /usr/ports/databases/dbconnect/pkg-plist dbconnect/pkg-plist
--- /usr/ports/databases/dbconnect/pkg-plist Mon Jul 23 15:51:29 2001
+++ dbconnect/pkg-plist Wed Mar 6 01:57:50 2002
@@ -3,6 +3,6 @@
lib/libdbconn.a
lib/libdyndbconn.so
%%MYSQL%%include/dbconnect_MYSQL.h
-%%MYSQL%%include/mysql.h
-%%MYSQL%%include/mysql_com.h
-%%MYSQL%%include/mysql_version.h
+%%PGSQL%%include/dbconnect_PGSQL.h
+%%MSQL%%include/dbconnect_MSQL.h
+%%ORACLE8%%include/dbconnect_ORACLE8.h
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020305181254.581AC3E9E80>