diff options
23 files changed, 136 insertions, 32 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 2ad22b48fb13..5e97603517f2 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -97,8 +97,9 @@ CONFIGURE_ENV+= CXX="${CC}" INFO= mysql .endif -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql + +CONFLICTS= mysql-server-4.* mysql-server-5.* PLIST_SUB= MYSQL_VERSION=${PORTVERSION} @@ -171,6 +172,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-4.* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ perror.1 replace.1 safe_mysqld.1 diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index e028d64a0040..28fe4529a63c 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -99,8 +99,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40 + +CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* PLIST_SUB= MYSQL_VERSION=${PORTVERSION} @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql41-server/files/patch-configure +++ b/databases/mysql41-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 773f626e088c..c7f06b1749e1 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -9,10 +9,10 @@ PORTNAME= mysql PORTREVISION= 0 PKGNAMESUFFIX= -client -MAINTAINER= sysadmin@alexdupre.com COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql41-server + PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index eaadc749b402..e3d84c83d494 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -9,7 +9,7 @@ PORTNAME?= mysql PORTVERSION= 4.1.1 PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ @@ -101,8 +101,9 @@ CXXFLAGS+= -fno-exceptions .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ - ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41 + +CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* ONLY_FOR_ARCHS= i386 alpha sparc64 @@ -170,6 +171,8 @@ post-install: # MySQL-Client part .else +CONFLICTS= mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.* + MAN1= isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1 \ mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \ mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1 diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index 81ba80087c11..6c102a1762a6 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -61,6 +61,17 @@ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 echo "${ECHO_T}\"$FIND_PROC\"" >&6 +@@ -12678,8 +12644,8 @@ + # Some system specific hacks + # + +-MAX_C_OPTIMIZE="-O3" +-MAX_CXX_OPTIMIZE="-O3" ++MAX_C_OPTIMIZE="" ++MAX_CXX_OPTIMIZE="" + + case $SYSTEM_TYPE in + *solaris2.7*) @@ -23893,7 +23859,7 @@ /* ) rel_srcdir="$srcdir" ;; * ) rel_srcdir="../$srcdir" ;; |