summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrodent <rodent@pkgsrc.org>2014-02-20 00:14:22 +0000
committerrodent <rodent@pkgsrc.org>2014-02-20 00:14:22 +0000
commit9a1b6b60b2b3cb73e2f61517b1fa15fcadcf50c9 (patch)
tree1f221ae0a2c4c9790b29c96f2c6970f5537524b3
parent448d698b83af9ceea320cf64e0dd74b5d48467bb (diff)
downloadpkgsrc-9a1b6b60b2b3cb73e2f61517b1fa15fcadcf50c9.tar.gz
No reason to limit the installation of the RC file to NetBSD.
pkgtools/rc.subr works perfectly fine on other OSes. We're not doing this anywhere else either...
-rw-r--r--net/haproxy/Makefile10
-rw-r--r--net/haproxy/PLIST4
2 files changed, 4 insertions, 10 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 0ce28e98e0d..6d8b0fa0cab 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/20 21:36:28 morr Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/20 00:14:22 rodent Exp $
DISTNAME= haproxy-1.4.24
CATEGORIES= net www
@@ -16,18 +16,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"
diff --git a/net/haproxy/PLIST b/net/haproxy/PLIST
index 0de8ae9d6a9..0605c697560 100644
--- a/net/haproxy/PLIST
+++ b/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.3 2014/02/20 00:14:22 rodent Exp $
man/man1/haproxy.1
sbin/haproxy
share/doc/haproxy/architecture.txt
@@ -6,4 +6,4 @@ 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
+share/examples/rc.d/haproxy