diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2006-01-12 08:47:23 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2006-01-12 08:47:23 +0000 |
| commit | 707b085ac0901b8bb1dcf5ebacd7b74c55d0db65 (patch) | |
| tree | e1e9dcf0be85d2513f08d1620167fc7ee5490211 /databases | |
| parent | - Update DEPRECATED to urge people to use www/seamonkey instead of (diff) | |
Convert mysql-client.sh to rcNG.
Notes
Notes:
svn path=/head/; revision=153338
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql41-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql41-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql41-server/files/mysql-client.sh | 15 | ||||
| -rw-r--r-- | databases/mysql41-server/pkg-plist.client | 1 |
4 files changed, 6 insertions, 23 deletions
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 7362acc9af88..de54d2d0ad48 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -6,6 +6,7 @@ # PORTNAME= mysql +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 63a8a2fe07f0..0c22a3e2496a 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -20,10 +20,6 @@ SLAVEDIRS= databases/mysql41-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 \ @@ -114,6 +110,8 @@ LATEST_LINK= mysql41-server CONFLICTS= mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.* +USE_RC_SUBR= mysql-server.sh + .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else @@ -175,6 +173,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 @@ -190,9 +190,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/mysql41-server/files/mysql-client.sh b/databases/mysql41-server/files/mysql-client.sh deleted file mode 100644 index bef414c12ed2..000000000000 --- a/databases/mysql41-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/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index ab0454713675..bbb139bceb37 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -11,7 +11,6 @@ bin/mysqlmanager-pwgen bin/mysqlmanagerc bin/mysqlshow bin/mysqltest -etc/rc.d/000.mysql-client.sh include/mysql/errmsg.h include/mysql/keycache.h include/mysql/m_ctype.h |