Index: head/databases/mysql40-scripts/Makefile
===================================================================
--- head/databases/mysql40-scripts/Makefile	(revision 109422)
+++ head/databases/mysql40-scripts/Makefile	(revision 109423)
@@ -1,21 +1,20 @@
 # New ports collection makefile for:    MySQL-scripts
 # Date created:         Mon Feb 23 15:01:35 CET 2004
 # Whom:                 Alex Dupre <ale@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mysql
-PORTREVISION=	0
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
 
 MASTERDIR=	${.CURDIR}/../mysql40-server
 
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.scripts
 
 SCRIPTS_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/databases/mysql40-scripts/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/mysql40-server/Makefile
===================================================================
--- head/databases/mysql40-server/Makefile	(revision 109422)
+++ head/databases/mysql40-server/Makefile	(revision 109423)
@@ -1,222 +1,230 @@
 # New ports collection makefile for:    MySQL-server
 # Date created:         Sun Mar 3 12:20:35 CET 2002
 # Whom:                 Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.0.18
-PORTREVISION?=	1
+PORTVERSION=	4.0.20
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \
 		ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \
 		http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \
 		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.mysql.cz/Downloads/MySQL-4.0/ \
 		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \
+		http://mysql.proserve.nl/Downloads/MySQL-4.0/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 SLAVEDIRS=	databases/mysql40-client
 PKGINSTALL?=	${WRKDIR}/pkg-install
 DB_DIR?=	/var/db/mysql
 USE_GNOME=	lthack
 USE_LIBTOOL_VER=	13
 USE_REINPLACE=	yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-debug \
 		--without-readline \
 		--without-bench \
 		--without-extra-tools \
 		--with-libwrap \
 		--with-mysqlfs \
 		--with-vio \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
 		--enable-thread-safe-client
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
 .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
 .if defined(WITH_OPENSSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
 .endif
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
 CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
 .if ${OSVERSION} > 500000
 LIB_DEPENDS+=	lthread.3:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
 .else
 LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .else
 CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 
 .if ${OSVERSION} < 500000
 CXX=		${CC}
 .endif
 .if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 .if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3))
 CFLAGS+=	-fno-gcse
 .endif
 .endif
 CXXFLAGS+=	${CFLAGS} -felide-constructors -fno-rtti
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	40
 
 LATEST_LINK=	mysql40-server
 
 CONFLICTS=	mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
 
 PLIST_SUB=	DB_DIR=${DB_DIR} \
 		MYSQL_VERSION=${PORTVERSION}
 
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
 
 DOCS=		manual.html manual.txt manual_toc.html
 
 INFO=		mysql
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
 	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
 	@${ECHO} "				(default is /var/db/mysql)."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
+	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
+	@${ECHO} "				(try it if you use libpthread)."
 	@${ECHO} "	OVERWRITE_DB=yes	Re-initialize default databases."
 	@${ECHO} "	BUILD_OPTIMIZED=yes	Enable compiler optimizations"
 	@${ECHO} "				(use it if you need speed)."
 	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
 	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
+.if defined(WITH_PROC_SCOPE_PTH)
+	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/libmysqld/lib_sql.cc ${WRKSRC}/sql/mysqld.cc
+.endif
 
 post-build:
 	@${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
 	@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
 	@${FALSE}
 .endif
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
 .if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no"
 	@${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true
 .endif
 .if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 	${PREFIX}/bin/mysql_install_db --ldata=${DB_DIR}
 .endif
 	@${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh
 	@${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/Flags
 .for doc in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
 .endif
 
 .else
 # MySQL-Client part
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql40-client
 
 CONFLICTS=	mysql-client-3.* mysql-client-4.[1-9].* mysql-client-5.*
 
 MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+.if defined(WITH_PROC_SCOPE_PTH)
+	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
+.endif
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
 	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh
 
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	40
 USE_PERL5=	yes
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql40
 
 LATEST_LINK=	mysql40-scripts
 
 CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.[1-9].* mysql-scripts-5.*
 
 MAN1=		mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1
 
 SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 		mysql_secure_installation mysql_zap mysqlaccess \
 		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
 		mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts man|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 .endif
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/mysql40-server/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.184
\ No newline at end of property
+1.185
\ No newline at end of property
Index: head/databases/mysql40-server/distinfo
===================================================================
--- head/databases/mysql40-server/distinfo	(revision 109422)
+++ head/databases/mysql40-server/distinfo	(revision 109423)
@@ -1,2 +1,2 @@
-MD5 (mysql-4.0.18.tar.gz) = 702151a3e21d9e5f32e8850032aefdad
-SIZE (mysql-4.0.18.tar.gz) = 13422686
+MD5 (mysql-4.0.20.tar.gz) = 7c75ac74e23396bd228dbc2c2d1131df
+SIZE (mysql-4.0.20.tar.gz) = 13807983

Property changes on: head/databases/mysql40-server/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.75
\ No newline at end of property
+1.76
\ No newline at end of property
Index: head/databases/mysql40-server/files/patch-scripts::mysql_install_db.sh
===================================================================
--- head/databases/mysql40-server/files/patch-scripts::mysql_install_db.sh	(revision 109422)
+++ head/databases/mysql40-server/files/patch-scripts::mysql_install_db.sh	(nonexistent)
@@ -1,22 +0,0 @@
---- scripts/mysql_install_db.sh.orig	Thu Mar 11 10:20:57 2004
-+++ scripts/mysql_install_db.sh	Thu Mar 11 10:27:09 2004
-@@ -118,7 +118,7 @@
-   if [ $? -ne 0 ]
-   then
-     resolved=`$bindir/resolveip localhost 2>&1`
--    if [ $? -eq 0 ]
-+    if [ $? -ne 0 ]
-     then
-       echo "Neither host '$hostname' and 'localhost' could not be looked up with"
-       echo "$bindir/resolveip"
-@@ -128,8 +128,8 @@
-       exit 1
-     fi
-     echo "WARNING: The host '$hostname' could not be looked up with resolveip."
--    echo "This probably means that your libc libraries are not 100 % compatible"
--    echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
-+    echo "This probably means that your host name is not listed in your"
-+    echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work"
-     echo "normally with the exception that host name resolving will not work."
-     echo "This means that you should use IP addresses instead of hostnames"
-     echo "when specifying MySQL privileges !"

Property changes on: head/databases/mysql40-server/files/patch-scripts::mysql_install_db.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/databases/mysql40-server/files/patch-configure
===================================================================
--- head/databases/mysql40-server/files/patch-configure	(revision 109422)
+++ head/databases/mysql40-server/files/patch-configure	(revision 109423)
@@ -1,75 +1,76 @@
---- configure.orig	Fri Oct 17 07:29:41 2003
-+++ configure	Wed Oct 22 15:12:52 2003
-@@ -9058,7 +9059,7 @@
-   ;;
- esac
- fi
--HOSTNAME=$ac_cv_path_HOSTNAME
-+HOSTNAME="$ac_cv_path_HOSTNAME -s"
+--- configure.orig	Tue May 18 11:12:39 2004
++++ configure	Tue May 18 11:14:27 2004
+@@ -18816,9 +18816,6 @@
  
- if test -n "$HOSTNAME"; then
-   echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9250,43 +9251,8 @@
+ 
+ 
+-# Ensure that we have --preserve-dup-deps defines, otherwise we get link
+-# problems of 'mysql' with CXX=g++
+-LIBTOOL="$LIBTOOL --preserve-dup-deps"
+ 
+ #AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
+ 
+@@ -19970,43 +19967,8 @@
  echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
  echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
 -then
 -  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
 -# Solaris
 -elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
 -then
 -  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
  # BSD style
 -elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null
 -then
    FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -# SysV style
 -elif $PS -ef 2> /dev/null | grep $0 > /dev/null
 -then
 -  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -# Do anybody use this?
 -elif $PS $$ 2> /dev/null | grep $0 > /dev/null
 -then
 -  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"
 -else
 -  case $SYSTEM_TYPE in
 -    *darwin*)
 -      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
 -    *cygwin*)
 -      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
 -    *netware* | *modesto*)
 -      FIND_PROC=
 -      ;;
 -    *)
 -      { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5
 -echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;}
 -   { (exit 1); exit 1; }; }
 -  esac
 -fi
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12667,8 +12633,8 @@
+@@ -23603,8 +23565,8 @@
  # Some system specific hacks
  #
  
 -MAX_C_OPTIMIZE="-O3"
 -MAX_CXX_OPTIMIZE="-O3"
 +MAX_C_OPTIMIZE=""
 +MAX_CXX_OPTIMIZE=""
  
  case $SYSTEM_TYPE in
    *solaris2.7*)
-@@ -22458,7 +22424,7 @@
+@@ -33605,7 +33567,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
 -    if test "x$enable_dependency_tracking" == xno
 +    if test "x$enable_dependency_tracking" = xno
      then
        innodb_conf_flags=--disable-dependency-tracking
      fi

Property changes on: head/databases/mysql40-server/files/patch-configure
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/databases/mysql40-server/files/patch-scripts::Makefile.in
===================================================================
--- head/databases/mysql40-server/files/patch-scripts::Makefile.in	(revision 109422)
+++ head/databases/mysql40-server/files/patch-scripts::Makefile.in	(revision 109423)
@@ -1,37 +1,38 @@
---- scripts/Makefile.in.orig	Mon Feb 23 13:02:34 2004
-+++ scripts/Makefile.in	Mon Feb 23 13:04:46 2004
-@@ -271,24 +271,7 @@
+--- scripts/Makefile.in.orig	Fri May 14 02:54:11 2004
++++ scripts/Makefile.in	Tue May 18 10:22:57 2004
+@@ -271,25 +271,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
 -			mysql_fix_privilege_tables \
 -                        mysql_fix_extensions \
 -			mysql_setpermission \
 -			mysql_secure_installation \
 -			mysql_zap \
 -			mysqlaccess \
 -			mysqlbug \
 -			mysql_convert_table_format \
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
 -			mysql_explain_log \
 -			mysql_tableinfo \
 -			mysqld_multi \
--			make_win_src_distribution
+-			make_win_src_distribution \
+-			make_win_binary_distribution
 +bin_SCRIPTS =
  
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -463,7 +446,7 @@
+@@ -465,7 +447,7 @@
  uninstall: uninstall-am
  
  install-am: all-am
 -	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
  
  installcheck: installcheck-am
  install-strip:

Property changes on: head/databases/mysql40-server/files/patch-scripts::Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property