[pkgsrc/trunk]: pkgsrc/databases The bundled SMF manifest should not have a p...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f5a1b10b67a
branches:  trunk
changeset: 648887:3f5a1b10b67a
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Sun Mar 22 07:44:43 2015 +0000

description:
The bundled SMF manifest should not have a project called for. This had been
added erroneously, based on modified Joyent manifests. Bump PKGREVISION for
the MySQL cluster/server packages.

diffstat:

 databases/mysql-cluster/Makefile                |  3 ++-
 databases/mysql-cluster/files/smf/manifest.xml  |  2 +-
 databases/mysql51-server/Makefile               |  4 ++--
 databases/mysql51-server/files/smf/manifest.xml |  2 +-
 databases/mysql55-server/Makefile               |  4 ++--
 databases/mysql55-server/files/smf/manifest.xml |  2 +-
 databases/mysql56-server/Makefile               |  3 ++-
 databases/mysql56-server/files/smf/manifest.xml |  2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diffs (98 lines):

diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql-cluster/Makefile
--- a/databases/mysql-cluster/Makefile  Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql-cluster/Makefile  Sun Mar 22 07:44:43 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/12/01 05:57:48 jnemeth Exp $
+# $NetBSD: Makefile,v 1.2 2015/03/22 07:44:43 fhajny Exp $
 
 PKGNAME=               ${DISTNAME:S/-gpl//}
+PKGREVISION=           1
 COMMENT=               MySQL 5, a free SQL database (client)
 
 CONFLICTS=             mysql*-{client,server}-[0-9]*
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql-cluster/files/smf/manifest.xml
--- a/databases/mysql-cluster/files/smf/manifest.xml    Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql-cluster/files/smf/manifest.xml    Sun Mar 22 07:44:43 2015 +0000
@@ -11,7 +11,7 @@
     <dependency name='config' grouping='require_all' restart_on='none' type='path'>
       <service_fmri value='file://@PKG_SYSCONFDIR@/my.cnf'/>
     </dependency>
-    <method_context project='mysql' resource_pool=':default' working_directory='@MYSQL_DATADIR@'>
+    <method_context resource_pool=':default' working_directory='@MYSQL_DATADIR@'>
       <method_credential user='@MYSQL_USER@' group='@MYSQL_GROUP@' limit_privileges=':default' privileges=':default' supp_groups=':default'/>
       <method_environment>
         <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql51-server/Makefile
--- a/databases/mysql51-server/Makefile Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql51-server/Makefile Sun Mar 22 07:44:43 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2015/01/26 12:39:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.26 2015/03/22 07:44:43 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=             mysql3-server-[0-9]*
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql51-server/files/smf/manifest.xml
--- a/databases/mysql51-server/files/smf/manifest.xml   Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql51-server/files/smf/manifest.xml   Sun Mar 22 07:44:43 2015 +0000
@@ -10,7 +10,7 @@
     <dependency name='net' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/network/loopback' />
     </dependency>
-    <method_context project='mysql' working_directory='@MYSQL_DATADIR@'>
+    <method_context working_directory='@MYSQL_DATADIR@'>
       <method_credential user='@MYSQL_USER@' group='@MYSQL_GROUP@' />
       <method_environment>
         <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql55-server/Makefile
--- a/databases/mysql55-server/Makefile Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql55-server/Makefile Sun Mar 22 07:44:43 2015 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2015/02/07 16:04:46 fhajny Exp $
+# $NetBSD: Makefile,v 1.28 2015/03/22 07:44:43 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql55-server/files/smf/manifest.xml
--- a/databases/mysql55-server/files/smf/manifest.xml   Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql55-server/files/smf/manifest.xml   Sun Mar 22 07:44:43 2015 +0000
@@ -10,7 +10,7 @@
     <dependency name='net' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/network/loopback' />
     </dependency>
-    <method_context project='mysql' working_directory='@MYSQL_DATADIR@'>
+    <method_context working_directory='@MYSQL_DATADIR@'>
       <method_credential user='@MYSQL_USER@' group='@MYSQL_GROUP@' />
       <method_environment>
         <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql56-server/Makefile
--- a/databases/mysql56-server/Makefile Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql56-server/Makefile Sun Mar 22 07:44:43 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2015/02/07 19:23:40 adam Exp $
+# $NetBSD: Makefile,v 1.23 2015/03/22 07:44:44 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
diff -r f401c47d325f -r 3f5a1b10b67a databases/mysql56-server/files/smf/manifest.xml
--- a/databases/mysql56-server/files/smf/manifest.xml   Sun Mar 22 05:53:12 2015 +0000
+++ b/databases/mysql56-server/files/smf/manifest.xml   Sun Mar 22 07:44:43 2015 +0000
@@ -10,7 +10,7 @@
     <dependency name='net' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/network/loopback' />
     </dependency>
-    <method_context project='mysql' working_directory='@MYSQL_DATADIR@'>
+    <method_context working_directory='@MYSQL_DATADIR@'>
       <method_credential user='@MYSQL_USER@' group='@MYSQL_GROUP@' />
       <method_environment>
         <envvar name='LD_PRELOAD_32' value='/usr/lib/extendedFILE.so.1' />