summaryrefslogtreecommitdiff
path: root/databases/mysql323-server
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2006-01-12 08:57:43 +0000
committerAlex Dupre <ale@FreeBSD.org>2006-01-12 08:57:43 +0000
commit3f7751a86fedf48c51a8194eccedce0e7daba741 (patch)
treed50511e5d83c10bcefe8d146baa9458e59cadcfb /databases/mysql323-server
parentConvert mysql-client.sh to rcNG. (diff)
Convert mysql-client.sh to rcNG.
Notes
Notes: svn path=/head/; revision=153339
Diffstat (limited to 'databases/mysql323-server')
-rw-r--r--databases/mysql323-server/Makefile12
-rw-r--r--databases/mysql323-server/files/mysql-client.sh15
-rw-r--r--databases/mysql323-server/pkg-plist.client1
3 files changed, 5 insertions, 23 deletions
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index f58dbdade32f..0066434545cd 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -20,10 +20,6 @@ SLAVEDIRS= databases/mysql323-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 \
@@ -96,6 +92,8 @@ LATEST_LINK= mysql323-server
CONFLICTS= mysql-server-4.* mysql-server-5.*
+USE_RC_SUBR= mysql-server.sh
+
PLIST_SUB= VER=${DISTVERSION}
MAN1= isamchk.1 isamlog.1 mysqld.1 \
@@ -158,6 +156,8 @@ MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.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
@@ -167,9 +167,7 @@ post-patch:
@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
-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/mysql323-server/files/mysql-client.sh b/databases/mysql323-server/files/mysql-client.sh
deleted file mode 100644
index bef414c12ed2..000000000000
--- a/databases/mysql323-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/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client
index 1eda7465a2c2..4d411d4b848c 100644
--- a/databases/mysql323-server/pkg-plist.client
+++ b/databases/mysql323-server/pkg-plist.client
@@ -8,7 +8,6 @@ bin/mysqldump
bin/mysqlimport
bin/mysqlshow
bin/mysqltest
-etc/rc.d/000.mysql-client.sh
include/mysql/dbug.h
include/mysql/errmsg.h
include/mysql/m_ctype.h