Upgrade to 3.22.30.

4 files changed, 24 insertions, 37 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 4a2a807bf98f..bc561268325e 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	mysql-3.22.29
+DISTNAME=	mysql-3.22.30
 PKGNAME?=	${DISTNAME:S/-/-server-/}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
@@ -14,10 +14,6 @@ MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/My
 		ftp://ftp.plig.net/pub/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.22/
 
-PATCH_SITES=	http://www.freebsd.org/~dirk/ports/distfiles/ \
-		http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-PATCHFILES=	mysql.grant.patch
-
 MAINTAINER=	dirk@FreeBSD.org
 
 .if ${MACHINE_ARCH} == "alpha"
@@ -98,7 +94,7 @@ pre-fetch:
 	@${ECHO}
 .endif
 
-pre-build:
+post-patch:
 	${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
 	${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S
 
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index aad7f4a6b85a..9a1d36ffefd7 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,2 +1 @@
-MD5 (mysql-3.22.29.tar.gz) = d567b6f1ac63bb7b18281a3350f2b36e
-MD5 (mysql.grant.patch) = be2b643e6afd24e1a217550d61489342
+MD5 (mysql-3.22.30.tar.gz) = 26d0ba5f19e4d93ba81611cbe35da81a
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index 35b814b673b8..8476a2bd9a60 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,26 +1,6 @@
---- configure.orig	Wed Oct  6 00:10:05 1999
-+++ configure	Thu Nov 25 21:00:43 1999
-@@ -2070,8 +2070,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -2085,7 +2085,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -2737,7 +2737,7 @@
+--- configure.orig	Wed Jan 12 04:32:17 2000
++++ configure	Tue Jan 25 14:58:09 2000
+@@ -2743,7 +2743,7 @@
    ;;
  esac
  fi
@@ -29,9 +9,9 @@
  if test -n "$HOSTNAME"; then
    echo "$ac_t""$HOSTNAME" 1>&6
  else
-@@ -2865,30 +2865,7 @@
+@@ -2871,30 +2871,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2867: checking "how to check if pid exists"" >&5
+ echo "configure:2873: checking "how to check if pid exists"" >&5
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -61,7 +41,7 @@
  echo "$ac_t"""$FIND_PROC"" 1>&6
  
  # Check if a pid is valid
-@@ -4569,8 +4546,6 @@
+@@ -4614,8 +4591,6 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -70,7 +50,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -4804,28 +4779,6 @@
+@@ -4849,28 +4824,6 @@
  fi
  
  
@@ -99,7 +79,16 @@
  # Check whether --with-debug or --without-debug was given.
  if test "${with_debug+set}" = set; then
    withval="$with_debug"
-@@ -8064,7 +8017,7 @@
+@@ -7973,7 +7926,7 @@
+ #include <pthread.h>
+ int main() {
+ pthread_attr_t thr_attr;
+-pthread_attr_setscope(&thr_attr,0);
++XXXpthread_attr_setscope(&thr_attr,0);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:7980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -8178,7 +8131,7 @@
      echo ""
      echo "Configuring MIT Pthreads"
      # We will never install so installation paths are not needed.
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index a536a0ed0840..776b652ffdf3 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -100,7 +100,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.29.spec
+share/mysql/mysql-3.22.30.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
@@ -122,10 +122,13 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/doc/mysql/Img
 @dirrm share/doc/mysql
 @dirrm share/mysql/czech
+@dirrm share/mysql/danish
 @dirrm share/mysql/dutch
 @dirrm share/mysql/english
+@dirrm share/mysql/estonia
 @dirrm share/mysql/french
 @dirrm share/mysql/german
+@dirrm share/mysql/greek
 @dirrm share/mysql/hungarian
 @dirrm share/mysql/italian
 @dirrm share/mysql/japanese