o Update to 4.1.1 alpha release.

o Sync with mysql40 port changes. o Make portlint clean. PR: ports/60119 Submitted by: Alex Dupre <sysadmin@alexdupre.com> (maintainer)
author: nork <nork@FreeBSD.org> 2003-12-11 23:58:26 +0800
committer: nork <nork@FreeBSD.org> 2003-12-11 23:58:26 +0800
commit: 25d385dcf794ac6c3ec923cbfa491d151f0661eb (patch)
tree: 5f31319e0c6d2998f3824300bc6ed17e7f763a58 /databases
parent: 84cda61feb83da4923d730f1c4067db597363744 (diff)
download: freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.tar.gz
freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.tar.zst
freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.zip
42 files changed, 770 insertions, 854 deletions
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql41-server/files/patch-configure
+++ b/databases/mysql41-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql41-server/pkg-plist.client
+++ b/databases/mysql41-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql50-server/files/patch-Makefile.in
+++ b/databases/mysql50-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql50-server/files/patch-configure
+++ b/databases/mysql50-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql50-server/pkg-plist.client
+++ b/databases/mysql50-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql51-server/files/patch-Makefile.in
+++ b/databases/mysql51-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql54-server/files/patch-Makefile.in
+++ b/databases/mysql54-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql55-server/files/patch-Makefile.in
+++ b/databases/mysql55-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ b/databases/mysql60-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 6e2f0dcb458..eaadc749b40 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.0
-PORTREVISION?=	1
+PORTVERSION=	4.1.1
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \
-		http://mysql.tzone.it/Downloads/MySQL-4.1/ \
-		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \
@@ -52,11 +50,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
 .if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
 CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .endif
@@ -70,8 +63,11 @@ CONFIGURE_ARGS+=--with-openssl
 .if defined(BUILD_STATIC)
 CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=i686
+
+.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
@@ -79,23 +75,27 @@ 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
+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
+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
 .endif
 
+.if ${OSVERSION} < 500000
+CXX=		${CC}
+.endif
+.if defined(BUILD_OPTIMIZED)
 CFLAGS+=	-O3 -fno-omit-frame-pointer
-CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
-
+.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
-.if ${OSVERSION} < 500000
-CXX=		${CC}
-.endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
@@ -104,12 +104,12 @@ USE_PERL5_RUN=	yes
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql41-client \
 		${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-alpha
-
 ONLY_FOR_ARCHS=	i386 alpha sparc64
 
 DOCS=		manual.html manual.txt manual_toc.html
 
+INFO=		mysql
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
@@ -124,14 +124,17 @@ pre-fetch:
 	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional DNS"
 	@${ECHO} "				reverse lookup  before inserting local"
 	@${ECHO} "				hostname into mysql database"
-	@${ECHO} "				(use if your machine has no official DNS entry)."
+	@${ECHO} "				(use it if your machine has no official DNS entry)."
+	@${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} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
+	@${ECHO} "				(use it if you need even more speed)."
 	@${ECHO} ""
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
-	 @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -141,10 +144,10 @@ pre-configure:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-.if exists(${DB_DIR}) && defined(OVERWRITE_DB)
+.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)
+.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no")
 .if defined(SKIP_DNS_CHECK)
 	${PREFIX}/bin/mysql_install_db --force --ldata=${DB_DIR}
 .else
@@ -161,15 +164,15 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
-.endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysqlshow.1 perror.1 replace.1
+		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -177,7 +180,8 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	 @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 14aad1713e5..4486f14b30d 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb
+MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in
index d78a89dcc9a..94f38623fcf 100644
--- a/databases/percona55-server/files/patch-Makefile.in
+++ b/databases/percona55-server/files/patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Fri Apr 11 10:50:40 2003
-+++ Makefile.in	Fri Apr 11 10:51:55 2003
-@@ -212,12 +212,7 @@
- EXTRA_DIST = INSTALL-SOURCE README \
- 			COPYING COPYING.LIB
+--- Makefile.in.orig	Mon Dec  1 13:55:28 2003
++++ Makefile.in	Wed Dec 10 00:18:16 2003
+@@ -209,12 +209,7 @@
  
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING zlib
 -SUBDIRS = . include @docs_dirs@ \
--			@readline_topdir@ \
+-			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack @sql_client_dirs@ \
--			@sql_server_dirs@ scripts man tests \
+-			@sql_server_dirs@ scripts man tests SSL\
 -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index d0ecd4995cb..81ba80087c1 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr  3 14:16:29 2003
-+++ configure	Fri May 23 01:05:46 2003
-@@ -8101,6 +8101,7 @@
+--- configure.orig	Mon Dec  1 13:55:34 2003
++++ configure	Wed Dec 10 00:22:08 2003
+@@ -8127,6 +8127,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9043,7 +9044,7 @@
+@@ -9069,7 +9070,7 @@
    ;;
  esac
  fi
@@ -17,7 +17,7 @@
  
  if test -n "$HOSTNAME"; then
    echo "$as_me:$LINENO: result: $HOSTNAME" >&5
-@@ -9235,43 +9236,8 @@
+@@ -9261,43 +9262,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
@@ -61,26 +61,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -12752,8 +12718,16 @@
-     ;;
-   *freebsd*)
-     echo "Adding fix for interrupted reads"
--    CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
--    CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    OSVERSION=`/sbin/sysctl -a | /usr/bin/grep osreldate | /usr/bin/awk '{ print $2 }'`
-+    if test "$OSVERSION" -gt "480100" && \
-+       test "$OSVERSION" -lt "500000" || \
-+       test "$OSVERSION" -gt "500109"
-+    then
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
-+    else
-+	CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
-+	CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
-+    fi
-     ;;
-   *netbsd*)
-     echo "Adding flag -Dunix"
-@@ -23545,7 +23519,7 @@
+@@ -23893,7 +23859,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 927a0cc79c6..c3761b75637 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -1,6 +1,7 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_win_src_distribution
 bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
@@ -8,11 +9,11 @@ bin/myisamlog
 bin/myisampack
 bin/mysql_config
 bin/mysql_convert_table_format
+bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
 bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install
 bin/mysql_install_db
 bin/mysql_secure_installation
 bin/mysql_setpermission
@@ -31,9 +32,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysql-server.sh
-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
-%%PORTDOCS%%info/mysql.info
-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -44,60 +42,61 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
-%%PORTDOCS%%share/doc/mysql/manual.html
-%%PORTDOCS%%share/doc/mysql/manual.txt
-%%PORTDOCS%%share/doc/mysql/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
 share/mysql/Description.plist
 share/mysql/Info.plist
+share/mysql/MySQL-shared-compat.spec
 share/mysql/StartupParameters.plist
 share/mysql/postinstall
 share/mysql/preinstall
@@ -113,6 +112,7 @@ share/mysql/charsets/cp850.xml
 share/mysql/charsets/cp852.xml
 share/mysql/charsets/cp866.xml
 share/mysql/charsets/dec8.xml
+share/mysql/charsets/geostd8.xml
 share/mysql/charsets/greek.xml
 share/mysql/charsets/hebrew.xml
 share/mysql/charsets/hp8.xml
@@ -157,8 +157,8 @@ share/mysql/my-huge.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
-share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,8 +180,8 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
-%%PORTDOCS%%@dirrm share/doc/mysql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
 @dirrm share/mysql/czech
 @dirrm share/mysql/danish
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index 55d2632aff0..533b94e70c5 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -10,6 +10,7 @@ bin/mysqlshow
 bin/mysqltest
 etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
+include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
@@ -31,6 +32,8 @@ include/mysql/mysql_embed.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
 include/mysql/raid.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
author	nork <nork@FreeBSD.org>	2003-12-11 23:58:26 +0800
committer	nork <nork@FreeBSD.org>	2003-12-11 23:58:26 +0800
commit	25d385dcf794ac6c3ec923cbfa491d151f0661eb (patch)
tree	5f31319e0c6d2998f3824300bc6ed17e7f763a58 /databases
parent	84cda61feb83da4923d730f1c4067db597363744 (diff)
download	freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.tar.gz freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.tar.zst freebsd-ports-graphics-25d385dcf794ac6c3ec923cbfa491d151f0661eb.zip