aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2003-04-04 05:21:36 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2003-04-04 05:21:36 +0000
commit03be952534daaebc3c54aec61545ba74565875b8 (patch)
tree13e8504c355a06eddc2a8779a9fca5536f7caf2f
parent223de694757245d4408562b85d7840a14fb938ac (diff)
downloadports-03be952534daaebc3c54aec61545ba74565875b8.tar.gz
ports-03be952534daaebc3c54aec61545ba74565875b8.zip
o Move USE_PERL5_RUN into server part.
o Switch from p5-Mysql to p5-DBD-mysql. o Add MySQL 4 support (and set it as default) to p5-DBD-mysql. o Bump PORTREVISION accordingly. PR: ports/50315 Submitted by: Alex Dupre <sysadmin@alexdupre.com> (mysql40 maintainer) Approved by: skv (p5-DBD-myql maintainer)
Notes
Notes: svn path=/head/; revision=78088
Diffstat
-rw-r--r--databases/mysql40-client/Makefile2
-rw-r--r--databases/mysql40-server/Makefile7
-rw-r--r--databases/mysql41-client/Makefile2
-rw-r--r--databases/mysql41-server/Makefile7
-rw-r--r--databases/mysql50-client/Makefile2
-rw-r--r--databases/mysql50-server/Makefile7
-rw-r--r--databases/mysql51-client/Makefile2
-rw-r--r--databases/mysql51-server/Makefile7
-rw-r--r--databases/mysql54-client/Makefile2
-rw-r--r--databases/mysql54-server/Makefile7
-rw-r--r--databases/mysql55-client/Makefile2
-rw-r--r--databases/mysql55-server/Makefile7
-rw-r--r--databases/mysql60-client/Makefile2
-rw-r--r--databases/mysql60-server/Makefile7
-rw-r--r--databases/p5-DBD-mysql/Makefile12
-rw-r--r--databases/percona55-client/Makefile2
-rw-r--r--databases/percona55-server/Makefile7
17 files changed, 50 insertions, 34 deletions
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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 --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 05615f97adb6..758841e222a1 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DBD-mysql
PORTVERSION= 2.1026
+PORTREVISION= 1
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
@@ -16,11 +17,18 @@ MAINTAINER= skv@FreeBSD.org
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>
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 73538637c376..99cc26f7f145 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mysql
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 7f4a067cff34..2c9dcc3717e3 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= mysql
PORTVERSION= 4.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
http://mysql.tzone.it/Downloads/MySQL-4.0/ \
@@ -29,7 +29,6 @@ COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
-USE_PERL5_RUN= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
@@ -94,8 +93,10 @@ CXX= ${CC}
# 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}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:45:07 +0000