aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql40-server
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2003-10-23 14:36:10 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2003-10-23 14:36:10 +0000
commit2cc3a15dc367bb2d1dc998c089dc59788949f55a (patch)
treec00ca2aa70b0ddc029694ab1dfadaddd192859ef /databases/mysql40-server
parentaaf2f236f0c1af4fdf6f37b933e1726155ed5ca0 (diff)
downloadports-2cc3a15dc367bb2d1dc998c089dc59788949f55a.tar.gz
ports-2cc3a15dc367bb2d1dc998c089dc59788949f55a.zip
Notes
Diffstat (limited to 'databases/mysql40-server')
-rw-r--r--databases/mysql40-server/Makefile36
-rw-r--r--databases/mysql40-server/distinfo2
-rw-r--r--databases/mysql40-server/files/patch-configure23
-rw-r--r--databases/mysql40-server/pkg-plist1
4 files changed, 38 insertions, 24 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 836269ee0a68..a5db2b4378a7 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,12 +6,10 @@
#
PORTNAME?= mysql
-PORTVERSION= 4.0.15
+PORTVERSION= 4.0.16
PORTREVISION?= 0
CATEGORIES= databases
-MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
- http://mysql.tzone.it/Downloads/MySQL-4.0/ \
- ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
+MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \
@@ -50,11 +48,6 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \
.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
.endif
@@ -68,8 +61,11 @@ CONFIGURE_ARGS+=--with-openssl
.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
.endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+= -mcpu=i686
+
+.include <bsd.port.pre.mk>
+
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
.endif
.if defined(WITH_LINUXTHREADS)
CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
@@ -85,14 +81,18 @@ CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
.endif
.endif
+.if ${OSVERSION} < 500000
+CXX= ${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
CFLAGS+= -O3 -fno-omit-frame-pointer
-CXXFLAGS= ${CFLAGS} -felide-constructors -fno-rtti
-
+.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3))
+CFLAGS+= -fno-gcse
+.endif
+CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti
.if ${OSVERSION} >= 400002
CXXFLAGS+= -fno-exceptions
.endif
-.if ${OSVERSION} < 500000
-CXX= ${CC}
.endif
# MySQL-Server part
@@ -122,9 +122,11 @@ pre-fetch:
@${ECHO} " SKIP_DNS_CHECK=yes Don't run resolveip to do an additional DNS"
@${ECHO} " reverse lookup before inserting local"
@${ECHO} " hostname into mysql database"
- @${ECHO} " (use if your machine has no official DNS entry)."
+ @${ECHO} " (use it if your machine has no official DNS entry)."
+ @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations"
+ @${ECHO} " (use it if you need speed)."
@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
- @${ECHO} " BUILD_OPTIMIZED=yes Add -mcpu=i686 to CFLAGS."
+ @${ECHO} " (use it if you need even more speed)."
@${ECHO} ""
post-patch:
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index f0d133ef44a7..8a9403267e39 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d
+MD5 (mysql-4.0.16.tar.gz) = ddc959b9cdc2f5e30dc6a4d3650d3db5
diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index f35d237ea579..58f8c5a5d900 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Wed May 14 22:24:53 2003
-+++ configure Fri May 23 00:29:06 2003
-@@ -8110,6 +8110,7 @@
+--- configure.orig Fri Oct 17 07:29:41 2003
++++ configure Wed Oct 22 15:12:52 2003
+@@ -8116,6 +8116,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9052,7 +9053,7 @@
+@@ -9058,7 +9059,7 @@
;;
esac
fi
@@ -17,7 +17,7 @@
if test -n "$HOSTNAME"; then
echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9244,43 +9245,8 @@
+@@ -9250,43 +9251,8 @@
echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
PS=$ac_cv_path_PS
@@ -61,7 +61,18 @@
echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -22320,7 +22294,7 @@
+@@ -12667,8 +12633,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*)
+@@ -22458,7 +22424,7 @@
/* ) rel_srcdir="$srcdir" ;;
* ) rel_srcdir="../$srcdir" ;;
esac
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index cd9cf4ec6885..d6a63ef48cd0 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -102,6 +102,7 @@ share/mysql/Info.plist
share/mysql/MySQL-shared-compat.spec
share/mysql/StartupParameters.plist
share/mysql/binary-configure
+share/mysql/make_sharedlib_distribution
share/mysql/postinstall
share/mysql/preinstall
share/mysql/charsets/Index