Finally MySQL 5.0 appears in the ports tree!

PR:		ports/60559
Submitted by:	me
Approved by:	nork (mentor/implicitly)

6 files changed, 38 insertions, 38 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index e3d84c83d494..d53652ccb6b9 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,32 +6,33 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.1
+PORTVERSION=	5.0.0
 PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
-		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/ \
-		ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \
-		http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \
-		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \
-		http://www.mysql.cz/Downloads/MySQL-4.1/ \
-		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \
-		http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \
-		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/
+MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \
+		http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \
+		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \
+		http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \
+		ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \
+		http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \
+		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \
+		http://www.mysql.cz/Downloads/MySQL-5.0/ \
+		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \
+		http://mysql.oms-net.nl/Downloads/MySQL-5.0/ \
+		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/
 PKGNAMESUFFIX?=	-server
 DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
 
-MAINTAINER=	sysadmin@alexdupre.com
+MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
-SLAVEDIRS=	databases/mysql41-client
+SLAVEDIRS=	databases/mysql50-client
+PKGINSTALL?=	${WRKDIR}/pkg-install
 DB_DIR?=	/var/db/mysql
+USE_GNOME=	lthack
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 
-GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--without-debug \
@@ -81,6 +82,9 @@ CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
 LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 .endif
+.else
+CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
+CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 
 .if ${OSVERSION} < 500000
@@ -101,11 +105,13 @@ CXXFLAGS+=	-fno-exceptions
 .if !defined(CLIENT_ONLY)
 USE_PERL5_RUN=	yes
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
+
+LATEST_LINK=	mysql50-server
 
-CONFLICTS=	mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
+CONFLICTS=	mysql-server-3.* mysql-server-4.*
 
-ONLY_FOR_ARCHS=	i386 alpha sparc64
+PLIST_SUB=	DB_DIR=${DB_DIR}
 
 DOCS=		manual.html manual.txt manual_toc.html
 
@@ -135,7 +141,9 @@ pre-fetch:
 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
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} "s|-pthread|${PTHREAD_LIBS}|g"
+
+post-build:
+	@${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install
 
 .if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
 pre-configure:
@@ -171,7 +179,9 @@ post-install:
 
 # MySQL-Client part
 .else
-CONFLICTS=	mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
+LATEST_LINK=	mysql50-client
+
+CONFLICTS=	mysql-client-3.* mysql-client-4.*
 
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
@@ -184,7 +194,6 @@ CONFIGURE_ARGS+=--without-server
 
 post-patch:
 	@${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 4486f14b30da..43b1f7dfb6bc 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1,2 @@
-MD5 (mysql-4.1.1-alpha.tar.gz) = dc337413c0a9ce4d5dcb91b02383371b
+MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2
+SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index 6c102a1762a6..ec52ce45dfb2 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,13 +1,5 @@
---- 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"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig	Sun Dec 21 19:03:09 2003
++++ configure	Wed Dec 24 10:40:53 2003
 @@ -9069,7 +9070,7 @@
    ;;
  esac
@@ -49,7 +41,7 @@
 -    *cygwin*)
 -      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
--    *netware* | *modesto*)
+-    *netware*)
 -      FIND_PROC=
 -      ;;
 -    *)
diff --git a/databases/mysql54-server/pkg-descr b/databases/mysql54-server/pkg-descr
index cd19c135f9cc..4ddefbb70546 100644
--- a/databases/mysql54-server/pkg-descr
+++ b/databases/mysql54-server/pkg-descr
@@ -4,4 +4,4 @@ MySQL is a very fast, multi-threaded, multi-user and robust SQL
 WWW: http://www.mysql.com/
 
 - Alex Dupre
-sysadmin@alexdupre.com
+ale@FreeBSD.org
diff --git a/databases/mysql54-server/pkg-install b/databases/mysql54-server/pkg-install
index 27732bf35c89..88a0b1c66915 100644
--- a/databases/mysql54-server/pkg-install
+++ b/databases/mysql54-server/pkg-install
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 PATH=/bin:/usr/sbin
-if [ -z "${DB_DIR}" ]; then
-	DB_DIR=/var/db/mysql
-fi
 
 case $2 in
 POST-INSTALL)
@@ -11,6 +8,7 @@ POST-INSTALL)
 	GROUP=${USER}
 	UID=88
 	GID=${UID}
+	DB_DIR=%%DB_DIR%%
 
 	if pw group show "${GROUP}" 2>/dev/null; then
 		echo "You already have a group \"${GROUP}\", so I will use it."
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index c3761b75637f..aa0a0f84b32d 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -206,5 +206,5 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql/swedish
 @dirrm share/mysql/ukrainian
 @dirrm share/mysql
-@exec %D/bin/mysql_install_db
+@exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%%
 @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true