From c9989eb4c43f689eb27a4cbb5cdf1cb4e09fdb70 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Sat, 17 Jan 2004 12:47:02 +0000
Subject: - Completely restructure the port to follow other mysql* ports   (too
 many improvements to be listed here) - Correctly support PTHREAD_LIBS/CFLAGS
 - Use USE_GNOME=lthack - Propagate DB_DIR in package [1] - Use my
 @FreeBSD.org email address - Bump PORTREVISION

PR:		ports/24749 [1]
Submitted by:	Tom Pavel <pavel@networkphysics.com> [1]
Approved by:	nork (mentor/implicitly)
---
 databases/mysql323-server/files/patch-Makefile.in |  14 ++
 databases/mysql323-server/files/patch-af          |  79 ----------
 databases/mysql323-server/files/patch-ag          | 177 ----------------------
 databases/mysql323-server/files/patch-an          |  19 ---
 databases/mysql323-server/files/patch-ar          |  14 --
 databases/mysql323-server/files/patch-configure   | 105 +++++++++++++
 6 files changed, 119 insertions(+), 289 deletions(-)
 create mode 100644 databases/mysql323-server/files/patch-Makefile.in
 delete mode 100644 databases/mysql323-server/files/patch-af
 delete mode 100644 databases/mysql323-server/files/patch-ag
 delete mode 100644 databases/mysql323-server/files/patch-an
 delete mode 100644 databases/mysql323-server/files/patch-ar
 create mode 100644 databases/mysql323-server/files/patch-configure

(limited to 'databases/mysql323-server/files')

diff --git a/databases/mysql323-server/files/patch-Makefile.in b/databases/mysql323-server/files/patch-Makefile.in
new file mode 100644
index 000000000000..228501c8599e
--- /dev/null
+++ b/databases/mysql323-server/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Sat Jan 17 00:29:13 2004
++++ Makefile.in	Sat Jan 17 00:29:28 2004
+@@ -195,10 +195,7 @@
+ EXTRA_DIST = INSTALL-SOURCE README \
+ 			COPYING COPYING.LIB
+ 
+-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
+-			@thread_dirs@ @sql_client_dirs@ \
+-			@sql_server_dirs@ scripts tests man \
+-			@bench_dirs@ support-files os2
++SUBDIRS =
+ 
+ 
+ # Relink after clean
diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af
deleted file mode 100644
index 8d2d1003f2e4..000000000000
--- a/databases/mysql323-server/files/patch-af
+++ /dev/null
@@ -1,79 +0,0 @@
---- scripts/safe_mysqld.sh.orig	Thu Oct 10 12:17:29 2002
-+++ scripts/safe_mysqld.sh	Sun Nov 10 21:27:46 2002
-@@ -68,30 +68,9 @@
-   done
- }
- 
--MY_PWD=`pwd`
--# Check if we are starting this relative (for the binary release)
--if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./bin/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "$defaults"
--  then
--    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
--  fi
--# Check if this is a 'moved install directory'
--elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
-- -x ./libexec/mysqld
--then
--  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
--  DATADIR=$MY_BASEDIR_VERSION/var
--else
--  MY_BASEDIR_VERSION=@prefix@
--  DATADIR=@localstatedir@
--  ledir=@libexecdir@
--fi
-+MY_BASEDIR_VERSION=@prefix@
-+DATADIR=@localstatedir@
-+ledir=@libexecdir@
- 
- MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
- MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -106,7 +85,6 @@
- fi
- 
- # these rely on $DATADIR by default, so we'll set them later on
--pid_file=
- err_log=
- SET_USER=0
- 
-@@ -239,34 +217,6 @@
-   if test ! -f $pid_file		# This is removed if normal shutdown
-   then
-     break
--  fi
--
--  if @IS_LINUX@
--  then
--    # Test if one process was hanging.
--    # This is only a fix for Linux (running as base 3 mysqld processes)
--    # but should work for the rest of the servers.
--    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the process won't react on the kill.
--    numofproces=`ps xa | grep -v "grep" | grep -c $ledir/$MYSQLD`
--    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
--    I=1
--    while test "$I" -le "$numofproces"
--    do 
--      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` 
--	for T in $PROC
--	do
--	  break
--	done
--	#    echo "TEST $I - $T **"
--	if kill -9 $T
--	then
--	  echo "$MYSQLD process hanging, pid $T - killed" | tee -a $err_log
--	else 
--	  break
--	fi
--	I=`expr $I + 1`
--    done
-   fi
- 
-   echo "`date +'%y%m%d %H:%M:%S'`  mysqld restarted" | tee -a $err_log
diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag
deleted file mode 100644
index a54c0a835c6a..000000000000
--- a/databases/mysql323-server/files/patch-ag
+++ /dev/null
@@ -1,177 +0,0 @@
---- configure.orig	Thu Sep 11 13:49:33 2003
-+++ configure	Fri Sep 19 16:37:59 2003
-@@ -8070,6 +8070,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8999,7 +9000,7 @@
-   ;;
- esac
- fi
--HOSTNAME=$ac_cv_path_HOSTNAME
-+HOSTNAME="$ac_cv_path_HOSTNAME -s"
- 
- if test -n "$HOSTNAME"; then
-   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9188,43 +9189,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--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
--# Linux style
--if $PS p $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
--# Solaris
--elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
--# BSD style
--elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep $0 > /dev/null
--then
--  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
--else
--  case $SYSTEM_TYPE in
--    *darwin*)
--      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *cygwin*)
--      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *)
--      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
--echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
--   { (exit 1); exit 1; }; }
--  esac
--fi
-+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
- 
- echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
- echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12509,8 +12474,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -13215,7 +13188,6 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lc_r  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -13269,7 +13241,6 @@
- #define HAVE_LIBC_R 1
- _ACEOF
- 
--  LIBS="-lc_r $LIBS"
- 
- fi
- 
-@@ -13713,29 +13684,6 @@
- fi
- 
- 
--# Build optimized or debug version ?
--# First check for gcc and g++
--if test "$ac_cv_c_compiler_gnu" = "yes"
--then
--  DEBUG_CFLAGS="-g"
--  DEBUG_OPTIMIZE_CC="-O"
--  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
--else
--  DEBUG_CFLAGS="-g"
--  DEBUG_OPTIMIZE_CC=""
--  OPTIMIZE_CFLAGS="-O"
--fi
--if test "$ac_cv_prog_cxx_g" = "yes"
--then
--  DEBUG_CXXFLAGS="-g"
--  DEBUG_OPTIMIZE_CXX="-O"
--  OPTIMIZE_CXXFLAGS="-O3"
--else
--  DEBUG_CXXFLAGS="-g"
--  DEBUG_OPTIMIZE_CXX=""
--  OPTIMIZE_CXXFLAGS="-O"
--fi
--
- 
- # Check whether --with-debug or --without-debug was given.
- if test "${with_debug+set}" = set; then
-@@ -16088,10 +16036,6 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--if test "$ac_cv_cxx_compiler_gnu" = "yes"
--then
--  CXXFLAGS="$CXXFLAGS -Werror"
--fi
- mysql_cv_btype_last_arg_accept=none
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -19229,14 +19173,6 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- 
--# Do not treat warnings as errors if we are linking against other libc
--# this is to work around gcc not being permissive on non-system includes
--# with respect to ANSI C++
--if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
--then
--  CXXFLAGS="$CXXFLAGS -Werror"
--fi
--
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -19320,10 +19256,6 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
--then
--  CXXFLAGS="$CXXFLAGS -Werror"
--fi
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
-@@ -19406,10 +19338,6 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--if test "$ac_cv_cxx_compiler_gnu" = "yes" -a "$with_other_libc" = "no"
--then
--  CXXFLAGS="$CXXFLAGS -Werror"
--fi
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
diff --git a/databases/mysql323-server/files/patch-an b/databases/mysql323-server/files/patch-an
deleted file mode 100644
index 987cf407da8f..000000000000
--- a/databases/mysql323-server/files/patch-an
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Thu Jan 23 16:13:43 2003
-+++ Makefile.in	Wed Jan 29 17:11:29 2003
-@@ -195,11 +195,11 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB MIRRORS
- 
--SUBDIRS = . include @docs_dirs@ @readline_dir@ \
--			@thread_dirs@ @sql_client_dirs@ \
--			@sql_server_dirs@ scripts tests man \
--			@bench_dirs@ support-files os2
--
-+.if defined(CLIENT_ONLY)
-+SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
-+.else
-+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
-+.endif
- 
- # Relink after clean
- CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources
diff --git a/databases/mysql323-server/files/patch-ar b/databases/mysql323-server/files/patch-ar
deleted file mode 100644
index 3ff10ce708d5..000000000000
--- a/databases/mysql323-server/files/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/Makefile.in.orig	Thu Dec  5 10:37:22 2002
-+++ include/Makefile.in	Sat Dec 14 16:26:53 2002
-@@ -324,7 +324,11 @@
- installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
- 
-+.if defined(CLIENT_ONLY)
- install: install-am
-+.else
-+install:
-+.endif
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
diff --git a/databases/mysql323-server/files/patch-configure b/databases/mysql323-server/files/patch-configure
new file mode 100644
index 000000000000..f62b2b50eef7
--- /dev/null
+++ b/databases/mysql323-server/files/patch-configure
@@ -0,0 +1,105 @@
+--- configure.orig	Thu Sep 11 13:49:33 2003
++++ configure	Sat Jan 17 00:49:23 2004
+@@ -8999,7 +8999,7 @@
+   ;;
+ esac
+ fi
+-HOSTNAME=$ac_cv_path_HOSTNAME
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ 
+ if test -n "$HOSTNAME"; then
+   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
+@@ -9188,43 +9188,7 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-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
+-# Linux style
+-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+-then
+-  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
+-# Solaris
+-elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
+-then
+-  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
+-# BSD style
+-elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
+-then
+   FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-# SysV style
+-elif $PS -ef 2> /dev/null | grep $0 > /dev/null
+-then
+-  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-# Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep $0 > /dev/null
+-then
+-  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
+-else
+-  case $SYSTEM_TYPE in
+-    *darwin*)
+-      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *cygwin*)
+-      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *)
+-      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
+-echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
+-   { (exit 1); exit 1; }; }
+-  esac
+-fi
+ 
+ echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+ echo "${ECHO_T}\"$FIND_PROC\"" >&6
+@@ -12509,8 +12473,16 @@
+     ;;
+   *freebsd*)
+     echo "Adding fix for interrupted reads"
+-    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+-    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
++    if test "$OSVERSION" -gt "480100" && \
++       test "$OSVERSION" -lt "500000" || \
++       test "$OSVERSION" -gt "500109"
++    then
++      CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
++    else
++      CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
++      CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
++    fi
+     ;;
+   *netbsd*)
+     echo "Adding flag -Dunix"
+@@ -13710,30 +13682,6 @@
+ #define HAVE_RESTARTABLE_SYSCALLS 1
+ _ACEOF
+ 
+-fi
+-
+-
+-# Build optimized or debug version ?
+-# First check for gcc and g++
+-if test "$ac_cv_c_compiler_gnu" = "yes"
+-then
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC="-O"
+-  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
+-else
+-  DEBUG_CFLAGS="-g"
+-  DEBUG_OPTIMIZE_CC=""
+-  OPTIMIZE_CFLAGS="-O"
+-fi
+-if test "$ac_cv_prog_cxx_g" = "yes"
+-then
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX="-O"
+-  OPTIMIZE_CXXFLAGS="-O3"
+-else
+-  DEBUG_CXXFLAGS="-g"
+-  DEBUG_OPTIMIZE_CXX=""
+-  OPTIMIZE_CXXFLAGS="-O"
+ fi
+ 
+ 
-- 
cgit v1.2.3