Update to 5.0.92:

- switch to use USER/GROUP [1]
- allow custom pidfile
- replace CONFLICTS with CONFLICTS_INSTALL

PR:		ports/143384
Submitted by:	Sevan Janiyan <venture37@geeklan.co.uk>
Feature safe:	yes

4 files changed, 15 insertions, 46 deletions

diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 3eb6224068bd..50dfb0e8c669 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.91
+PORTVERSION=	5.0.92
 CATEGORIES=	databases
-MASTER_SITES=	http://downloads.mysql.com/archives/mysql-5.0/
+MASTER_SITES=	${MASTER_SITE_MYSQL}
+MASTER_SITE_SUBDIR=	MySQL-5.0
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	ale@FreeBSD.org
@@ -99,10 +100,13 @@ WANT_MYSQL_VER=	50
 
 LATEST_LINK=	mysql50-server
 
-CONFLICTS=	mysql-server-[34].* mysql-server-5.[1-9].*
+CONFLICTS_INSTALL=	mysql-server-[34].* mysql-server-5.[1-9].*
 
 USE_RC_SUBR=	mysql-server.sh
 
+USERS=		mysql
+GROUPS=		mysql
+
 .if !defined(WITHOUT_INNODB)
 PLIST_SUB+=	INNODB=""
 .else
@@ -110,6 +114,7 @@ PLIST_SUB+=	INNODB="@comment "
 .endif
 
 .if defined(WITH_NDB)
+USE_LDCONFIG=	${PREFIX}/lib/mysql
 PLIST_SUB+=	NDB=""
 .else
 PLIST_SUB+=	NDB="@comment "
@@ -175,7 +180,6 @@ post-patch:
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
-	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 .endif
 
@@ -184,7 +188,7 @@ post-install:
 .if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql50-client
 
-CONFLICTS=	mysql-client-[34].* mysql-client-5.[1-9].*
+CONFLICTS_INSTALL=	mysql-client-[34].* mysql-client-5.[1-9].*
 
 MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
 		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -216,7 +220,7 @@ RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 LATEST_LINK=	mysql50-scripts
 
-CONFLICTS=	mysql-scripts-[34].* mysql-scripts-5.[1-9].*
+CONFLICTS_INSTALL=	mysql-scripts-[34].* mysql-scripts-5.[1-9].*
 
 MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_explain_log.1 mysql_find_rows.1 \
 		mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 10891356833c..c50b2f42971f 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.0.91.tar.gz) = 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754
-SIZE (mysql-5.0.91.tar.gz) = 22340514
+SHA256 (mysql-5.0.92.tar.gz) = 223530c4cd6d45e2906e6c7d33615c5824816dfdb772d104f4165a483ea78a55
+SIZE (mysql-5.0.92.tar.gz) = 22440590
diff --git a/databases/mysql50-server/files/mysql-server.sh.in b/databases/mysql50-server/files/mysql-server.sh.in
index bda724adbae1..dbc3b80a5fd4 100644
--- a/databases/mysql50-server/files/mysql-server.sh.in
+++ b/databases/mysql50-server/files/mysql-server.sh.in
@@ -16,6 +16,8 @@
 #			just before mysql starts.
 # mysql_dbdir (str):	Default to "/var/db/mysql"
 #			Base database directory.
+# mysql_pidfile (str):	Custum PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_socket (str):	Default to "/tmp/mysql.sock"
 #			Unix socket file.
 # mysql_args (str):	Custom additional arguments to be passed
@@ -33,11 +35,10 @@ load_rc_config $name
 : ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
 : ${mysql_socket="/tmp/mysql.sock"}
-: ${mysql_args=""}
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --socket=${mysql_socket} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"
diff --git a/databases/mysql50-server/pkg-install b/databases/mysql50-server/pkg-install
deleted file mode 100644
index 586f846c5031..000000000000
--- a/databases/mysql50-server/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
-	USER=mysql
-	GROUP=${USER}
-	UID=88
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-esac