Date: Mon, 7 Oct 2002 12:33:28 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/43782: Update port: databases/libdbi to 0.6.5 Message-ID: <200210071933.g97JXS6E080911@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 43782
>Category: ports
>Synopsis: Update port: databases/libdbi to 0.6.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 07 12:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.5
New file:
files/patch-Makefile.in
files/patch-configure
Remove file:
files/patch-include::dbi::dbi.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/databases/libdbi/Makefile databases/libdbi/Makefile
--- /usr/ports/databases/libdbi/Makefile Sun Nov 4 15:20:38 2001
+++ databases/libdbi/Makefile Sat Oct 5 21:23:13 2002
@@ -7,7 +7,7 @@
#
PORTNAME= libdbi
-PORTVERSION= 0.6.2
+PORTVERSION= 0.6.5
CATEGORIES= databases devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://linux.ucla.edu/~dap24/%SUBDIR%/
@@ -16,27 +16,37 @@
MAINTAINER= ports@FreeBSD.org
USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-PLIST_SUB= VERSION=${PORTVERSION}
+
+.if defined(WITH_MYSQL)
+LIB_DEPENDS+= mysqlclient:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-mysql \
+ --with-mysql-incdir=${LOCALBASE}/include \
+ --with-mysql-libdir=${LOCALBASE}/lib/mysql
+PLIST_SUB+= MYSQL=""
+.else
+PLIST_SUB+= MYSQL="@comment "
+.endif
.if defined(WITH_PGSQL)
LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7
CONFIGURE_ARGS+= --with-pgsql
-PLIST_SUB+= WITH_PQ=""
+PLIST_SUB+= PGSQL=""
.else
-PLIST_SUB+= WITH_PQ="@comment "
+PLIST_SUB+= PGSQL="@comment "
.endif
-.if defined(WITH_MYSQL)
-LIB_DEPENDS+= mysqlclient:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+= \
- --with-mysql \
- --with-mysql-incdir=${LOCALBASE}/include \
- --with-mysql-libdir=${LOCALBASE}/lib/mysql
-PLIST_SUB+= WITH_MY=""
-.else
-PLIST_SUB+= WITH_MY="@comment "
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf \
+ ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}/driver-guide
+ ${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html \
+ ${DOCSDIR}/driver-guide
+ @${MKDIR} ${DOCSDIR}/programmers-guide
+ ${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html \
+ ${DOCSDIR}/programmers-guide
.endif
.include <bsd.port.mk>
diff -urN /usr/ports/databases/libdbi/distinfo databases/libdbi/distinfo
--- /usr/ports/databases/libdbi/distinfo Sun Nov 4 15:20:38 2001
+++ databases/libdbi/distinfo Sat Oct 5 19:35:21 2002
@@ -1 +1 @@
-MD5 (libdbi-0.6.2.tar.gz) = 02a6814abba70405557f3b802567e9aa
+MD5 (libdbi-0.6.5.tar.gz) = d3f8c027a161f71a9891e2cbb55b78e9
diff -urN /usr/ports/databases/libdbi/files/patch-Makefile.in databases/libdbi/files/patch-Makefile.in
--- /usr/ports/databases/libdbi/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
+++ databases/libdbi/files/patch-Makefile.in Sat Oct 5 21:18:24 2002
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Sat Jun 15 09:45:17 2002
++++ Makefile.in Sat Oct 5 21:18:07 2002
+@@ -92,7 +92,7 @@
+
+ AUTOMAKE_OPTIONS = foreign dist-zip
+
+-SUBDIRS = src include doc drivers tests
++SUBDIRS = src include drivers tests
+
+
+ #m4datadir = $(datadir)/aclocal
diff -urN /usr/ports/databases/libdbi/files/patch-configure databases/libdbi/files/patch-configure
--- /usr/ports/databases/libdbi/files/patch-configure Thu Jan 1 09:00:00 1970
+++ databases/libdbi/files/patch-configure Sat Oct 5 21:05:50 2002
@@ -0,0 +1,10 @@
+--- configure.orig Sat Jun 15 09:45:18 2002
++++ configure Sat Oct 5 21:05:30 2002
+@@ -5551,6 +5551,7 @@
+
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff -urN /usr/ports/databases/libdbi/files/patch-include::dbi::dbi.h databases/libdbi/files/patch-include::dbi::dbi.h
--- /usr/ports/databases/libdbi/files/patch-include::dbi::dbi.h Sun Nov 4 15:20:39 2001
+++ databases/libdbi/files/patch-include::dbi::dbi.h Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- include/dbi/dbi.h.orig Sun Nov 4 11:48:26 2001
-+++ include/dbi/dbi.h Sun Nov 4 11:48:37 2001
-@@ -29,6 +29,7 @@
-
- #include <stdlib.h>
- #include <stdarg.h>
-+#include <time.h>
-
- /* opaque type definitions */
- typedef void * dbi_plugin;
diff -urN /usr/ports/databases/libdbi/pkg-plist databases/libdbi/pkg-plist
--- /usr/ports/databases/libdbi/pkg-plist Sun Nov 4 15:20:38 2001
+++ databases/libdbi/pkg-plist Sat Oct 5 21:17:12 2002
@@ -4,39 +4,38 @@
lib/libdbi.a
lib/libdbi.so
lib/libdbi.so.0
-%%WITH_PQ%%lib/dbd/libpgsql.so
-%%WITH_MY%%lib/dbd/libmysql.so
-share/doc/libdbi-0.6.2/plugin-guide/contact.html
-share/doc/libdbi-0.6.2/plugin-guide/copying-fdl.html
-share/doc/libdbi-0.6.2/plugin-guide/description.html
-share/doc/libdbi-0.6.2/plugin-guide/gnugpl.html
-share/doc/libdbi-0.6.2/plugin-guide/helperfuncs.html
-share/doc/libdbi-0.6.2/plugin-guide/index.html
-share/doc/libdbi-0.6.2/plugin-guide/intro.html
-share/doc/libdbi-0.6.2/plugin-guide/pluginfuncs-dbquery.html
-share/doc/libdbi-0.6.2/plugin-guide/pluginfuncs-infrastructure.html
-share/doc/libdbi-0.6.2/plugin-guide/pluginfuncs.html
-share/doc/libdbi-0.6.2/plugin-guide/terminology.html
-share/doc/libdbi-0.6.2/plugin-guide.pdf
-share/doc/libdbi-0.6.2/programmers-guide/contact.html
-share/doc/libdbi-0.6.2/programmers-guide/copying-fdl.html
-share/doc/libdbi-0.6.2/programmers-guide/description.html
-share/doc/libdbi-0.6.2/programmers-guide/gnugpl.html
-share/doc/libdbi-0.6.2/programmers-guide/index.html
-share/doc/libdbi-0.6.2/programmers-guide/intro.html
-share/doc/libdbi-0.6.2/programmers-guide/quickstart-code.html
-share/doc/libdbi-0.6.2/programmers-guide/quickstart-debriefing.html
-share/doc/libdbi-0.6.2/programmers-guide/quickstart.html
-share/doc/libdbi-0.6.2/programmers-guide/reference-core.html
-share/doc/libdbi-0.6.2/programmers-guide/reference-database.html
-share/doc/libdbi-0.6.2/programmers-guide/reference-driver.html
-share/doc/libdbi-0.6.2/programmers-guide/reference-field.html
-share/doc/libdbi-0.6.2/programmers-guide/reference-plugin.html
-share/doc/libdbi-0.6.2/programmers-guide/reference.html
-share/doc/libdbi-0.6.2/programmers-guide/terminology.html
-share/doc/libdbi-0.6.2/programmers-guide.pdf
+%%MYSQL%%lib/dbd/libmysql.so
+%%PGSQL%%lib/dbd/libpgsql.so
+%%PORTDOCS%%share/doc/libdbi/driver-guide.pdf
+%%PORTDOCS%%share/doc/libdbi/driver-guide/contact.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/copying-fdl.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/description.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs-dbquery.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs-infrastructure.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/driverfuncs.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/gnugpl.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/helperfuncs.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/index.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/intro.html
+%%PORTDOCS%%share/doc/libdbi/driver-guide/terminology.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide.pdf
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/contact.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/copying-fdl.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/description.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/gnugpl.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/index.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/intro.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart-code.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart-debriefing.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/quickstart.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-conn.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-core.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-database.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-driver.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference-field.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/reference.html
+%%PORTDOCS%%share/doc/libdbi/programmers-guide/terminology.html
+%%PORTDOCS%%@dirrm share/doc/libdbi/programmers-guide
+%%PORTDOCS%%@dirrm share/doc/libdbi/driver-guide
+%%PORTDOCS%%@dirrm share/doc/libdbi
@dirrm include/dbi
-@dirrm lib/dbd
-@dirrm share/doc/libdbi-%%VERSION%%/plugin-guide
-@dirrm share/doc/libdbi-%%VERSION%%/programmers-guide
-@dirrm share/doc/libdbi-%%VERSION%%
>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?200210071933.g97JXS6E080911>