Update to 5.0.18 release:

- convert mysql-client.sh script to use ldconfig rcNG system

4 files changed, 9 insertions, 27 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index a19d4a8feaad..03a885233ee8 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.17
+PORTVERSION=	5.0.18
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -20,10 +20,6 @@ SLAVEDIRS=	databases/mysql50-client
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 
-.if ${PKGNAMESUFFIX} == "-server"
-USE_RC_SUBR=	mysql-server.sh
-.endif
-
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
@@ -119,6 +115,8 @@ LATEST_LINK=	mysql50-server
 
 CONFLICTS=	mysql-server-3.* mysql-server-4.*
 
+USE_RC_SUBR=	mysql-server.sh
+
 .if defined(WITH_NDB)
 PLIST_SUB+=	NDB=""
 .else
@@ -181,6 +179,8 @@ MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
 CONFIGURE_ARGS+=--without-server
 
@@ -197,9 +197,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
 .endif
 
-post-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
-	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh
+post-install: install-ldconfig-file
 
 .else
 # MySQL-Scripts part
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 1c55c0d723cb..a79459921780 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.17.tar.gz) = c6e93571a944a7e7203e4e831adaaee3
-SHA256 (mysql-5.0.17.tar.gz) = cf199c808665c63a7b535b98040ee90f372c088c3ca1a06102c0e8543ada48a2
-SIZE (mysql-5.0.17.tar.gz) = 19119986
+MD5 (mysql-5.0.18.tar.gz) = f18153b0239aaa03fc5a751f2d82cb71
+SHA256 (mysql-5.0.18.tar.gz) = bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a
+SIZE (mysql-5.0.18.tar.gz) = 19169082
diff --git a/databases/mysql54-server/files/mysql-client.sh b/databases/mysql54-server/files/mysql-client.sh
deleted file mode 100644
index bef414c12ed2..000000000000
--- a/databases/mysql54-server/files/mysql-client.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/mysql
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index 227ca424c59c..1376c79e1d5d 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -11,7 +11,6 @@ bin/mysqlshow
 bin/mysqltest
 bin/mysqltestmanager-pwgen
 bin/mysqltestmanagerc
-etc/rc.d/000.mysql-client.sh
 include/mysql/errmsg.h
 include/mysql/keycache.h
 include/mysql/m_ctype.h