Date: Wed, 26 Mar 2003 16:53:02 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/50315: [Maintainer Patch] Port: MySQL 4 (Switch to DBD::MySQL) Message-ID: <200303261553.h2QFr2HN065792@vaio.alexdupre.com>
next in thread | raw e-mail | index | archive | help
>Number: 50315
>Category: ports
>Synopsis: [Maintainer Patch] Port: MySQL 4 (Switch to DBD::MySQL)
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 26 08:00:26 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Switch from p5-Mysql to p5-DBD-mysql.
Move USE_PERL5_RUN into server part.
Add MySQL 4 support (and set it as default) to p5-DBD-mysql.
>How-To-Repeat:
>Fix:
--- mysql40.diff begins here ---
diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
--- mysql40-server.orig/Makefile Wed Mar 26 15:25:15 2003
+++ mysql40-server/Makefile Wed Mar 26 15:37:55 2003
@@ -29,7 +29,6 @@
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -93,8 +92,10 @@
# MySQL-Server part
.if !defined(CLIENT_ONLY)
+USE_PERL5_RUN= yes
+
RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
diff -ruN p5-DBD-mysql.orig/Makefile p5-DBD-mysql/Makefile
--- p5-DBD-mysql.orig/Makefile Wed Mar 26 15:25:38 2003
+++ p5-DBD-mysql/Makefile Wed Mar 26 16:41:40 2003
@@ -16,11 +16,18 @@
COMMENT= MySQL driver for the Perl5 Database Interface (DBI)
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
RUN_DEPENDS= ${BUILD_DEPENDS}
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
+LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.else
+LIB_DEPENDS= mysqlclient.12:${PORTSDIR}/databases/mysql40-client
+.endif
+
PERL_CONFIGURE= yes
MAN3= Bundle::DBD::mysql.3 DBD::mysql.3 DBD::mysql::INSTALL.3 Mysql.3
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- mysql40.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303261553.h2QFr2HN065792>