summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mysql4-client/Makefile3
-rw-r--r--databases/mysql4-client/Makefile.common8
-rw-r--r--databases/mysql4-client/PLIST3
-rw-r--r--databases/mysql4-client/buildlink3.mk4
-rw-r--r--databases/mysql4-client/distinfo6
-rw-r--r--databases/mysql4-server/Makefile3
-rw-r--r--databases/mysql4-server/distinfo6
-rw-r--r--doc/CHANGES4
-rw-r--r--doc/TODO3
9 files changed, 20 insertions, 20 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile
index 6397e9d80c1..58efb72d949 100644
--- a/databases/mysql4-client/Makefile
+++ b/databases/mysql4-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/05/14 10:53:29 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/06/20 18:48:44 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 1
SVR4_PKGNAME= mysqc
COMMENT= MySQL 4, a free SQL database (client)
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index d0d8680d2d3..4c2a8a2f36d 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.8 2004/05/14 11:38:54 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2004/06/20 18:48:44 xtraeme Exp $
-DISTNAME= mysql-4.0.18
+DISTNAME= mysql-4.0.20
CATEGORIES= databases
MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
@@ -27,8 +27,8 @@ MYSQL_DATADIR?= /var/mysql
MYSQL_CHARSET?= latin1
MYSQL_EXTRA_CHARSET?= all
-USE_BUILDLINK3= YES
-GNU_CONFIGURE= # defined
+USE_BUILDLINK3= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR}
CONFIGURE_ARGS+= --with-named-z-libs=z
CONFIGURE_ARGS+= --without-libwrap
diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST
index 2d6fe504806..1506d55f6b0 100644
--- a/databases/mysql4-client/PLIST
+++ b/databases/mysql4-client/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/02 10:57:13 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/06/20 18:48:44 xtraeme Exp $
+bin/make_win_binary_distribution
bin/make_win_src_distribution
bin/msql2mysql
bin/mysql
diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk
index ef6c92dd338..d9752c47419 100644
--- a/databases/mysql4-client/buildlink3.mk
+++ b/databases/mysql4-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/22 14:31:35 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/06/20 18:48:44 xtraeme Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= mysql-client
.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.mysql-client+= mysql-client>=4.0.18nb1
-BUILDLINK_RECOMMENDED.mysql-client?= mysql-client>=4.0.18nb1
+BUILDLINK_RECOMMENDED.mysql-client?= mysql-client>=4.0.20
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql4-client
BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
.endif # MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo
index 3a12d52dc5c..4836bbe6baf 100644
--- a/databases/mysql4-client/distinfo
+++ b/databases/mysql4-client/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/03/07 19:42:50 martti Exp $
+$NetBSD: distinfo,v 1.3 2004/06/20 18:48:44 xtraeme Exp $
-SHA1 (mysql-4.0.18.tar.gz) = 101f199faead0d22d2da2b1ac82b8c071aa987a8
-Size (mysql-4.0.18.tar.gz) = 13422686 bytes
+SHA1 (mysql-4.0.20.tar.gz) = e60d11b14ea97f3b95cd50e2c46cb664f729e3d8
+Size (mysql-4.0.20.tar.gz) = 13807983 bytes
SHA1 (patch-af) = 258c09335a9d675cf2367afc33f5ea0713a0b3fd
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 8f92f864118..dbb677fe019 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/05/14 10:53:29 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/06/20 18:48:44 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 2
SVR4_PKGNAME= mysqs
COMMENT= MySQL 4, a free SQL database (server)
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index f3627c53205..cfbfe7fcd0a 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/03/13 12:09:37 recht Exp $
+$NetBSD: distinfo,v 1.5 2004/06/20 18:48:44 xtraeme Exp $
-SHA1 (mysql-4.0.18.tar.gz) = 101f199faead0d22d2da2b1ac82b8c071aa987a8
-Size (mysql-4.0.18.tar.gz) = 13422686 bytes
+SHA1 (mysql-4.0.20.tar.gz) = e60d11b14ea97f3b95cd50e2c46cb664f729e3d8
+Size (mysql-4.0.20.tar.gz) = 13807983 bytes
SHA1 (patch-aa) = 3c10d0921336b5f7aea5033c3d4a33d3e11a894e
SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac
SHA1 (patch-af) = 038b5d570265e1f821de6502d05f94225eba5672
diff --git a/doc/CHANGES b/doc/CHANGES
index 5725902ad2d..1604fbb7184 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6233 2004/06/20 18:43:26 xtraeme Exp $
+$NetBSD: CHANGES,v 1.6234 2004/06/20 18:48:44 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -2965,3 +2965,5 @@ Changes to the packages collection and infrastructure in 2004:
Updated pax to 20040620 [grant 2004-06-20]
Updated cvsync to 0.24.16 [gehenna 2004-06-20]
Updated vlc to 0.7.2 [xtraeme 2004-06-20]
+ Updated mysql4-server to 4.0.20 [xtraeme 2004-06-20]
+ Updated mysql4-client to 4.0.20 [xtraeme 2004-06-20]
diff --git a/doc/TODO b/doc/TODO
index 853b3c12b5f..23ff915324d 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.1840 2004/06/20 18:43:26 xtraeme Exp $
+$NetBSD: TODO,v 1.1841 2004/06/20 18:48:44 xtraeme Exp $
Suggested new packages
======================
@@ -319,7 +319,6 @@ Suggested package updates
o mrproject-0.9.1
o multi-gnome-terminal-1.6.2
o multitail-3.2.1
- o mysql-4.0.20 [xtraeme]
o namazu-2.0.13
o nano-1.2.3
o nap-1.5.2