Upgrade to 3.22.14b-gamma.

According to T.c.X DataKonsultAB this is the recommended version now.
So remove NO_LATEST_LINK (and set it for mysql321).

4 files changed, 20 insertions, 18 deletions

diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $
+# $Id: Makefile,v 1.38 1998/12/24 01:14:12 dirk Exp $
 #
 
-DISTNAME=	mysql-3.22.13-beta
-PKGNAME=	mysql-3.22.13b
+DISTNAME=	mysql-3.22.14b-gamma
+PKGNAME=	mysql-3.22.14g
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
@@ -17,8 +17,6 @@ MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/My
 
 MAINTAINER=	dirk@FreeBSD.ORG
 
-MANUAL_PACKAGE_BUILD=	incompatible with mysql321
-NO_LATEST_LINK=	yes
 MAN1=		mysql.1
 
 USE_PERL5=	YES
diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql322-server/distinfo
+++ b/databases/mysql322-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1
+MD5 (mysql-3.22.14b-gamma.tar.gz) = 4584474c427992eaa65a50eb3b3fa50d
diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql322-server/files/patch-ab
+++ b/databases/mysql322-server/files/patch-ab
@@ -1,17 +1,17 @@
---- scripts/mysql_install_db.sh.orig	Wed Dec  9 12:48:04 1998
-+++ scripts/mysql_install_db.sh	Wed Dec 23 23:39:46 1998
-@@ -11,8 +11,8 @@
- ldata=@localstatedir@
- mdata=$ldata/mysql
+--- scripts/mysql_install_db.sh.orig	Fri Jan  1 15:33:33 1999
++++ scripts/mysql_install_db.sh	Wed Jan  6 00:10:55 1999
+@@ -13,8 +13,8 @@
+ execdir=@libexecdir@
+ bindir=@bindir@
  
 -# Are we doing an rpm install?
 -if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
 +# pretend we're doing an RPM install
 +IN_RPM=1
  
- if test ! -x @libexecdir@/mysqld
- then
-@@ -27,8 +27,6 @@
+ # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
+ if test -w /
+@@ -57,8 +57,6 @@
    fi
  fi
  
@@ -20,7 +20,7 @@
  hostname=`hostname`		# Install this too in the user table
  
  # Check if hostname is valid
-@@ -44,12 +42,9 @@
+@@ -74,14 +72,11 @@
  fi
  
  # Create database directories mysql & test
@@ -29,10 +29,14 @@
 -  if test ! -d $ldata; then mkdir $ldata; fi
 -  if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
 -  if test ! -d $ldata/test; then mkdir $ldata/test; fi
--fi
+-  if test -w / -a ! -z "$user"; then
+-    chown $user $ldata $ldata/mysql $ldata/test;
+-  fi
 +if test ! -d $ldata; then mkdir $ldata; fi
 +if test ! -d $ldata/mysql; then mkdir $ldata/mysql; fi
 +if test ! -d $ldata/test; then mkdir $ldata/test; fi
++if test -w / -a ! -z "$user"; then
++  chown $user $ldata $ldata/mysql $ldata/test;
+ fi
  
  # Initialize variables
- c_d="" i_d=""
diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql322-server/pkg-plist
+++ b/databases/mysql322-server/pkg-plist
@@ -67,7 +67,7 @@ share/mysql/japanese/errmsg.sys
 share/mysql/japanese/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.13-beta.spec
+share/mysql/mysql-3.22.14b-gamma.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys