aboutsummaryrefslogtreecommitdiffstats
path: root/databases/mysql41-server
diff options
context:
space:
mode:
authornork <nork@FreeBSD.org>2003-12-27 00:56:52 +0800
committernork <nork@FreeBSD.org>2003-12-27 00:56:52 +0800
commit5fcca29682b351c75c612f6a9732cf57c482ca2c (patch)
treed005d0ee1a769a33a962160f44513a5656c4d3a3 /databases/mysql41-server
parent38d31ae8bfc622414d97da185a22015ebadc18b8 (diff)
downloadfreebsd-ports-gnome-5fcca29682b351c75c612f6a9732cf57c482ca2c.tar.gz
freebsd-ports-gnome-5fcca29682b351c75c612f6a9732cf57c482ca2c.tar.zst
freebsd-ports-gnome-5fcca29682b351c75c612f6a9732cf57c482ca2c.zip
o Add CONFLICTS sections.
o Fix packages dependencies. o portlint clean o Correct typo in MASTER_SITES, Fix non-optimized build. PR: ports/60559 Submitted by: Alex Dupre <sysadmin@alexdupre.com>
Diffstat (limited to 'databases/mysql41-server')
-rw-r--r--databases/mysql41-server/Makefile9
-rw-r--r--databases/mysql41-server/files/patch-configure11
2 files changed, 17 insertions, 3 deletions
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" ;;