pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

haproxy*: Drop old and unmaintained packages



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Oct 7 21:09:58 2017 +0200
Changeset:	5ba8b412dec2badfff483f3f529b5db83f89fb3c

Removed Files:
	haproxy-devel/DESCR
	haproxy-devel/Makefile
	haproxy-devel/PLIST
	haproxy-devel/distinfo
	haproxy-devel/files/haproxy.sh
	haproxy-devel/options.mk
	haproxy-devel/patches/patch-Makefile.diff
	haproxy/DESCR
	haproxy/Makefile
	haproxy/PLIST
	haproxy/PLIST.Linux
	haproxy/distinfo
	haproxy/files/haproxy.sh
	haproxy/files/smf/manifest.xml
	haproxy/options.mk
	haproxy/patches/patch-Makefile
	haproxy15/DESCR
	haproxy15/Makefile
	haproxy15/PLIST
	haproxy15/distinfo
	haproxy15/files/haproxy.sh
	haproxy15/options.mk
	haproxy15/patches/patch-Makefile

Log Message:
haproxy*: Drop old and unmaintained packages

Older than net/haproxy.

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

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

diffstat:
 haproxy-devel/DESCR                       |  6 ---
 haproxy-devel/Makefile                    | 63 ---------------------------
 haproxy-devel/PLIST                       |  6 ---
 haproxy-devel/distinfo                    |  7 ---
 haproxy-devel/files/haproxy.sh            | 29 -------------
 haproxy-devel/options.mk                  | 42 ------------------
 haproxy-devel/patches/patch-Makefile.diff | 12 ------
 haproxy/DESCR                             |  6 ---
 haproxy/Makefile                          | 64 ----------------------------
 haproxy/PLIST                             | 11 -----
 haproxy/PLIST.Linux                       |  2 -
 haproxy/distinfo                          |  7 ---
 haproxy/files/haproxy.sh                  | 43 -------------------
 haproxy/files/smf/manifest.xml            | 28 ------------
 haproxy/options.mk                        | 53 -----------------------
 haproxy/patches/patch-Makefile            | 16 -------
 haproxy15/DESCR                           |  6 ---
 haproxy15/Makefile                        | 71 -------------------------------
 haproxy15/PLIST                           | 10 -----
 haproxy15/distinfo                        |  6 ---
 haproxy15/files/haproxy.sh                | 26 -----------
 haproxy15/options.mk                      | 42 ------------------
 haproxy15/patches/patch-Makefile          | 54 -----------------------
 23 files changed, 610 deletions(-)

diffs:
diff --git a/haproxy-devel/DESCR b/haproxy-devel/DESCR
deleted file mode 100644
index 9bd649a4a5..0000000000
--- a/haproxy-devel/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-HAProxy is a free, very fast and reliable solution offering high
-availability, load balancing, and proxying for TCP and HTTP-based
-applications. It is particularly suited for web sites crawling under
-very high loads while needing persistence or Layer7 processing.
-Supporting tens of thousands of connections is clearly realistic with
-todays hardware. This is the development version.
diff --git a/haproxy-devel/Makefile b/haproxy-devel/Makefile
deleted file mode 100644
index 8f258feb08..0000000000
--- a/haproxy-devel/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/09/01 20:45:04 devnexen Exp $
-
-DISTNAME=	haproxy-1.7-dev0
-PKGBASE=	haproxy-devel
-CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.7/src/devel/
-DISTFILES=	${DISTNAME}.tar.gz
-
-MAINTAINER=	devnexen%gmail.com@localhost
-HOMEPAGE=	http://haproxy.1wt.eu/
-COMMENT=	Reliable, high performance TCP/HTTP load balancer
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=		gmake
-BUILD_MAKE_FLAGS+=	TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib USE_ZLIB=1
-INSTALL_MAKE_FLAGS+=	TARGET=${TARGET}
-INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/${PKGBASE}
-INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
-
-.include "options.mk"
-
-RCD_SCRIPTS=		haproxy
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS+=	${EGDIR}
-INSTALLATION_DIRS+=	${DOCDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-TARGET=netbsd
-.elif ${OPSYS} == "FreeBSD"
-TARGET=freebsd
-.elif ${OPSYS} == "OpenBSD"
-TARGET=openbsd
-.elif ${OPSYS} == "SunOS"
-TARGET=solaris
-.elif ${OPSYS} == "Linux"
-.  if !empty(OS_VERSION:M2.6.*)
-TARGET=linux26
-.  elif !empty(OS_VERSION:M2.4.*)
-.    if exists(/usr/include/linux/eventpoll.h)
-TARGET=linux24e
-.    else
-TARGET=linux24
-.    endif
-.  else
-TARGET=generic
-.  endif
-.else
-TARGET=generic
-.endif
-
-LIBS.SunOS+=		-lxnet
-
-post-install:
-	${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
deleted file mode 100644
index e87de8ce39..0000000000
--- a/haproxy-devel/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/09/01 20:45:05 devnexen Exp $
-man/man1/haproxy.1
-sbin/haproxy
-sbin/haproxy-systemd-wrapper
-share/doc/haproxy-devel/architecture.txt
-share/doc/haproxy-devel/configuration.txt
diff --git a/haproxy-devel/distinfo b/haproxy-devel/distinfo
deleted file mode 100644
index 629966afb7..0000000000
--- a/haproxy-devel/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-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
deleted file mode 100644
index 3d6e2e2359..0000000000
--- a/haproxy-devel/files/haproxy.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: haproxy.sh,v 1.2 2014/04/27 01:28:01 rodent Exp $
-#
-
-# PROVIDE: haproxy
-# REQUIRE: network
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="haproxy"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="${conf_file}"
-command_args="-f ${conf_file}"
-extra_commands="configtest"
-configtest_cmd="haproxy_configtest"
-
-haproxy_configtest()
-{
-	if [ ! -f ${conf_file} ]; then
-		warn "${conf_file} does not exist."
-		return 1;
-	fi
-	${command} -c -f ${conf_file}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/haproxy-devel/options.mk b/haproxy-devel/options.mk
deleted file mode 100644
index b5eb64f9e9..0000000000
--- a/haproxy-devel/options.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/09/01 20:45:05 devnexen Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy-devel
-PKG_SUPPORTED_OPTIONS=	pcre ssl deviceatlas
-PKG_SUGGESTED_OPTIONS=	pcre ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use libpcre rather than libc for header processing regexp
-###
-.if !empty(PKG_OPTIONS:Mpcre)
-.  include "../../devel/pcre/buildlink3.mk"
-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)
-.  include "../../security/openssl/buildlink3.mk"
-BUILD_MAKE_FLAGS+=	USE_OPENSSL=1
-.endif
diff --git a/haproxy-devel/patches/patch-Makefile.diff b/haproxy-devel/patches/patch-Makefile.diff
deleted file mode 100644
index ea3d83b476..0000000000
--- a/haproxy-devel/patches/patch-Makefile.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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)"
diff --git a/haproxy/DESCR b/haproxy/DESCR
deleted file mode 100644
index f2e3c282e2..0000000000
--- a/haproxy/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-HAProxy is a free, very fast and reliable solution offering high
-availability, load balancing, and proxying for TCP and HTTP-based
-applications. It is particularly suited for web sites crawling under
-very high loads while needing persistence or Layer7 processing.
-Supporting tens of thousands of connections is clearly realistic with
-todays hardware.
diff --git a/haproxy/Makefile b/haproxy/Makefile
deleted file mode 100644
index 774bd13f2c..0000000000
--- a/haproxy/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2016/10/13 19:08:34 morr Exp $
-
-DISTNAME=	haproxy-1.6.9
-PKGREVISION=	1
-CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.6/src/
-
-MAINTAINER=	morr%NetBSD.org@localhost
-HOMEPAGE=	http://haproxy.org/
-COMMENT=	Reliable, high performance TCP/HTTP load balancer
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=		gmake
-BUILD_MAKE_FLAGS+=	TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib \
-			USE_ZLIB=1 \
-			USE_REGPARM=1
-
-INSTALL_MAKE_FLAGS+=	TARGET=${TARGET}
-INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/${PKGBASE}
-INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
-
-.include "options.mk"
-
-RCD_SCRIPTS=		haproxy
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
-INSTALLATION_DIRS+=	${EGDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-TARGET=netbsd
-.elif ${OPSYS} == "FreeBSD"
-TARGET=freebsd
-.elif ${OPSYS} == "OpenBSD"
-TARGET=openbsd
-.elif ${OPSYS} == "SunOS"
-TARGET=solaris
-.elif ${OPSYS} == "Linux"
-.  if !empty(OS_VERSION:M2.6.*)
-TARGET=linux26
-.  elif !empty(OS_VERSION:M2.4.*)
-.    if exists(/usr/include/linux/eventpoll.h)
-TARGET=linux24e
-.    else
-TARGET=linux24
-.    endif
-.  else
-TARGET=generic
-.  endif
-.else
-TARGET=generic
-.endif
-
-LIBS.SunOS+=		-lxnet
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${DESTDIR}${EGDIR}/
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/haproxy/PLIST b/haproxy/PLIST
deleted file mode 100644
index 7a1ddd079a..0000000000
--- a/haproxy/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2016/03/14 09:23:31 fhajny Exp $
-man/man1/haproxy.1
-sbin/haproxy
-share/doc/haproxy/architecture.txt
-share/doc/haproxy/configuration.txt
-share/examples/haproxy/acl-content-sw.cfg
-share/examples/haproxy/auth.cfg
-share/examples/haproxy/content-sw-sample.cfg
-share/examples/haproxy/option-http_proxy.cfg
-share/examples/haproxy/ssl.cfg
-share/examples/haproxy/transparent_proxy.cfg
diff --git a/haproxy/PLIST.Linux b/haproxy/PLIST.Linux
deleted file mode 100644
index 9a37715359..0000000000
--- a/haproxy/PLIST.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2016/06/03 12:07:20 jperkin Exp $
-sbin/haproxy-systemd-wrapper
diff --git a/haproxy/distinfo b/haproxy/distinfo
deleted file mode 100644
index 73a72821ad..0000000000
--- a/haproxy/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.24 2016/10/13 19:08:34 morr Exp $
-
-SHA1 (haproxy-1.6.9.tar.gz) = a40a9fb1b2ac409e6afcd2924327c21ac32e7b5b
-RMD160 (haproxy-1.6.9.tar.gz) = f2c1c2ec78bf72246ad70298712229b05a5e6035
-SHA512 (haproxy-1.6.9.tar.gz) = 0060a93c628689e1ca9e5845f9f93641f7647efc176cbf093bce59be19496492c317c8101fa50dd6181b130f861c74a20199f18e41ebd6995715364b1ea46a2e
-Size (haproxy-1.6.9.tar.gz) = 1566715 bytes
-SHA1 (patch-Makefile) = f635093d547270603ffea8837a42a8cca2e03bdf
diff --git a/haproxy/files/haproxy.sh b/haproxy/files/haproxy.sh
deleted file mode 100644
index 3e3081fe21..0000000000
--- a/haproxy/files/haproxy.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: haproxy.sh,v 1.3 2016/02/16 21:59:45 morr Exp $
-#
-
-# PROVIDE: haproxy
-# REQUIRE: network
-
-$_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"
-configtest_cmd="haproxy_configtest"
-haproxy_fdlimit=${haproxy_fdlimit-"1024"}
-
-haproxy_configtest()
-{
-	if [ ! -f ${conf_file} ]; then
-		warn "${conf_file} does not exist."
-		return 1;
-	fi
-	${command} -c -f ${conf_file}
-}
-
-# A default limit of 64 (at least on NetBSD) may be too low for many people
-SOFT_FDLIMIT=`ulimit -S -n`
-HARD_FDLIMIT=`ulimit -H -n`
-
-if [ ${haproxy_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
-  if [ ${haproxy_fdlimit} -le ${HARD_FDLIMIT} ]; then
-    ulimit -S -n ${haproxy_fdlimit}
-  else
-    ulimit -S -n ${HARD_FDLIMIT}
-  fi
-fi
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/haproxy/files/smf/manifest.xml b/haproxy/files/smf/manifest.xml
deleted file mode 100644
index e1a9f8d273..0000000000
--- a/haproxy/files/smf/manifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="export">
-  <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>
-    <template>
-      <common_name>
-        <loctext xml:lang="C">HAProxy</loctext>
-      </common_name>
-    </template>
-  </service>
-</service_bundle>
diff --git a/haproxy/options.mk b/haproxy/options.mk
deleted file mode 100644
index 7692c83ac8..0000000000
--- a/haproxy/options.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2016/01/03 17:13:40 morr Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS=	pcre ssl deviceatlas lua
-PKG_SUGGESTED_OPTIONS=	pcre ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use libpcre rather than libc for header processing regexp
-###
-.if !empty(PKG_OPTIONS:Mpcre)
-.  include "../../devel/pcre/buildlink3.mk"
-BUILD_MAKE_FLAGS+=	USE_PCRE=1
-.endif
-
-###
-### Use LUA
-###
-.if !empty(PKG_OPTIONS:Mlua)
-.  include "../../lang/lua/luaversion.mk"
-BUILD_MAKE_FLAGS+=	USE_LUA=1
-BUILD_MAKE_FLAGS+=	LUA_VERSION_ACCEPTED=53
-BUILD_MAKE_FLAGS+=	LUA_INC=${PREFIX}/${LUA_INCDIR}
-.  include "../../lang/lua/buildlink3.mk"
-.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=		${DISTNAME}.tar.gz ${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)
-.  include "../../security/openssl/buildlink3.mk"
-BUILD_MAKE_FLAGS+=	USE_OPENSSL=1
-.endif
diff --git a/haproxy/patches/patch-Makefile b/haproxy/patches/patch-Makefile
deleted file mode 100644
index a1f44fd7c3..0000000000
--- a/haproxy/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2016/07/03 14:06:45 morr Exp $
-
-Skip installing unnecessary documentation.
-
---- Makefile.orig	2016-06-26 17:41:01.000000000 +0000
-+++ Makefile
-@@ -812,9 +812,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:
- 	@for i in haproxy $(EXTRA); do \
diff --git a/haproxy15/DESCR b/haproxy15/DESCR
deleted file mode 100644
index f2e3c282e2..0000000000
--- a/haproxy15/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-HAProxy is a free, very fast and reliable solution offering high
-availability, load balancing, and proxying for TCP and HTTP-based
-applications. It is particularly suited for web sites crawling under
-very high loads while needing persistence or Layer7 processing.
-Supporting tens of thousands of connections is clearly realistic with
-todays hardware.
diff --git a/haproxy15/Makefile b/haproxy15/Makefile
deleted file mode 100644
index 1c558a9ede..0000000000
--- a/haproxy15/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2013/06/20 21:36:28 morr Exp $
-
-DISTNAME=	haproxy-1.5.15
-CATEGORIES=	net www
-MASTER_SITES=	http://www.haproxy.org/download/1.5/src/
-
-MAINTAINER=	morr%NetBSD.org@localhost
-HOMEPAGE=	http://haproxy.1wt.eu/
-COMMENT=	Reliable, high performance TCP/HTTP load balancer
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=		gmake
-BUILD_MAKE_FLAGS+=	TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib
-BUILD_MAKE_FLAGS+=	USE_LIBCRYPT=1
-#BUILD_MAKE_FLAGS+=	USE_CRYPT_H=1
-BUILD_MAKE_FLAGS+=	USE_OPENSSL=1
-BUILD_MAKE_FLAGS+=	USE_PCRE=1
-BUILD_MAKE_FLAGS+=	USE_PCRE_JIT=1
-#BUILD_MAKE_FLAGS+=	USE_STATIC_PCRE=1
-BUILD_MAKE_FLAGS+=	USE_ZLIB=1
-#.if ${MACHINE_ARCH} == "i386"
-#BUILD_MAKE_FLAGS+=	CPU=i686
-#.endif
-INSTALL_MAKE_FLAGS+=	TARGET=${TARGET}
-INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=	DOCDIR=${PREFIX}/share/doc/${PKGBASE}
-INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
-
-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"
-TARGET=freebsd
-.elif ${OPSYS} == "OpenBSD"
-TARGET=openbsd
-.elif ${OPSYS} == "SunOS"
-TARGET=solaris
-.elif ${OPSYS} == "Linux"
-.  if !empty(OS_VERSION:M2.6.*)
-TARGET=linux26
-.  elif !empty(OS_VERSION:M2.4.*)
-.    if exists(/usr/include/linux/eventpoll.h)
-TARGET=linux24e
-.    else
-TARGET=linux24
-.    endif
-.  endif
-.else
-TARGET=generic
-.endif
-
-LIBS.SunOS+=		-lxnet
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg ${DESTDIR}${EGDIR}/
-
-.include "options.mk"
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/haproxy15/PLIST b/haproxy15/PLIST
deleted file mode 100644
index 060c2d29ac..0000000000
--- a/haproxy15/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-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
-${PLIST.rcd}share/examples/rc.d/haproxy
diff --git a/haproxy15/distinfo b/haproxy15/distinfo
deleted file mode 100644
index d137d037a3..0000000000
--- a/haproxy15/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2013/06/20 21:36:28 morr Exp $
-
-SHA1 (haproxy-1.5.15.tar.gz) = a719d131b390e2b622d7cff25a6b3ed5a32cdd63
-RMD160 (haproxy-1.5.15.tar.gz) = 6315c3c7f6952ebbba17d0b8cf06425de3a36aec
-Size (haproxy-1.5.15.tar.gz) = 1356790 bytes
-SHA1 (patch-Makefile) = dcf0694c7592b27fe7787f2806a8a7cef777edc1
diff --git a/haproxy15/files/haproxy.sh b/haproxy15/files/haproxy.sh
deleted file mode 100755
index 134964b948..0000000000
--- a/haproxy15/files/haproxy.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: haproxy.sh,v 1.1.1.1 2011/10/31 23:34:07 morr Exp $
-#
-
-# PROVIDE: haproxy
-# REQUIRE: network
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name="haproxy"
-rcvar=$name
-command="/usr/pkg/sbin/${name}"
-conf_file="/usr/pkg/etc/${name}.cfg"
-required_files="${conf_file}"
-command_args="-f $conf_file"
-pid_file="/var/run/haproxy-private.pid"
-extra_commands="reload"
-
-haproxy_reload()
-{
-        ${command} -f ${conf_file} -p ${pid_file} -sf $(cat ${pid_file})
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/haproxy15/options.mk b/haproxy15/options.mk
deleted file mode 100644
index 9f3f092524..0000000000
--- a/haproxy15/options.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2015/09/01 20:45:05 devnexen Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy15
-PKG_SUPPORTED_OPTIONS=	pcre ssl deviceatlas
-PKG_SUGGESTED_OPTIONS=	pcre ssl
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use libpcre rather than libc for header processing regexp
-###
-.if !empty(PKG_OPTIONS:Mpcre)
-.  include "../../devel/pcre/buildlink3.mk"
-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)
-.  include "../../security/openssl/buildlink3.mk"
-BUILD_MAKE_FLAGS+=	USE_OPENSSL=1
-.endif
diff --git a/haproxy15/patches/patch-Makefile b/haproxy15/patches/patch-Makefile
deleted file mode 100644
index 67bd3db970..0000000000
--- a/haproxy15/patches/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-# patch adds NetBSD target and undefs CC
-
---- Makefile.orig	2014-10-08 08:07:23.000000000 +0000
-+++ Makefile
-@@ -89,7 +89,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
- # Use TARGET=<target_name> to optimize for a specifc target OS among the
- # following list (use the default "generic" if uncertain) :
- #    generic, linux22, linux24, linux24e, linux26, solaris,
--#    freebsd, openbsd, cygwin, custom, aix51, aix52
-+#    freebsd, osx, netbsd, openbsd, cygwin, custom, aix51, aix52
- TARGET =
- 
- #### TARGET CPU
-@@ -107,7 +107,7 @@ ARCH =
- 
- #### Toolchain options.
- # GCC is normally used both for compiling and linking.
--CC = gcc
-+#CC = gcc
- LD = $(CC)
- 
- #### Debug flags (typically "-g").
-@@ -288,6 +288,12 @@ ifeq ($(TARGET),osx)
-   USE_TPROXY     = implicit
-   USE_LIBCRYPT   = implicit
- else
-+ifeq ($(TARGET),netbsd)
-+  # This is for NetBSD
-+  USE_POLL       = implicit
-+  USE_KQUEUE     = implicit
-+  USE_TPROXY     = implicit
-+else
- ifeq ($(TARGET),openbsd)
-   # This is for OpenBSD >= 3.0
-   USE_POLL       = implicit
-@@ -317,6 +323,7 @@ ifeq ($(TARGET),cygwin)
- endif # cygwin
- endif # aix52
- endif # aix51
-+endif # netbsd
- endif # openbsd
- endif # osx
- endif # freebsd
-@@ -634,7 +641,7 @@ all:
- 	@echo "Please choose the target among the following supported list :"
- 	@echo
- 	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris"
--	@echo "   freebsd, openbsd, cygwin, custom, generic"
-+	@echo "   freebsd, osx, netbsd, openbsd, cygwin, custom, generic"
- 	@echo
- 	@echo "Use \"generic\" if you don't want any optimization, \"custom\" if you"
- 	@echo "want to precisely tweak every option, or choose the target which"


Home | Main Index | Thread Index | Old Index