- Update to 1.4.5 [1]

- While here, use NOPORTEXAMPLES for examples files

PR:		ports/146599 [1]
Submitted by:	Ross West <freebsd AT linepoint.com> (maintainer)

3 files changed, 43 insertions, 41 deletions

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index ce20ee9e7af8..6c7bdad7af5c 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	haproxy
-PORTVERSION=	1.4.4
+PORTVERSION=	1.4.5
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 
@@ -23,7 +23,7 @@ OPTIONS=	PCRE		"Use PCRE regex library"	On\
 
 .include <bsd.port.options.mk>
 
-MAKE_ARGS=	"TARGET=freebsd"
+MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
@@ -41,6 +41,8 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index ef97fc0f9b54..14565549f62c 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (haproxy-1.4.4.tar.gz) = 0a18b915c3039f37004a346a5ddc17cd
-SHA256 (haproxy-1.4.4.tar.gz) = c0508869a9bb7bbc7f306469afdd078076fb4d22c123ece9cc8beeafc7ad60b2
-SIZE (haproxy-1.4.4.tar.gz) = 764810
+MD5 (haproxy-1.4.5.tar.gz) = c672d740d734b855dbe456f8211a62c1
+SHA256 (haproxy-1.4.5.tar.gz) = 991ed563639612abd8833a0934547547c29261b2d654f1dc2c4fa266d2b047de
+SIZE (haproxy-1.4.5.tar.gz) = 775757
diff --git a/net/haproxy/pkg-plist b/net/haproxy/pkg-plist
index 36004c5920d0..d67f01d22f02 100644
--- a/net/haproxy/pkg-plist
+++ b/net/haproxy/pkg-plist
@@ -32,39 +32,39 @@ sbin/haproxy
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/internals
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/design-thoughts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/acl-content-sw.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/auth.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/build.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/check
-%%PORTDOCS%%%%EXAMPLESDIR%%/check.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/config.rc.haproxy
-%%PORTDOCS%%%%EXAMPLESDIR%%/content-sw-sample.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/cttproxy-src.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/debug2ansi
-%%PORTDOCS%%%%EXAMPLESDIR%%/debug2html
-%%PORTDOCS%%%%EXAMPLESDIR%%/debugfind
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/400.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/403.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/408.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/500.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/502.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/503.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/504.http
-%%PORTDOCS%%%%EXAMPLESDIR%%/errorfiles/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/examples.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy-1.1.21-flx.1.pkg
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.init
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.spec
-%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.vim
-%%PORTDOCS%%%%EXAMPLESDIR%%/init.haproxy
-%%PORTDOCS%%%%EXAMPLESDIR%%/init.haproxy.flx0
-%%PORTDOCS%%%%EXAMPLESDIR%%/linux-2.4.21-40.EL-custom.diff
-%%PORTDOCS%%%%EXAMPLESDIR%%/option-http_proxy.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/rc.highsock
-%%PORTDOCS%%%%EXAMPLESDIR%%/stats_haproxy.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/tarpit.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/test-section-kw.cfg
-%%PORTDOCS%%%%EXAMPLESDIR%%/url-switching.cfg
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/errorfiles
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.rc.haproxy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cttproxy-src.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2ansi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debug2html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debugfind
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/400.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/403.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/408.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/500.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/502.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/503.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/504.http
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errorfiles/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy-1.1.21-flx.1.pkg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.init
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy.flx0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-2.4.21-40.EL-custom.diff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.highsock
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tarpit.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-section-kw.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/url-switching.cfg
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/errorfiles
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%