diff options
Diffstat (limited to 'databases')
50 files changed, 450 insertions, 50 deletions
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql322-server/distinfo +++ b/databases/mysql322-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql322-server/files/patch-ab +++ b/databases/mysql322-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql322-server/files/patch-ap b/databases/mysql322-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql322-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql323-server/distinfo +++ b/databases/mysql323-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql323-server/files/patch-ab +++ b/databases/mysql323-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql323-server/files/patch-ap b/databases/mysql323-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql323-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql40-server/files/patch-ab +++ b/databases/mysql40-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql40-server/files/patch-ap b/databases/mysql40-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql40-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql41-server/files/patch-ab +++ b/databases/mysql41-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql41-server/files/patch-ap b/databases/mysql41-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql41-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql50-server/files/patch-ab +++ b/databases/mysql50-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql50-server/files/patch-ap b/databases/mysql50-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql50-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql51-server/files/patch-ab +++ b/databases/mysql51-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql51-server/files/patch-ap b/databases/mysql51-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql51-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql54-server/files/patch-ab +++ b/databases/mysql54-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql54-server/files/patch-ap b/databases/mysql54-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql54-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql55-server/files/patch-ab +++ b/databases/mysql55-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql55-server/files/patch-ap b/databases/mysql55-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql55-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/mysql60-server/files/patch-ab +++ b/databases/mysql60-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/mysql60-server/files/patch-ap b/databases/mysql60-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/mysql60-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 551928682032..cdf6674d969d 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -DISTNAME= mysql-3.22.25 +DISTNAME= mysql-3.22.26a PKGNAME?= ${DISTNAME:S/-/-server-/} CATEGORIES= databases MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \ @@ -31,6 +31,9 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ --without-bench +.if ${MACHINE_ARCH} == "i386" +CONFIGURE_ARGS+=--enable-assembler +.endif CONFIGURE_ENV+= PERL=${PERL} \ PERL5=${PERL} \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ @@ -92,6 +95,10 @@ pre-fetch: @${ECHO} .endif +post-patch: + ${MV} ${WRKSRC}/strings/strings.s ${WRKSRC}/strings/strings.S + ${MV} ${WRKSRC}/strings/longlong2str-x86.s ${WRKSRC}/strings/longlong2str-x86.S + pre-install: .if !defined(PACKAGE_BUILDING) && exists(${DB_DIR}) && !defined(OVERWRITE_DB) @${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}." diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index a9fd4ce305d0..9963725622c1 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-3.22.25.tar.gz) = 6600933f468abb9a1db8e7c86e928d5d +MD5 (mysql-3.22.26a.tar.gz) = 84805a31df5fc2f14da0757807455c8c diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab index 52b6b394986d..04825c3dc4b1 100644 --- a/databases/percona55-server/files/patch-ab +++ b/databases/percona55-server/files/patch-ab @@ -1,5 +1,5 @@ ---- scripts/mysql_install_db.sh.orig Mon Mar 1 20:08:17 1999 -+++ scripts/mysql_install_db.sh Thu Mar 4 22:05:57 1999 +--- scripts/mysql_install_db.sh.orig Sat Aug 28 13:10:54 1999 ++++ scripts/mysql_install_db.sh Mon Sep 13 00:13:04 1999 @@ -15,10 +15,6 @@ force=0 IN_RPM=0 @@ -20,3 +20,16 @@ hostname=`hostname` # Install this too in the user table # Check if hostname is valid +@@ -255,12 +249,6 @@ + END_OF_DATA + then + echo "" +- if test "$IN_RPM" -eq 0 +- then +- echo "To start mysqld at boot time you have to copy support-files/mysql.server" +- echo "to the right place for your system" +- echo +- fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" + echo "This is done with:" + echo "$bindir/mysqladmin -u root password 'new-password'" diff --git a/databases/percona55-server/files/patch-ap b/databases/percona55-server/files/patch-ap new file mode 100644 index 000000000000..f42968f78ee6 --- /dev/null +++ b/databases/percona55-server/files/patch-ap @@ -0,0 +1,11 @@ +--- strings/Makefile.in.orig Thu Sep 9 10:52:02 1999 ++++ strings/Makefile.in Sun Sep 12 23:56:25 1999 +@@ -143,7 +143,7 @@ + pkglib_LIBRARIES = libmystrings.a + # These file MUST all be on the same line!! Otherwise automake + # generats a very broken makefile +-@ASSEMBLER_TRUE@ESRCS = strings.s longlong2str-x86.s ++@ASSEMBLER_TRUE@ESRCS = strings.S longlong2str-x86.S + @ASSEMBLER_FALSE@ESRCS = strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c + + libmystrings_a_SOURCES = bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c ct_init.c atof.c ptr_cmp.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c @CHARSET_SRCS@ $(ESRCS) diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 4b4e2fecc092..b717c8c84bd5 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -2,6 +2,7 @@ bin/comp_err bin/isamchk bin/isamlog bin/msql2mysql +bin/mysql_find_rows bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_setpermission @@ -28,6 +29,7 @@ share/doc/mysql/Img/austria.gif share/doc/mysql/Img/bulgaria.gif share/doc/mysql/Img/canada.gif share/doc/mysql/Img/chile.gif +share/doc/mysql/Img/china.gif share/doc/mysql/Img/croatia.gif share/doc/mysql/Img/czech-republic.gif share/doc/mysql/Img/denmark.gif @@ -37,6 +39,7 @@ share/doc/mysql/Img/france.gif share/doc/mysql/Img/germany.gif share/doc/mysql/Img/great-britain.gif share/doc/mysql/Img/greece.gif +share/doc/mysql/Img/html-fs.gif share/doc/mysql/Img/hungary.gif share/doc/mysql/Img/israel.gif share/doc/mysql/Img/italy.gif @@ -67,14 +70,20 @@ share/doc/mysql/manual_toc.html share/mysql/binary-configure share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt +share/mysql/danish/errmsg.sys +share/mysql/danish/errmsg.txt share/mysql/dutch/errmsg.sys share/mysql/dutch/errmsg.txt share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt +share/mysql/estonia/errmsg.sys +share/mysql/estonia/errmsg.txt share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys share/mysql/german/errmsg.txt +share/mysql/greek/errmsg.sys +share/mysql/greek/errmsg.txt share/mysql/hungarian/errmsg.sys share/mysql/hungarian/errmsg.txt share/mysql/italian/errmsg.sys @@ -85,7 +94,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.25.spec +share/mysql/mysql-3.22.26a.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys |