aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authordirk <dirk@FreeBSD.org>1999-01-06 07:43:28 +0800
committerdirk <dirk@FreeBSD.org>1999-01-06 07:43:28 +0800
commit56c92c0552d63a9a984e81ea99e1bdcd56613c9c (patch)
tree0939ed2989a7832e6e1a4fd9e28221f4bc599a7e /databases
parent82f8b382bfb0ba1a297854cceee950152720e6a5 (diff)
downloadfreebsd-ports-gnome-56c92c0552d63a9a984e81ea99e1bdcd56613c9c.tar.gz
freebsd-ports-gnome-56c92c0552d63a9a984e81ea99e1bdcd56613c9c.tar.zst
freebsd-ports-gnome-56c92c0552d63a9a984e81ea99e1bdcd56613c9c.zip
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).
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql322-client/Makefile8
-rw-r--r--databases/mysql322-server/Makefile8
-rw-r--r--databases/mysql322-server/distinfo2
-rw-r--r--databases/mysql322-server/files/patch-ab26
-rw-r--r--databases/mysql322-server/pkg-plist2
-rw-r--r--databases/mysql323-client/Makefile8
-rw-r--r--databases/mysql323-server/Makefile8
-rw-r--r--databases/mysql323-server/distinfo2
-rw-r--r--databases/mysql323-server/files/patch-ab26
-rw-r--r--databases/mysql323-server/pkg-plist2
-rw-r--r--databases/mysql40-client/Makefile8
-rw-r--r--databases/mysql40-server/Makefile8
-rw-r--r--databases/mysql40-server/distinfo2
-rw-r--r--databases/mysql40-server/files/patch-ab26
-rw-r--r--databases/mysql40-server/pkg-plist2
-rw-r--r--databases/mysql41-client/Makefile8
-rw-r--r--databases/mysql41-server/Makefile8
-rw-r--r--databases/mysql41-server/distinfo2
-rw-r--r--databases/mysql41-server/files/patch-ab26
-rw-r--r--databases/mysql41-server/pkg-plist2
-rw-r--r--databases/mysql50-client/Makefile8
-rw-r--r--databases/mysql50-server/Makefile8
-rw-r--r--databases/mysql50-server/distinfo2
-rw-r--r--databases/mysql50-server/files/patch-ab26
-rw-r--r--databases/mysql50-server/pkg-plist2
-rw-r--r--databases/mysql51-client/Makefile8
-rw-r--r--databases/mysql51-server/Makefile8
-rw-r--r--databases/mysql51-server/distinfo2
-rw-r--r--databases/mysql51-server/files/patch-ab26
-rw-r--r--databases/mysql51-server/pkg-plist2
-rw-r--r--databases/mysql54-client/Makefile8
-rw-r--r--databases/mysql54-server/Makefile8
-rw-r--r--databases/mysql54-server/distinfo2
-rw-r--r--databases/mysql54-server/files/patch-ab26
-rw-r--r--databases/mysql54-server/pkg-plist2
-rw-r--r--databases/mysql55-client/Makefile8
-rw-r--r--databases/mysql55-server/Makefile8
-rw-r--r--databases/mysql55-server/distinfo2
-rw-r--r--databases/mysql55-server/files/patch-ab26
-rw-r--r--databases/mysql55-server/pkg-plist2
-rw-r--r--databases/mysql60-client/Makefile8
-rw-r--r--databases/mysql60-server/Makefile8
-rw-r--r--databases/mysql60-server/distinfo2
-rw-r--r--databases/mysql60-server/files/patch-ab26
-rw-r--r--databases/mysql60-server/pkg-plist2
-rw-r--r--databases/percona55-client/Makefile8
-rw-r--r--databases/percona55-server/Makefile8
-rw-r--r--databases/percona55-server/distinfo2
-rw-r--r--databases/percona55-server/files/patch-ab26
-rw-r--r--databases/percona55-server/pkg-plist2
50 files changed, 230 insertions, 230 deletions
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/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/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
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/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/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-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/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-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/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql323-server/files/patch-ab
+++ b/databases/mysql323-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/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-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
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/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/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-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/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-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/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql40-server/files/patch-ab
+++ b/databases/mysql40-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/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-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
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/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/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-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/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-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/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql41-server/files/patch-ab
+++ b/databases/mysql41-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/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-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
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/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/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-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/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-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/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql50-server/files/patch-ab
+++ b/databases/mysql50-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/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-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
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/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/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-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/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-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/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql51-server/files/patch-ab
+++ b/databases/mysql51-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/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-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
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/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/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-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/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-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/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql54-server/files/patch-ab
+++ b/databases/mysql54-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/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-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
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/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/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-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/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-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/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql55-server/files/patch-ab
+++ b/databases/mysql55-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/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-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
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/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/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-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/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-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/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/mysql60-server/files/patch-ab
+++ b/databases/mysql60-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/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-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
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/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/percona55-server/Makefile b/databases/percona55-server/Makefile
index 246b74d1bce1..d5e78d087dcf 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-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/percona55-server/distinfo b/databases/percona55-server/distinfo
index 870f015fa212..9339a6a12bd4 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-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/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab
index 506d72b13a3c..738c18a8a796 100644
--- a/databases/percona55-server/files/patch-ab
+++ b/databases/percona55-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/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 912da0b5fe34..511f80799d51 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-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