diff options
| -rw-r--r-- | databases/mysql323-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql323-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql323-server/files/mysql-client.sh | 15 | ||||
| -rw-r--r-- | databases/mysql323-server/pkg-plist.client | 1 | ||||
| -rw-r--r-- | databases/mysql40-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql40-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql40-server/files/mysql-client.sh | 15 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist.client | 1 |
8 files changed, 12 insertions, 46 deletions
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile index 6ff8784c0c7f..8f70aef2ede6 100644 --- a/databases/mysql323-client/Makefile +++ b/databases/mysql323-client/Makefile @@ -6,6 +6,7 @@ # PORTNAME= mysql +PORTREVISION= 2 PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) 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 diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile index 28e9addf6566..02cd2c7b9f65 100644 --- a/databases/mysql40-client/Makefile +++ b/databases/mysql40-client/Makefile @@ -6,6 +6,7 @@ # PORTNAME= mysql +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 3e2eeff35917..6d37497b2afa 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -20,10 +20,6 @@ SLAVEDIRS= databases/mysql40-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 \ @@ -104,6 +100,8 @@ LATEST_LINK= mysql40-server CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.* +USE_RC_SUBR= mysql-server.sh + MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -152,6 +150,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 @@ -164,9 +164,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/mysql40-server/files/mysql-client.sh b/databases/mysql40-server/files/mysql-client.sh deleted file mode 100644 index bef414c12ed2..000000000000 --- a/databases/mysql40-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/mysql40-server/pkg-plist.client b/databases/mysql40-server/pkg-plist.client index 23923af6512a..2a8a52ba9a36 100644 --- a/databases/mysql40-server/pkg-plist.client +++ b/databases/mysql40-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/m_ctype.h include/mysql/m_string.h |