diff options
60 files changed, 360 insertions, 310 deletions
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql322-client/Makefile +++ b/databases/mysql322-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql322-server/distinfo +++ b/databases/mysql322-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql322-server/files/patch-ab +++ b/databases/mysql322-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql322-server/files/patch-af b/databases/mysql322-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql322-server/files/patch-af +++ b/databases/mysql322-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql323-client/Makefile +++ b/databases/mysql323-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql323-server/files/patch-ab +++ b/databases/mysql323-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql323-server/files/patch-af +++ b/databases/mysql323-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql40-server/files/patch-ab +++ b/databases/mysql40-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql40-server/files/patch-af +++ b/databases/mysql40-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql41-server/files/patch-ab +++ b/databases/mysql41-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql41-server/files/patch-af +++ b/databases/mysql41-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql50-server/files/patch-ab +++ b/databases/mysql50-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql50-server/files/patch-af +++ b/databases/mysql50-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql51-server/files/patch-ab +++ b/databases/mysql51-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql51-server/files/patch-af +++ b/databases/mysql51-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql54-server/files/patch-ab +++ b/databases/mysql54-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql54-server/files/patch-af +++ b/databases/mysql54-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql55-server/files/patch-ab +++ b/databases/mysql55-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql55-server/files/patch-af +++ b/databases/mysql55-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/mysql60-server/files/patch-ab +++ b/databases/mysql60-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/mysql60-server/files/patch-af +++ b/databases/mysql60-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.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 b88d17bd6b35..246b74d1bce1 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index b88d17bd6b35..246b74d1bce1 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: MySQL -# Version required: v3.22.11-beta +# Version required: v3.22.13-beta # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.36 1998/12/22 18:01:41 dirk Exp $ +# $Id: Makefile,v 1.37 1998/12/23 19:36:43 obrien Exp $ # -DISTNAME= mysql-3.22.11-beta -PKGNAME= mysql-3.22.11b +DISTNAME= mysql-3.22.13-beta +PKGNAME= mysql-3.22.13b 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 -BROKEN='fetch -- 3.22.13-beta is the current distfile' - MANUAL_PACKAGE_BUILD= incompatible with mysql321 NO_LATEST_LINK= yes MAN1= mysql.1 diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 2caea3458add..870f015fa212 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59 +MD5 (mysql-3.22.13-beta.tar.gz) = 5ec2213c624753165a3ed0bbd55fc6d1 diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab index bd7b2aff7375..506d72b13a3c 100644 --- a/databases/percona55-server/files/patch-ab +++ b/databases/percona55-server/files/patch-ab @@ -1,29 +1,38 @@ ---- scripts/mysql_install_db.sh.orig Sun Nov 22 04:57:20 1998 -+++ scripts/mysql_install_db.sh Sun Dec 6 23:58:49 1998 -@@ -10,8 +10,8 @@ +--- 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 - mdata=@localstatedir@/mysql - --# Are we are doing a rpm install? +-# 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 -@@ -31,12 +31,9 @@ +@@ -27,8 +27,6 @@ + fi + fi + +-# On IRIX hostname is in /usr/bsd so add this to the path +-PATH=$PATH:/usr/bsd hostname=`hostname` # Install this too in the user table + # Check if hostname is valid +@@ -44,12 +42,9 @@ + fi + # Create database directories mysql & test -if test -z "$IN_RPM" -then -- if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -- if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -- if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 -fi -+if test ! -d @localstatedir@; then mkdir @localstatedir@; fi -+if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi -+if test ! -d @localstatedir@/test; then mkdir @localstatedir@/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 # Initialize variables c_d="" i_d="" diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af index 9318e20d9f0a..c9dfae350bef 100644 --- a/databases/percona55-server/files/patch-af +++ b/databases/percona55-server/files/patch-af @@ -1,11 +1,11 @@ ---- scripts/safe_mysqld.sh.orig Wed Nov 4 13:21:22 1998 -+++ scripts/safe_mysqld.sh Tue Nov 10 16:59:51 1998 +--- scripts/safe_mysqld.sh.orig Fri Nov 27 00:37:54 1998 ++++ scripts/safe_mysqld.sh Wed Dec 23 23:45:24 1998 @@ -12,33 +12,9 @@ trap '' 1 2 3 15 # we shouldn't let anyone kill us -# Check if we are starting this relative (for the binary release) --if test -f ./data/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \ +-if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \ - -x ./bin/mysqld -then - MY_BASEDIR_VERSION=`pwd` # Where bin, share and data is diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index b93c0dc373d1..912da0b5fe34 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -37,7 +37,7 @@ lib/mysql/libmerge.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.5 +lib/mysql/libmysqlclient.so.5.2 lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a @@ -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.11-beta.spec +share/mysql/mysql-3.22.13-beta.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys |