1 files changed, 70 insertions, 71 deletions

diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index bb9329b3c669..b499fd55b10d 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,42 +1,51 @@
-# ports collection makefile for:	MySQL-server
-# Date created:				Sun Sep 24 21:20:46 CEST 2000
-# Whom:					Dirk Froemberg <dirk@FreeBSD.org>
+# New ports collection makefile for:    MySQL-server
+# Date created:         Sun Mar 3 12:20:35 CET 2002
+# Whom:                 Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.55
+PORTNAME?=	mysql
+PORTVERSION=	4.0.9
 PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
-		http://mysql.he.net/Downloads/MySQL-3.23/ \
-		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ \
-		ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-3.23/ \
-		http://mysql.orst.edu/Downloads/MySQL-3.23/ \
-		http://web.tryc.on.ca/mysql/Downloads/MySQL-3.23/ \
-		ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-3.23/
-DISTFILES=	mysql-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	dirk@FreeBSD.org
-
-WRKSRC=		${WRKDIR}/mysql-${PORTVERSION}
-SLAVEDIRS=	databases/mysql323-client
-MASTERPORTNAME=	mysql-server
+MASTER_SITES=	ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \
+		http://mysql.tzone.it/Downloads/MySQL-4.0/ \
+		ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
+		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \
+		ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
+		http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \
+		ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \
+		http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \
+		ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \
+		http://www.mysql.cz/Downloads/MySQL-4.0/ \
+		ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \
+		http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \
+		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/
+PKGNAMESUFFIX?=	-server
+DISTNAME=	${PORTNAME}-${PORTVERSION}-gamma
+
+MAINTAINER=	sysadmin@alexdupre.com
+
+SLAVEDIRS=	databases/mysql40-client
 DB_DIR?=	/var/db/mysql
-USE_PERL5=	yes
+USE_PERL5_RUN=	yes
 USE_LIBTOOL=	yes
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
-		--without-perl \
 		--without-debug \
 		--without-readline \
 		--without-bench \
-		--with-mit-threads=no \
+		--without-extra-tools \
 		--with-libwrap \
+		--with-raid \
+		--with-mysqlfs \
+		--with-vio \
 		--with-low-memory \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
-		--program-prefix='' \
-		--with-innodb
+		--with-server-suffix='' \
+		--program-prefix=''
 
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
@@ -47,71 +56,68 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
 .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
 CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
 .endif
+.if defined(WITH_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
+.endif
 .if defined(BUILD_STATIC)
-CONFIGURE_ARGS+=--with-mysqld-ldflags=--static
+CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
 .endif
 .if defined(BUILD_OPTIMIZED)
-CFLAGS+=	-mcpu=pentiumpro -O3
-.endif
-.if defined(WITH_LINUXTHREADS)
-CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
-CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+CFLAGS+=	-mcpu=i686
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
 .endif
-CONFIGURE_ENV+=	PERL=${PERL} \
-		PERL5=${PERL} \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CFLAGS="${CFLAGS}" \
-		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
-.include <bsd.port.pre.mk>
-# without including these flags mysqld may crash under heavy load
-# and multiple connections at the same time
+CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
+
+.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
 .if ${OSVERSION} < 500000
-CONFIGURE_ENV+=	CXX="${CC}"
+CXX=		${CC}
 .endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
-RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client \
+RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql40-client \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
 
-PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}
+PLIST_SUB=	MYSQL_VERSION=${PORTVERSION}-gamma
 
-ONLY_FOR_ARCHS=	i386 alpha sparc64
+ONLY_FOR_ARCHS=	i386 alpha
+
+DOCS=		manual.html manual.ps manual_toc.html manual.txt manual.texi \
+		include.texi
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "	WITH_CHARSET=charset	define the primary built-in charset (latin1);"
-	@${ECHO} "	WITH_XCHARSET=list	define other built-in charsets (may be 'all');"
+	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
+	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
+	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
 	@${ECHO} "				(default is /var/db/mysql)."
-	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
-	@${ECHO} "				This is _NOT_ recommended for production"
-	@${ECHO} "				servers. Expect problems when enabled."
-	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
-	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
-	@${ECHO} "				This is useful for upgrades."
-	@${ECHO} "				Be sure to know what you are doing!"
-	@${ECHO} "	SKIP_DNS_CHECK=yes	don't run resolveip to do an additional"
+	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip database initialization"
+	@${ECHO} "				(useful for upgrades)."
+	@${ECHO} "	SKIP_DNS_CHECK=yes	Don't run resolveip to do an additional"
 	@${ECHO} "				DNS check before inserting local hostname to"
-	@${ECHO} "				mysql database."
-	@${ECHO} "				Use if your machine has no offical DNS entry."
+	@${ECHO} "				mysql database"
+	@${ECHO} "				(use if your machine has no official DNS entry)."
 	@${ECHO} "	BUILD_STATIC=yes	Build a static version of mysqld."
-	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=pentiumpro -O3 to CFLAGS."
-	@${ECHO} "				This setting may produce broken code and thus"
-	@${ECHO} "				is not recommended for production servers."
+	@${ECHO} "	BUILD_OPTIMIZED=yes	Add -mcpu=i686 to CFLAGS."
 	@${ECHO} ""
 
+.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
+pre-configure:
+	@${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
+	@${FALSE}
+.endif
+
 .if exists(${DB_DIR}) && !defined(PACKAGE_BUILDING) && !defined(OVERWRITE_DB) && !defined(SKIP_INSTALL_DB)
 pre-install:
 	@${ECHO} "You appear to already have a mysql database directory in ${DB_DIR}."
@@ -145,20 +151,18 @@ post-install:
 	@${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh
 
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/mysql/Flags
-.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
-	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
+	${MKDIR} ${DOCSDIR}/Flags
+.for doc in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags
-	${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
-	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
 .endif
 
 # MySQL-Client part
 .else
 MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
-		perror.1 replace.1 safe_mysqld.1
+		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
+		mysqlshow.1 perror.1 replace.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -172,9 +176,4 @@ post-install:
 
 .endif
 
-# This is for the maintainer only...
-make-plist:
-	/usr/bin/find foo -type f -or -type l | /usr/bin/cut -d / -f 2- | /usr/bin/sort  > ${.CURDIR}/pkg-plist.new
-	/usr/bin/perl -i -ne 'if (m#share/doc/#) { print "%%PORTDOCS%%", $$_; } else { print $$_; }' ${.CURDIR}/pkg-plist.new
-
 .include <bsd.port.post.mk>