diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql322-server/Makefile +++ b/databases/mysql322-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql322-server/pkg-plist +++ b/databases/mysql322-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql323-server/pkg-plist +++ b/databases/mysql323-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index e6c154ee589b..5858b97bf2d0 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -40,6 +40,8 @@ CONFIGURE_ENV+= PERL=${PERL} \ .if !defined(CLIENT_ONLY) RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client +PLIST_SUB= MYSQL_VERSION=${PORTVERSION} + .include .if ${OSVERSION} >= 320000 diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 7c89ce913312..26171076eb40 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -102,7 +102,7 @@ share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt share/mysql/make_binary_distribution share/mysql/my-example.cnf -share/mysql/mysql-3.22.32.spec +share/mysql/mysql-%%MYSQL_VERSION%%.spec share/mysql/mysql-log-rotate share/mysql/mysql.server share/mysql/norwegian-ny/errmsg.sys @@ -145,4 +145,4 @@ share/mysql/swedish/errmsg.txt @dirrm share/mysql/swedish @dirrm share/mysql @exec %D/bin/mysql_install_db -@exec /usr/bin/killall mysqld +@unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true