Import of pkgsrc-2014Q1

net/haproxy/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/06/20 21:36:28 morr Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/20 00:37:46 rodent Exp $
 
 DISTNAME=	haproxy-1.4.24
+PKGREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
@@ -16,18 +17,12 @@ INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
 INSTALL_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/${PKGBASE}
 INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
+RCD_SCRIPTS=		haproxy
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 INSTALLATION_DIRS=	${EGDIR} share/examples/rc.d
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=		rcd
-.if ${OPSYS} == "NetBSD"
-RCD_SCRIPTS=		haproxy
-INSTALLATION_DIRS+=	share/examples/rc.d
-PLIST.rcd=		yes
-.endif
-
 .if ${OPSYS} == "NetBSD"
 TARGET=netbsd
 .elif ${OPSYS} == "FreeBSD"

net/haproxy/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/12/16 12:14:12 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:08 jperkin Exp $
 man/man1/haproxy.1
 sbin/haproxy
 share/doc/haproxy/architecture.txt
@@ -6,4 +6,3 @@ share/doc/haproxy/configuration.txt
 share/doc/haproxy/haproxy-en.txt
 share/doc/haproxy/haproxy-fr.txt
 share/examples/haproxy/haproxy.cfg
-${PLIST.rcd}share/examples/rc.d/haproxy

net/haproxy/files/smf/manifest.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/haproxy -f %{config_file} -D" 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@/haproxy.cfg" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">HAProxy</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>