diff options
51 files changed, 795 insertions, 390 deletions
diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql322-client/Makefile +++ b/databases/mysql322-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql322-server/distinfo +++ b/databases/mysql322-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql322-server/files/patch-ab +++ b/databases/mysql322-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql322-server/files/patch-ac b/databases/mysql322-server/files/patch-ac new file mode 100644 index 000000000000..f435e9b7dce7 --- /dev/null +++ b/databases/mysql322-server/files/patch-ac @@ -0,0 +1,25 @@ + +From josh@ican.net Wed Jul 2 17:10:11 1997 +Date: Wed, 2 Jul 1997 17:07:20 -0400 +From: Josh Tiefenbach <josh@ican.net> +To: James FitzGibbon <james@ican.net> +Subject: Patch for mysql port + +Here. Satoshi will be satisfied + +-- +Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net + + [ Part 2: "Attached Text" ] + +--- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 ++++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 +@@ -1246,7 +1246,7 @@ + m68*-*-netbsd*) + name=m68000-netbsd + ;; +- i386-*-freebsd2.*) ++ i386-*-freebsd2.* | i386-*-freebsd3.*) + name=i386-freebsd-2.0 + sysincludes=freebsd-2.0 + except="fork lseek sigsuspend sigprocmask" diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql323-client/Makefile +++ b/databases/mysql323-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql323-server/files/patch-ab +++ b/databases/mysql323-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql40-server/files/patch-ab +++ b/databases/mysql40-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql41-server/files/patch-ab +++ b/databases/mysql41-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql50-server/files/patch-ab +++ b/databases/mysql50-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql51-server/files/patch-ab +++ b/databases/mysql51-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql54-server/files/patch-ab +++ b/databases/mysql54-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql55-server/files/patch-ab +++ b/databases/mysql55-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/mysql60-server/files/patch-ab +++ b/databases/mysql60-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 05680d8383d9..199e6bc092fc 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,13 +1,13 @@ # ports collection makefile for: mySQL -# Version required: v3.21.21 +# Version required: v3.21.25-gamma # Date created: 26 Jan 1998 # Whom: Josh Tiefenbach <josh@ican.net> # -# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $ +# $Id: Makefile,v 1.16 1998/02/23 02:55:16 steve Exp $ # -DISTNAME= mysql-3.21.21a-beta -PKGNAME= mysql-3.21.21b +DISTNAME= mysql-3.21.25-gamma +PKGNAME= mysql-3.21.25g CATEGORIES= databases MASTER_SITES= http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \ http://mysql.polaris.ca/Downloads/MySQL-3.21/ \ @@ -31,10 +31,10 @@ pre-install: .if defined(PACKAGE_BUILDING) @ ${RM} -rf /var/db/mysql .endif - @ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version + @ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version post-install: - ${MKDIR} -p ${PREFIX}/share/mysql/mysql + ${MKDIR} ${PREFIX}/share/mysql/mysql ${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql ${PREFIX}/bin/mysql_install_db @ /usr/bin/killall mysqld @@ -50,5 +50,10 @@ post-install: .for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi ${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql .endfor + @if [ ! -f ${PREFIX}/info/dir -a -f /usr/share/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info + @install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index d5bf5effb9ba..19a1f4a2cb2a 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.21.21a-beta.tar.gz) = 1467003ea61b36f940bb59e2e2235bfe +MD5 (mysql-3.21.25-gamma.tar.gz) = 527747b56d03c3b72313a3f27e6ee1c9 diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab index f435e9b7dce7..f939b2e2cbe6 100644 --- a/databases/percona55-server/files/patch-ab +++ b/databases/percona55-server/files/patch-ab @@ -1,25 +1,52 @@ - -From josh@ican.net Wed Jul 2 17:10:11 1997 -Date: Wed, 2 Jul 1997 17:07:20 -0400 -From: Josh Tiefenbach <josh@ican.net> -To: James FitzGibbon <james@ican.net> -Subject: Patch for mysql port - -Here. Satoshi will be satisfied - --- -Josh Tiefenbach - Assistant Gopher - ACC TelEnterprises - josh@ican.net - - [ Part 2: "Attached Text" ] - ---- mit-pthreads/config/configure.orig Wed Jul 2 17:06:00 1997 -+++ mit-pthreads/config/configure Wed Jul 2 17:06:29 1997 -@@ -1246,7 +1246,7 @@ - m68*-*-netbsd*) - name=m68000-netbsd - ;; -- i386-*-freebsd2.*) -+ i386-*-freebsd2.* | i386-*-freebsd3.*) - name=i386-freebsd-2.0 - sysincludes=freebsd-2.0 - except="fork lseek sigsuspend sigprocmask" +--- scripts/mysql_install_db.sh.orig Tue Feb 17 13:18:22 1998 ++++ scripts/mysql_install_db.sh Thu Mar 5 11:16:28 1998 +@@ -3,24 +3,12 @@ + # For a more info consult the file COPYRIGHT distributed with this file + + # This scripts creates the privilige tables db, host, user in mysql +-# It should be run from the top level installation directory + # + # All arguments to this script is passed to safe_mysqld + + if test ! -x @bindir@/mysqladmin + then + echo "Can't execute @bindir@/mysqladmin" +- if test "@localstatedir@" = "./data" +- then +- echo "You should be in the distribution directory when executing this script" +- else +- echo "You should do a 'make install' before executing this script" +- fi +- exit 1 +-fi +-if test ! -d "./data" +-then +- echo "You should be in the distribution directory when executing this script" + exit 1 + fi + +@@ -78,10 +66,7 @@ + + # copy the definition files + # +-if test "@localstatedir@" != "./data" +-then +- cp -p ./data/mysql/*.frm @localstatedir@/mysql +-fi ++cp @pkgdatadir@/mysql/*.frm @localstatedir@/mysql + + @bindir@/mysql mysql <<END_OF_DATA + # Create tables from the .frm files +@@ -122,11 +107,7 @@ + echo + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo +- echo "You can test the MySQL demon with the benchmarks in the 'bench'" +- echo "directory:" +- echo "cd bench ; run-all-tests" +- echo +- echo "You can also try the mysql command line tool with:" ++ echo "You can test the MySQL daemon with the mysql command line tool:" + echo "@bindir@/mysql test" + echo + echo "Plese report any problems with the @scriptdir@/mysqlbug script!" diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index c79a7bae346d..d75768928c46 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -30,7 +30,7 @@ include/mysql/mysql_com.h include/mysql/mysql_version.h @unexec install-info --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir +@exec [ ! -f %D/info/dir -a -f /usr/share/info/dir ] && sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libdbug.a lib/mysql/libheap.a @@ -58,6 +58,7 @@ share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt share/mysql/mysql/db.frm +share/mysql/mysql/func.frm share/mysql/mysql/host.frm share/mysql/mysql/user.frm share/mysql/norwegian-ny/errmsg.sys |