aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2006-11-28 15:24:17 +0800
committerale <ale@FreeBSD.org>2006-11-28 15:24:17 +0800
commit2029581dfd0a8d3efbe6f80ef5dc9c78bc0c20a7 (patch)
tree9a58974f76e85d7a68a2531c0c6f928f7d6c3fa9 /databases
parent6146efc317b49f191a0657c52d3a1870da275487 (diff)
downloadfreebsd-ports-gnome-2029581dfd0a8d3efbe6f80ef5dc9c78bc0c20a7.tar.gz
freebsd-ports-gnome-2029581dfd0a8d3efbe6f80ef5dc9c78bc0c20a7.tar.zst
freebsd-ports-gnome-2029581dfd0a8d3efbe6f80ef5dc9c78bc0c20a7.zip
Update to 4.1.22 release and fix the long standing ORDER BY bug.
Requested by: many
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql41-client/Makefile1
-rw-r--r--databases/mysql41-scripts/Makefile1
-rw-r--r--databases/mysql41-server/Makefile6
-rw-r--r--databases/mysql41-server/distinfo6
-rw-r--r--databases/mysql41-server/files/patch-man::Makefile.in10
5 files changed, 13 insertions, 11 deletions
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index c7f06b1749e1..7362acc9af88 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= mysql
-PORTREVISION= 0
PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql41-scripts/Makefile b/databases/mysql41-scripts/Makefile
index 32a8ac6a78b8..c17cb4d517e2 100644
--- a/databases/mysql41-scripts/Makefile
+++ b/databases/mysql41-scripts/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= mysql
-PORTREVISION= 0
PKGNAMESUFFIX= -scripts
COMMENT= Multithreaded SQL database (scripts)
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 4efd8082027e..f3be28ab446c 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mysql
-PORTVERSION= 4.1.21
+PORTVERSION= 4.1.22
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -120,6 +120,8 @@ PLIST_SUB+= NDB="@comment "
MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
mysqld_safe.1 mysql.server.1 perror.1 replace.1
+MAN8= mysqld.8
+
INFO= mysql
pre-fetch:
@@ -146,7 +148,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+ @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
.if defined(WITH_PROC_SCOPE_PTH)
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 2dd60e15e9a7..b7e9ff67dd5d 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-4.1.21.tar.gz) = d3e0127078981590095d331d4e745d73
-SHA256 (mysql-4.1.21.tar.gz) = 43a23ab44fdbd4893e1f5076a2f7fa1540afbaa617e772202099acd24af0e3c5
-SIZE (mysql-4.1.21.tar.gz) = 17624947
+MD5 (mysql-4.1.22.tar.gz) = 37b4479951fa0cf052269d27c41ca200
+SHA256 (mysql-4.1.22.tar.gz) = 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
+SIZE (mysql-4.1.22.tar.gz) = 17761101
diff --git a/databases/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
index 2d85a21801df..e9972576782d 100644
--- a/databases/mysql41-server/files/patch-man::Makefile.in
+++ b/databases/mysql41-server/files/patch-man::Makefile.in
@@ -1,11 +1,13 @@
---- man/Makefile.in.orig Thu Dec 22 16:04:55 2005
-+++ man/Makefile.in Thu Dec 22 16:05:21 2005
-@@ -321,7 +321,7 @@
+--- man/Makefile.in.orig Fri Nov 3 03:18:34 2006
++++ man/Makefile.in Mon Nov 27 23:01:29 2006
+@@ -327,8 +327,8 @@
vio_dir = @vio_dir@
vio_libs = @vio_libs@
zlib_dir = @zlib_dir@
-man1_MANS = @man1_files@
+-man8_MANS = @man8_files@
+man1_MANS =
- EXTRA_DIST = $(man1_MANS)
++man8_MANS =
+ EXTRA_DIST = $(man1_MANS) $(man8_MANS)
all: all-am