From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 22 07:20:21 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30E6F16A4C0 for ; Wed, 22 Oct 2003 07:20:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C37943FBD for ; Wed, 22 Oct 2003 07:20:18 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9MEKIFY007604 for ; Wed, 22 Oct 2003 07:20:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9MEKINq007603; Wed, 22 Oct 2003 07:20:18 -0700 (PDT) (envelope-from gnats) Resent-Date: Wed, 22 Oct 2003 07:20:18 -0700 (PDT) Resent-Message-Id: <200310221420.h9MEKINq007603@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FFC016A4B3; Wed, 22 Oct 2003 07:15:08 -0700 (PDT) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id B79E143FA3; Wed, 22 Oct 2003 07:15:04 -0700 (PDT) (envelope-from alex@armada.alexdupre.com) Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245]) by relay.gufi.org (Postfix) with ESMTP id D55E720F78; Wed, 22 Oct 2003 16:14:58 +0200 (CEST) Received: from armada.alexdupre.com (localhost [127.0.0.1]) h9MEExIo071040; Wed, 22 Oct 2003 16:14:59 +0200 (CEST) (envelope-from alex@armada.alexdupre.com) Received: (from alex@localhost) by armada.alexdupre.com (8.12.10/8.12.10/Submit) id h9MEEw9k071039; Wed, 22 Oct 2003 16:14:58 +0200 (CEST) (envelope-from alex) Message-Id: <200310221414.h9MEEw9k071039@armada.alexdupre.com> Date: Wed, 22 Oct 2003 16:14:58 +0200 (CEST) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: nork@FreeBSD.org Subject: ports/58377: [Maintainer Update] Port: MySQL 4.0.16 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2003 14:20:21 -0000 >Number: 58377 >Category: ports >Synopsis: [Maintainer Update] Port: MySQL 4.0.16 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 22 07:20:17 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #3: Mon Oct 20 18:11:07 CEST 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Update to 4.0.16 release. Various little fixes. Change behaviour of BUILD_OPTIMIZED. Supercedes PR 57644. >How-To-Repeat: >Fix: --- mysql40-server.diff begins here --- diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile --- mysql40-server.orig/Makefile Wed Oct 22 10:24:47 2003 +++ mysql40-server/Makefile Wed Oct 22 15:34:20 2003 @@ -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 @@ .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -.include - -.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 @@ .if defined(BUILD_STATIC) CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static .endif -.if defined(BUILD_OPTIMIZED) -CFLAGS+= -mcpu=i686 + +.include + +.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 @@ .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 @@ @${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 -ruN mysql40-server.orig/distinfo mysql40-server/distinfo --- mysql40-server.orig/distinfo Wed Oct 22 10:24:47 2003 +++ mysql40-server/distinfo Wed Oct 22 14:25:41 2003 @@ -1 +1 @@ -MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d +MD5 (mysql-4.0.16.tar.gz) = ddc959b9cdc2f5e30dc6a4d3650d3db5 diff -ruN mysql40-server.orig/files/patch-configure mysql40-server/files/patch-configure --- mysql40-server.orig/files/patch-configure Wed Oct 22 10:24:47 2003 +++ mysql40-server/files/patch-configure Wed Oct 22 15:13:20 2003 @@ -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 -ruN mysql40-server.orig/pkg-plist mysql40-server/pkg-plist --- mysql40-server.orig/pkg-plist Wed Oct 22 10:24:47 2003 +++ mysql40-server/pkg-plist Wed Oct 22 16:07:42 2003 @@ -102,6 +102,7 @@ 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 --- mysql40-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: