From 4e40e94cc8bb5c1fd40f5b8d1bc67acd6e5ce746 Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Tue, 6 Apr 1999 22:28:44 +0000
Subject: - upgrade to 3.22.21 - pass ${CONFIGURE_ARGS} to mit-pthreads
 configure

---
 databases/mysql60-server/Makefile              |  7 ++++---
 databases/mysql60-server/distinfo              |  2 +-
 databases/mysql60-server/files/patch-configure | 13 +++++++++++--
 databases/mysql60-server/pkg-plist             |  3 ++-
 4 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'databases/mysql60-server')

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 308633a4280e..27b3d622217e 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.45 1999/03/11 20:33:49 scrappy Exp $
+# $Id: Makefile,v 1.46 1999/03/22 23:43:41 dirk Exp $
 #
 
-DISTNAME=	mysql-3.22.20a
+DISTNAME=	mysql-3.22.21
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}"
+		CXXFLAGS="${CFLAGS}" \
+		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index b06a0450cd57..dcf757922321 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.20a.tar.gz) = fae2afa3ac8d9cc2dced5955d139c922
+MD5 (mysql-3.22.21.tar.gz) = 290b586a47de28f9bb4831f7d80a932f
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index 26a6ce1c6fc7..0f4d1b00d253 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Wed Jan 27 14:41:59 1999
-+++ configure	Thu Feb  4 19:50:16 1999
+--- configure.orig	Mon Apr  5 01:46:35 1999
++++ configure	Tue Apr  6 23:08:43 1999
 @@ -2199,30 +2199,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
  echo "configure:2201: checking "how to check if pid exists"" >&5
@@ -56,3 +56,12 @@
  fi
  
  # Force static compilation to avoid linking probles/get more speed
+@@ -7004,7 +6971,7 @@
+     echo ""
+     echo "Configuring MIT Pthreads"
+     # We will never install so installation paths are not needed.
+-    (cd mit-pthreads; sh ./configure)
++    (cd mit-pthreads; sh ./configure ${CONFIGURE_ARGS})
+     echo "End of MIT Pthreads configuration"
+     echo ""
+   fi
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 44474bf37664..915d928abf28 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -22,6 +22,7 @@ include/mysql/dbug.h
 include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
+include/mysql/my_list.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
@@ -69,7 +70,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.20a.spec
+share/mysql/mysql-3.22.21.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
-- 
cgit v1.2.3