summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>2000-09-24 21:07:50 +0000
committerDirk Froemberg <dirk@FreeBSD.org>2000-09-24 21:07:50 +0000
commitd9b01d7c92ff264af273f47284c7729aa26ed51c (patch)
treeded7019c130f449e0cb729337652fa733204f89d
parentFix bogon that made it impossible to stop innd. (diff)
- "@exec killall mysqld" should read "@unexec killall mysqld"...
- introduce MYSQL_VERSION in PLIST and PLIST_SUB
Notes
Notes: svn path=/head/; revision=33072
Diffstat
-rw-r--r--databases/mysql322-server/Makefile2
-rw-r--r--databases/mysql322-server/pkg-plist4
-rw-r--r--databases/mysql323-server/Makefile2
-rw-r--r--databases/mysql323-server/pkg-plist4
-rw-r--r--databases/mysql40-server/Makefile2
-rw-r--r--databases/mysql40-server/pkg-plist4
-rw-r--r--databases/mysql41-server/Makefile2
-rw-r--r--databases/mysql41-server/pkg-plist4
-rw-r--r--databases/mysql50-server/Makefile2
-rw-r--r--databases/mysql50-server/pkg-plist4
-rw-r--r--databases/mysql51-server/Makefile2
-rw-r--r--databases/mysql51-server/pkg-plist4
-rw-r--r--databases/mysql54-server/Makefile2
-rw-r--r--databases/mysql54-server/pkg-plist4
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql55-server/pkg-plist4
-rw-r--r--databases/mysql60-server/Makefile2
-rw-r--r--databases/mysql60-server/pkg-plist4
-rw-r--r--databases/percona55-server/Makefile2
-rw-r--r--databases/percona55-server/pkg-plist4
20 files changed, 40 insertions, 20 deletions
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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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 <bsd.port.pre.mk>
.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 10:03:30 +0000