- Fix PKG_SYSCONFDIR handling. - Fix SMF varnishd call.

[Filip Hajny <filip%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Sat Mar 18 13:49:12 2017 +0000
Changeset:	0b325d496c91bd857b2c533eaadb4605f0a4dc89

Modified Files:
	varnish/Makefile
	varnish/Makefile.common
	varnish/files/smf/manifest.xml
	varnish4/Makefile

Log Message:
- Fix PKG_SYSCONFDIR handling.
- Fix SMF varnishd call.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0b325d496c91bd857b2c533eaadb4605f0a4dc89

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 varnish/Makefile               | 1 +
 varnish/Makefile.common        | 4 +++-
 varnish/files/smf/manifest.xml | 4 ++--
 varnish4/Makefile              | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/varnish/Makefile b/varnish/Makefile
index f58bfd7710..a63b397e7a 100644
--- a/varnish/Makefile
+++ b/varnish/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	varnish-5.0.0
+PKGREVISION=	1
 
 .include "../../wip/varnish/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/varnish/Makefile.common b/varnish/Makefile.common
index b5d3381079..41cbfcad92 100644
--- a/varnish/Makefile.common
+++ b/varnish/Makefile.common
@@ -39,13 +39,15 @@ PKG_HOME.${VRNUSER}=	${VRNDIR}
 PKG_SHELL.${VRNUSER}=	${SH}
 PKG_GECOS.${VRNUSER}=	Varnish daemon user
 
+PKG_SYSCONFSUBDIR+=	varnish
+
 FILES_SUBST+=		VRNUSER=${VRNUSER}
 FILES_SUBST+=		VRNGROUP=${VRNGROUP}
 
 REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
 
 CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
 CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
 
diff --git a/varnish/files/smf/manifest.xml b/varnish/files/smf/manifest.xml
index d374d5a98a..ecf3ed4849 100644
--- a/varnish/files/smf/manifest.xml
+++ b/varnish/files/smf/manifest.xml
@@ -15,14 +15,14 @@
         <envvar name='PATH' value='@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin' />
       </method_environment>
     </method_context>
-    <exec_method type="method" name="start" exec="@PREFIX@/sbin/varnishd -a %{listen} -l %{size} -f %{config_file} -u @VRNUSER@ -g @VRNGROUP@" timeout_seconds="60" />
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/varnishd -j solaris -a %{listen} -l %{size} -f %{config_file}" timeout_seconds="60" />
     <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
     <property_group name="startd" type="framework">
       <propval name="duration" type="astring" value="contract" />
       <propval name="ignore_error" type="astring" value="core,signal" />
     </property_group>
     <property_group name="application" type="application">
-      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/default.vcl" />
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/example.vcl" />
       <propval name="listen" type="astring" value="0.0.0.0:8080" />
       <propval name="size" type="astring" value="64M" />
     </property_group>
diff --git a/varnish4/Makefile b/varnish4/Makefile
index 01951e7c07..fd4297f065 100644
--- a/varnish4/Makefile
+++ b/varnish4/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	varnish-4.1.5
+PKGREVISION=	1
 
 .include "../../wip/varnish/Makefile.common"
 .include "../../mk/bsd.pkg.mk"