diff options
| -rw-r--r-- | net/haproxy/Makefile | 10 | ||||
| -rw-r--r-- | net/haproxy/PLIST | 6 | ||||
| -rw-r--r-- | net/haproxy/distinfo | 11 | ||||
| -rw-r--r-- | net/haproxy/options.mk | 21 | ||||
| -rw-r--r-- | net/haproxy/patches/patch-Makefile.diff | 14 |
5 files changed, 47 insertions, 15 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 493f65093b9..bd90e7bdf69 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2015/07/04 13:13:53 morr Exp $ +# $NetBSD: Makefile,v 1.22 2015/11/12 16:32:29 morr Exp $ -DISTNAME= haproxy-1.5.14 +DISTNAME= haproxy-1.6.2 CATEGORIES= net www -MASTER_SITES= http://haproxy.1wt.eu/download/1.5/src/ +MASTER_SITES= http://www.haproxy.org/download/1.6/src/ MAINTAINER= morr@NetBSD.org HOMEPAGE= http://haproxy.1wt.eu/ @@ -20,6 +20,7 @@ INSTALL_MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} RCD_SCRIPTS= haproxy EGDIR= ${PREFIX}/share/examples/${PKGBASE} +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} INSTALLATION_DIRS+= ${EGDIR} .include "../../mk/bsd.prefs.mk" @@ -51,7 +52,8 @@ 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/net/haproxy/PLIST b/net/haproxy/PLIST index d72c92a330a..003c96bf1dd 100644 --- a/net/haproxy/PLIST +++ b/net/haproxy/PLIST @@ -1,9 +1,5 @@ -@comment $NetBSD: PLIST,v 1.5 2014/07/14 15:30:10 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/11/12 16:32:29 morr Exp $ man/man1/haproxy.1 sbin/haproxy -sbin/haproxy-systemd-wrapper share/doc/haproxy/architecture.txt share/doc/haproxy/configuration.txt -share/doc/haproxy/haproxy-en.txt -share/doc/haproxy/haproxy-fr.txt -share/examples/haproxy/haproxy.cfg diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index 67414e3116e..56a4b8f9e2d 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2015/07/04 13:13:53 morr Exp $ +$NetBSD: distinfo,v 1.17 2015/11/12 16:32:29 morr Exp $ -SHA1 (haproxy-1.5.14.tar.gz) = 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f -RMD160 (haproxy-1.5.14.tar.gz) = 76577b9bf86390582bf43ae7649ed30761267d5d -Size (haproxy-1.5.14.tar.gz) = 1345345 bytes -SHA1 (patch-aa) = be43fca3478d170620607cfe7f4b9ed30f341651 +SHA1 (haproxy-1.6.2.tar.gz) = 407bed920315cf66500ab57aea0c402bad850129 +RMD160 (haproxy-1.6.2.tar.gz) = 0b6eb76be8ad540e6d0ced41e2f14463c11bca7d +SHA512 (haproxy-1.6.2.tar.gz) = 8cb1f2bb7e63e75b1350e37b4a06dae9627bc6004ceefc0e3dac7c6f56ea66cdc41ebaee0e536a5acbd4e5b067feba2589d3e360dd7fdc6d3d67c000f6c83ba9 +Size (haproxy-1.6.2.tar.gz) = 1538976 bytes +SHA1 (patch-Makefile.diff) = 585bf4f04c22da7187be0a8bf329dbf51dad5ee4 diff --git a/net/haproxy/options.mk b/net/haproxy/options.mk index b38ba829beb..65c47eae51b 100644 --- a/net/haproxy/options.mk +++ b/net/haproxy/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/03/14 20:36:23 rodent Exp $ +# $NetBSD: options.mk,v 1.3 2015/11/12 16:32:29 morr Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.haproxy PKG_SUPPORTED_OPTIONS= pcre ssl @@ -15,6 +15,25 @@ BUILD_MAKE_FLAGS+= USE_PCRE=1 .endif ### +### Support DeviceAtlas detection. +### +.if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas) +DEVICEATLAS_VERSION= 2.1 +DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION} +DISTFILES+= ${DEVICEATLAS_DISTFILE}.zip +DEVICEATLAS_HOMEPAGE= https://www.deviceatlas.com/deviceatlas-haproxy-module + +BUILD_MAKE_FLAGS+= USE_DEVICEATLAS=1 DEVICEATLAS_SRC=../${DEVICEATLAS_DISTFILE} + +.if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.zip) +FETCH_MESSAGE= "Please fetch ${DEVICEATLAS_DISTFILE}.zip manually from" +FETCH_MESSAGE+= "${DEVICEATLAS_HOMEPAGE}" +FETCH_MESSAGE+= "and put into" +FETCH_MESSAGE+= "${DISTDIR}" +.endif +.endif + +### ### Support OpenSSL for termination. ### .if !empty(PKG_OPTIONS:Mssl) diff --git a/net/haproxy/patches/patch-Makefile.diff b/net/haproxy/patches/patch-Makefile.diff new file mode 100644 index 00000000000..780dc379185 --- /dev/null +++ b/net/haproxy/patches/patch-Makefile.diff @@ -0,0 +1,14 @@ +--- Makefile.orig 2015-10-30 11:52:16.000000000 +0000 ++++ Makefile 2015-10-30 11:52:35.000000000 +0000 +--- Makefile.orig 2015-11-03 10:22:06.000000000 +0000 ++++ Makefile +@@ -801,9 +801,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D + + install-doc: + install -d "$(DESTDIR)$(DOCDIR)" +- for x in $(DOCUMENTATION); do \ +- install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \ +- done + + install-bin: haproxy $(EXTRA) + install -d "$(DESTDIR)$(SBINDIR)" |