1.7.0-dev0 update, historical haproxy-en/ fr.txt and haproxy.cfg examples are gone.

[David Carlier <devnexen%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	David Carlier <devnexen%gmail.com@localhost>
Pushed By:	devnexen
Date:		Fri Oct 30 13:03:36 2015 +0000
Changeset:	11e868017ecaec8e916cd6d04a53298d0cf6e711

Modified Files:
	haproxy-devel/Makefile
	haproxy-devel/PLIST
	haproxy-devel/distinfo
	haproxy-devel/files/haproxy.sh
Added Files:
	haproxy-devel/patches/patch-Makefile.diff

Log Message:
1.7.0-dev0 update, historical haproxy-en/fr.txt and haproxy.cfg examples are gone.

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

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

diffstat:
 haproxy-devel/Makefile                    | 10 +++++++---
 haproxy-devel/PLIST                       |  3 ---
 haproxy-devel/distinfo                    |  8 +++++---
 haproxy-devel/files/haproxy.sh            |  1 -
 haproxy-devel/patches/patch-Makefile.diff | 12 ++++++++++++
 5 files changed, 24 insertions(+), 10 deletions(-)

diffs:
diff --git a/haproxy-devel/Makefile b/haproxy-devel/Makefile
index ae941e9..8f258fe 100644
--- a/haproxy-devel/Makefile
+++ b/haproxy-devel/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.1 2015/09/01 20:45:04 devnexen Exp $
 
-DISTNAME=	haproxy-1.6-dev7
+DISTNAME=	haproxy-1.7-dev0
 PKGBASE=	haproxy-devel
 CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.6/src/devel/
+MASTER_SITES=	http://www.haproxy.org/download/1.7/src/devel/
 DISTFILES=	${DISTNAME}.tar.gz
 
 MAINTAINER=	devnexen%gmail.com@localhost
@@ -22,7 +22,9 @@ INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 RCD_SCRIPTS=		haproxy
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	${DOCDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -53,7 +55,9 @@ TARGET=generic
 LIBS.SunOS+=		-lxnet
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/
+
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/haproxy-devel/PLIST b/haproxy-devel/PLIST
index 6461702..e87de8c 100644
--- a/haproxy-devel/PLIST
+++ b/haproxy-devel/PLIST
@@ -4,6 +4,3 @@ sbin/haproxy
 sbin/haproxy-systemd-wrapper
 share/doc/haproxy-devel/architecture.txt
 share/doc/haproxy-devel/configuration.txt
-share/doc/haproxy-devel/haproxy-en.txt
-share/doc/haproxy-devel/haproxy-fr.txt
-share/examples/haproxy-devel/haproxy.cfg
diff --git a/haproxy-devel/distinfo b/haproxy-devel/distinfo
index fb1fdba..629966a 100644
--- a/haproxy-devel/distinfo
+++ b/haproxy-devel/distinfo
@@ -1,5 +1,7 @@
 $NetBSD$
 
-SHA1 (haproxy-1.6-dev7.tar.gz) = 7bc00b6ef4bb3c02aa12aa56884340e7ad5e3f33
-RMD160 (haproxy-1.6-dev7.tar.gz) = a547bc19f199e60e2b975a0c8d37be2a031655a7
-Size (haproxy-1.6-dev7.tar.gz) = 1653547 bytes
+SHA1 (haproxy-1.7-dev0.tar.gz) = 9a3a2c067657e705b0094eb5154df0d59226357a
+RMD160 (haproxy-1.7-dev0.tar.gz) = 6a75ffdcd2084c9a47188fe98e7f1bf300e1d6ed
+SHA512 (haproxy-1.7-dev0.tar.gz) = e1c26127c929d4a4c004520d68681e2498f5963b2247781dd1283ef265224573891b0c115d211439fb48ec3604b5f6d9b4e511d32ad7e9084c0af64b6804ac9e
+Size (haproxy-1.7-dev0.tar.gz) = 1538088 bytes
+SHA1 (patch-Makefile.diff) = 43f6b233a25704bd707aac12df5dbc58c4246358
diff --git a/haproxy-devel/files/haproxy.sh b/haproxy-devel/files/haproxy.sh
index 4c0481c..3d6e2e2 100644
--- a/haproxy-devel/files/haproxy.sh
+++ b/haproxy-devel/files/haproxy.sh
@@ -11,7 +11,6 @@ $_rc_subr_loaded . /etc/rc.subr
 name="haproxy"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-conf_file="@PKG_SYSCONFDIR@/${name}.cfg"
 required_files="${conf_file}"
 command_args="-f ${conf_file}"
 extra_commands="configtest"
diff --git a/haproxy-devel/patches/patch-Makefile.diff b/haproxy-devel/patches/patch-Makefile.diff
new file mode 100644
index 0000000..ea3d83b
--- /dev/null
+++ b/haproxy-devel/patches/patch-Makefile.diff
@@ -0,0 +1,12 @@
+--- Makefile.orig	2015-10-30 11:52:16.000000000 +0000
++++ Makefile	2015-10-30 11:52:35.000000000 +0000
+@@ -798,9 +798,6 @@
+ 
+ install-doc:
+ 	install -d "$(DESTDIR)$(DOCDIR)"
+-	for x in configuration architecture haproxy-en haproxy-fr; do \
+-		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
+-	done
+ 
+ install-bin: haproxy haproxy-systemd-wrapper
+ 	install -d "$(DESTDIR)$(SBINDIR)"