aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2008-07-26 16:36:54 +0800
committerale <ale@FreeBSD.org>2008-07-26 16:36:54 +0800
commit6c930ecbaae4383847a7a8d22c0fafa11bb5439f (patch)
tree8b09fbc7a958abd08f9babcc37bd5799ae82dab9 /databases
parent34eeee9a910c9212c0946ed45d38326743cd9569 (diff)
downloadfreebsd-ports-gnome-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.tar.gz
freebsd-ports-gnome-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.tar.zst
freebsd-ports-gnome-6c930ecbaae4383847a7a8d22c0fafa11bb5439f.zip
Update CONFLICTS and remove duplicated USE_PERL5.
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql323-scripts/Makefile1
-rw-r--r--databases/mysql323-server/Makefile6
-rw-r--r--databases/mysql40-scripts/Makefile1
-rw-r--r--databases/mysql40-server/Makefile6
-rw-r--r--databases/mysql41-scripts/Makefile1
-rw-r--r--databases/mysql41-server/Makefile6
-rw-r--r--databases/mysql50-scripts/Makefile1
-rw-r--r--databases/mysql50-server/Makefile6
-rw-r--r--databases/mysql51-scripts/Makefile1
-rw-r--r--databases/mysql51-server/Makefile6
-rw-r--r--databases/mysql54-scripts/Makefile1
-rw-r--r--databases/mysql54-server/Makefile6
-rw-r--r--databases/mysql55-scripts/Makefile1
-rw-r--r--databases/mysql55-server/Makefile6
-rw-r--r--databases/percona55-server/Makefile6
15 files changed, 24 insertions, 31 deletions
diff --git a/databases/mysql323-scripts/Makefile b/databases/mysql323-scripts/Makefile
index e4958171f08b..9b5f645bb43e 100644
--- a/databases/mysql323-scripts/Makefile
+++ b/databases/mysql323-scripts/Makefile
@@ -17,6 +17,5 @@ PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 685e37e7eb31..28745252d469 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -78,7 +78,7 @@ WANT_MYSQL_VER= 323
LATEST_LINK= mysql323-server
-CONFLICTS= mysql-server-4.* mysql-server-5.*
+CONFLICTS= mysql-server-4.* mysql-server-5.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -138,7 +138,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql323-client
-CONFLICTS= mysql-client-4.* mysql-client-5.*
+CONFLICTS= mysql-client-4.* mysql-client-5.* mysql-client-6.*
MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
@@ -165,7 +165,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql323-scripts
-CONFLICTS= mysql-scripts-4.* mysql-scripts-5.*
+CONFLICTS= mysql-scripts-4.* mysql-scripts-5.* mysql-scripts-6.*
MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1
diff --git a/databases/mysql40-scripts/Makefile b/databases/mysql40-scripts/Makefile
index 8be8e369392e..51c445d89205 100644
--- a/databases/mysql40-scripts/Makefile
+++ b/databases/mysql40-scripts/Makefile
@@ -17,6 +17,5 @@ PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 4e9b9ebf3f65..cc484fcb8206 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -86,7 +86,7 @@ WANT_MYSQL_VER= 40
LATEST_LINK= mysql40-server
-CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
+CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -132,7 +132,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql40-client
-CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.*
+CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* mysql-client-6.*
MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
@@ -162,7 +162,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql40-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.* mysql-scripts-6.*
MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql41-scripts/Makefile b/databases/mysql41-scripts/Makefile
index 17085831b6d6..c17cb4d517e2 100644
--- a/databases/mysql41-scripts/Makefile
+++ b/databases/mysql41-scripts/Makefile
@@ -16,6 +16,5 @@ PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 40c1a31ce619..9007861ae8a1 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 41
LATEST_LINK= mysql41-server
-CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
+CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql41-client
-CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
+CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -183,7 +183,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql41-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[02-9].* mysql-scripts-5.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.[02-9].* mysql-scripts-5.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql50-scripts/Makefile b/databases/mysql50-scripts/Makefile
index fb2f7929a86c..1e96f2b0dd43 100644
--- a/databases/mysql50-scripts/Makefile
+++ b/databases/mysql50-scripts/Makefile
@@ -17,6 +17,5 @@ PKGMESSAGE= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 3be05b8931c4..d9f0b9779285 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -102,7 +102,7 @@ WANT_MYSQL_VER= 50
LATEST_LINK= mysql50-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.1.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.1.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -167,7 +167,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql50-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.1.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.1.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -204,7 +204,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql50-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.1.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.1.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql51-scripts/Makefile b/databases/mysql51-scripts/Makefile
index bb4acfcf8a31..7aa6e28374ba 100644
--- a/databases/mysql51-scripts/Makefile
+++ b/databases/mysql51-scripts/Makefile
@@ -17,6 +17,5 @@ PKGMESSAGE= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 7054148353c3..92e5ce4d0121 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql54-scripts/Makefile b/databases/mysql54-scripts/Makefile
index bb4acfcf8a31..7aa6e28374ba 100644
--- a/databases/mysql54-scripts/Makefile
+++ b/databases/mysql54-scripts/Makefile
@@ -17,6 +17,5 @@ PKGMESSAGE= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 7054148353c3..92e5ce4d0121 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/mysql55-scripts/Makefile b/databases/mysql55-scripts/Makefile
index bb4acfcf8a31..7aa6e28374ba 100644
--- a/databases/mysql55-scripts/Makefile
+++ b/databases/mysql55-scripts/Makefile
@@ -17,6 +17,5 @@ PKGMESSAGE= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.scripts
SCRIPTS_ONLY= yes
-USE_PERL5= yes
.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 7054148353c3..92e5ce4d0121 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 7054148353c3..92e5ce4d0121 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -91,7 +91,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.*
+CONFLICTS= mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
USE_RC_SUBR= mysql-server.sh
@@ -149,7 +149,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
+CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.* mysql-client-6.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
@@ -184,7 +184,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.*
+CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.0.* mysql-scripts-6.*
MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
mysqld_multi.1 mysql_fix_privilege_tables.1
generated by cgit (git 2.34.1) at 2024-11-24 23:54:54 +0800