From nobody Tue May 17 11:08:39 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B6B081AE311F; Tue, 17 May 2022 11:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2YJl4flSz3C0F; Tue, 17 May 2022 11:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652785719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K403+8lSj2PYR5GZcGEzszqHHSkTq65D50ZzABFnH6c=; b=P4e25/06XHLMsPM0PuzK8thnfUaqKD2Ok8CJZsqjRwJfXg5KHEc/IVos658frlOd36/+zH yHyeKZXkJ52H2dXdozZpyeWKAy5ER9K5A2Yv9lj1rsRoF8410O9R4OZjCA3+ejdZSMAVwM SxUx+a7/Lzhib++YjL/leLe7mQq5WFT1ks7gBzwejU+EWOdHy4y7e/zHO7ZW+5sLZ3GBU8 AMVdw9oL1138Ijqe/k2eg5LIjy91c+YOh2FZYRd6rbUFR5rtmFgeh7zhvW41taIB+bSJEa 9Ce1ugCXSTXchO9bqg9c2EMtpWOGVKbqAavpIAYhs5aLZEZHAYOhIAu3niMwmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7BE5513AC7; Tue, 17 May 2022 11:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HB8dWR000501; Tue, 17 May 2022 11:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HB8dBh000500; Tue, 17 May 2022 11:08:39 GMT (envelope-from git) Date: Tue, 17 May 2022 11:08:39 GMT Message-Id: <202205171108.24HB8dBh000500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Sivachenko Subject: git: b1c888bb6487 - main - net/haproxy: remove ports for obsoleted versions 1.9 and 2.1. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: demon X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1c888bb648710325e9dd9978278255755e9d681 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652785719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K403+8lSj2PYR5GZcGEzszqHHSkTq65D50ZzABFnH6c=; b=ARe97d3xGiECnDAj8mH14jKLryaNpJhI2kkLO8lJMk9htXRho9Fc9x32z2YPMTsDL4rGKr C71QzaeS7Ko8/WGMP220tI4r/18BLjjQWZZkiVVpPt4RMAZ085gnp1iRna6CZ6cqw38V39 Q3xLY9LxxeIR3OeBnR2/Lkzr8FIVvPfIFLjrV8c7xtF8MX4Jm+Wr54S+KuGEKwg8yhmDyI PdDhofTRPmNrzr4DNr4bnFz4BXm0+sHECqhiRsz0IHAC4KulUiC79pE0d5OqGy0fFN3LlA Pw7cSL8Wewe4Hn9m694uyPq87gBccPkHGfsBj9WJQWyOejPsgRgSw+D5jm2VGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652785719; a=rsa-sha256; cv=none; b=ST5C/8l5aNxdt6KnqSbG2DBVfh2mj+47ze5sjCOswD+sy7+Loklrb/aPhgxtRvqztyDXU7 TbsSDNyPXk72m+n8FfZpKEUfFOhlfGlBCcZu25iPe697NZYxXhHo6YBDHLnjnNdoFb4qIZ +mFfYE018AhCqYFMta25qUHcpfHJ9qdjwMeTVqaYV1FvyxRyPjA0LgW32wSVHaP76b7X8n OX737MYiUwmtY3sgdj4KMWsWtIIwEC1QusJ87IUCA5RkRKhMmxcPx0ySTg4dCiJj8QjZu5 2H0nlsw//GVG+qbrVbaS35bNCRdKmSjKGuf7CFSdFfJ/TxSLycGhdMoPZCoFag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1c888bb648710325e9dd9978278255755e9d681 commit b1c888bb648710325e9dd9978278255755e9d681 Author: Dmitry Sivachenko AuthorDate: 2022-05-17 11:07:32 +0000 Commit: Dmitry Sivachenko CommitDate: 2022-05-17 11:07:32 +0000 net/haproxy: remove ports for obsoleted versions 1.9 and 2.1. --- net/Makefile | 2 - net/haproxy-devel/Makefile | 2 +- net/haproxy/Makefile | 2 +- net/haproxy17/Makefile | 2 +- net/haproxy18/Makefile | 2 +- net/haproxy19/Makefile | 61 ---------- net/haproxy19/distinfo | 3 - net/haproxy19/files/haproxy.in | 130 --------------------- .../files/patch-include-common-hathreads.h | 11 -- net/haproxy19/pkg-descr | 6 - net/haproxy19/pkg-plist | 104 ----------------- net/haproxy20/Makefile | 2 +- net/haproxy21/Makefile | 63 ---------- net/haproxy21/distinfo | 3 - net/haproxy21/files/haproxy.in | 130 --------------------- .../files/patch-include-common-hathreads.h | 11 -- net/haproxy21/pkg-descr | 6 - net/haproxy21/pkg-plist | 98 ---------------- net/haproxy22/Makefile | 2 +- net/haproxy23/Makefile | 2 +- net/haproxy24/Makefile | 2 +- 21 files changed, 8 insertions(+), 636 deletions(-) diff --git a/net/Makefile b/net/Makefile index 7f7715c183d1..7f3021a91582 100644 --- a/net/Makefile +++ b/net/Makefile @@ -237,9 +237,7 @@ SUBDIR += haproxy-devel SUBDIR += haproxy17 SUBDIR += haproxy18 - SUBDIR += haproxy19 SUBDIR += haproxy20 - SUBDIR += haproxy21 SUBDIR += haproxy22 SUBDIR += haproxy23 SUBDIR += haproxy24 diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 7e6a8957f3a0..d4be58147018 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -23,7 +23,7 @@ default_CONFLICTS_INSTALL= haproxy-devel-lua lua_CONFLICTS_INSTALL= haproxy-devel lua_PKGNAMESUFFIX= devel-lua -CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 haproxy22 haproxy23 haproxy24 +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 ALL_TARGET= all admin/halog/halog MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 2acac38faa8c..82015612366b 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -21,7 +21,7 @@ default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy lua_PKGNAMESUFFIX= -lua -CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 haproxy22 haproxy23 haproxy24 +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 ALL_TARGET= all admin/halog/halog MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 572b736fb8a9..59af23b2a205 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4' BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4' -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy18 haproxy19 haproxy20 haproxy21 +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy18 haproxy20 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 9ab3f2da746e..58d479803aec 100644 --- a/net/haproxy18/Makefile +++ b/net/haproxy18/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy19 haproxy20 haproxy21 +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy20 USES= cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile deleted file mode 100644 index 9a4db6b9ad71..000000000000 --- a/net/haproxy19/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Created by: Clement Laforet - -PORTNAME= haproxy -DISTVERSION= 1.9.16 -CATEGORIES= net www -PKGNAMESUFFIX= 19 -MASTER_SITES= http://www.haproxy.org/download/1.9/src/ - -MAINTAINER= demon@FreeBSD.org -COMMENT= Reliable, high performance TCP/HTTP load balancer - -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi - -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy20 haproxy21 - -USES= compiler:c++11-lang cpe gmake -USE_RC_SUBR= haproxy - -MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ - CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" - -OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS -OPTIONS_RADIO= PCRE -OPTIONS_RADIO_PCRE= DPCRE SPCRE -DPCRE_DESC= Link dynamically -SPCRE_DESC= Link statically -DEVICEATLAS_DESC= DeviceAtlas Device Detection support -OPTIONS_DEFAULT= SPCRE OPENSSL - -DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 -SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 -DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c -DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include -OPENSSL_USES= ssl -OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} -LUA_USES= lua:53 -LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} - -.include - -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -MAKE_ARGS+= USE_REGPARM=1 -.endif - -post-build: - cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) - -.include diff --git a/net/haproxy19/distinfo b/net/haproxy19/distinfo deleted file mode 100644 index 4f00b93c61ca..000000000000 --- a/net/haproxy19/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1596197948 -SHA256 (haproxy-1.9.16.tar.gz) = 47174becf7c641c837b7338210f6194f266de45c49a38b68655fcd980f95bdbf -SIZE (haproxy-1.9.16.tar.gz) = 2502448 diff --git a/net/haproxy19/files/haproxy.in b/net/haproxy19/files/haproxy.in deleted file mode 100644 index e9eb2147c412..000000000000 --- a/net/haproxy19/files/haproxy.in +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# PROVIDE: haproxy -# REQUIRE: DAEMON LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable haproxy: -# -# haproxy_enable (bool): default: "NO" -# Set to "YES" to enable haproxy -# haproxy_pidfile (str): default: /var/run/haproxy.pid -# Set to the full path of the pid file -# haproxy_config (str): default: %%PREFIX%%/etc/haproxy.conf -# Set to the full path of the config file -# haproxy_flags (str): default: Autogenerated using pidfile and config options -# Set to override with your own options -# haproxy_profiles (str): default: empty -# Set to space-separated list of profiles: for each profile separate haproxy -# process will be spawned, with haproxy-${profile}.conf config file. -# You can override default pidfile and config file for each profile with -# haproxy_${profile}_config and haproxy_${profile}_pidfile. - -. /etc/rc.subr - -name="haproxy" -rcvar=haproxy_enable -command="%%PREFIX%%/sbin/haproxy" -extra_commands="reload configtest hardstop hardreload softreload" -reload_cmd="haproxy_reload" -hardreload_cmd="haproxy_reload" -hardreload_precmd="def_hardreload_option" -softreload_cmd="haproxy_reload" -softreload_precmd="def_softreload_option" -stop_cmd="haproxy_stop" -hardstop_cmd="haproxy_stop" -hardstop_precmd="def_hardstop_signal" - -: ${haproxy_enable:="NO"} -: ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"} -: ${haproxy_socket:="/var/run/${name}/socket"} -pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"} - -def_hardreload_option() -{ - reload_opt="-st" -} - -def_softreload_option() -{ - reload_opt="-x ${haproxy_socket} -sf" -} - -def_hardstop_signal() -{ - sig_stop="TERM" -} - -load_rc_config $name - -is_valid_profile() { - local profile - for profile in $haproxy_profiles; do - if [ "$profile" = "$1" ]; then - return 0 - fi - done - return 1 -} - -if [ -n "$2" ]; then - profile=$2 - if ! is_valid_profile $profile; then - echo "$0: no such profile ($profile) defined in ${name}_profiles." - exit 1 - fi - eval haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}" - eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}" -else - if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${haproxy_profiles}; do - echo "===> ${name} profile: ${profile}" - %%PREFIX%%/etc/rc.d/haproxy $1 ${profile} - retcode="$?" - if [ ${retcode} -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -: ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"} -configtest_cmd="$command -c -f $haproxy_config" -start_precmd="$command -q -c -f $haproxy_config" -required_files=$haproxy_config -sig_stop=SIGUSR1 -reload_opt="-sf" - -haproxy_reload() -{ - ${command} -q -c -f ${haproxy_config} - if [ $? -ne 0 ]; then - err 1 "Error found in ${haproxy_config} - not reloading current process!" - fi - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - ${command} ${haproxy_flags} $reload_opt $(cat ${pidfile}) - else - _run_rc_notrunning - return 1 - fi -} - -haproxy_stop() -{ - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - rc_pid=$(cat ${pidfile}) - kill -$sig_stop $rc_pid - wait_for_pids $rc_pid - else - _run_rc_notrunning - return 1 - fi -} - -run_rc_command "$1" diff --git a/net/haproxy19/files/patch-include-common-hathreads.h b/net/haproxy19/files/patch-include-common-hathreads.h deleted file mode 100644 index eddbc9a6e072..000000000000 --- a/net/haproxy19/files/patch-include-common-hathreads.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 -+++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000 -@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit - /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to - * have a header file regrouping all functions dealing with threads. */ - --#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) - /* gcc < 4.7 */ - - #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i) diff --git a/net/haproxy19/pkg-descr b/net/haproxy19/pkg-descr deleted file mode 100644 index 678317bd6baf..000000000000 --- a/net/haproxy19/pkg-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. - -WWW: http://www.haproxy.org diff --git a/net/haproxy19/pkg-plist b/net/haproxy19/pkg-plist deleted file mode 100644 index d7b72bae2297..000000000000 --- a/net/haproxy19/pkg-plist +++ /dev/null @@ -1,104 +0,0 @@ -man/man1/haproxy.1.gz -sbin/halog -sbin/haproxy -%%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/SPOE.txt -%%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/acl.fig -%%PORTDOCS%%%%DOCSDIR%%/architecture.txt -%%PORTDOCS%%%%DOCSDIR%%/close-options.txt -%%PORTDOCS%%%%DOCSDIR%%/coding-style.txt -%%PORTDOCS%%%%DOCSDIR%%/configuration.txt -%%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-sharing.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/dynamic-buffers.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt -%%PORTDOCS%%%%DOCSDIR%%/gpl.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy.1 -%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-api.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/filters.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/list.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig -%%PORTDOCS%%%%DOCSDIR%%/intro.txt -%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt -%%PORTDOCS%%%%DOCSDIR%%/linux-syn-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png -%%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py -%%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst -%%PORTDOCS%%%%DOCSDIR%%/lua.txt -%%PORTDOCS%%%%DOCSDIR%%/management.txt -%%PORTDOCS%%%%DOCSDIR%%/netscaler-client-ip-insertion-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt -%%PORTDOCS%%%%DOCSDIR%%/peers.txt -%%PORTDOCS%%%%DOCSDIR%%/peers-v2.0.txt -%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/queuing.fig -%%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.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%%/haproxy.init -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.spec -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/haproxy.vim -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.haproxy -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/seamless_reload.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats_haproxy.sh -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile index de413a9b5b89..ec748088bf35 100644 --- a/net/haproxy20/Makefile +++ b/net/haproxy20/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy21 +CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile deleted file mode 100644 index 1fc1cab24215..000000000000 --- a/net/haproxy21/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# Created by: Hugo Saro - -PORTNAME= haproxy -DISTVERSION= 2.1.12 -CATEGORIES= net www -PKGNAMESUFFIX= 21 -MASTER_SITES= http://www.haproxy.org/download/2.1/src/ - -MAINTAINER= demon@FreeBSD.org -COMMENT= Reliable, high performance TCP/HTTP load balancer - -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi - -CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 - -USES= compiler:c++11-lang cpe gmake -USE_RC_SUBR= haproxy - -MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ - CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" - -OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX -OPTIONS_RADIO= PCRE -OPTIONS_RADIO_PCRE= DPCRE SPCRE -DPCRE_DESC= Link dynamically -SPCRE_DESC= Link statically -DEVICEATLAS_DESC= DeviceAtlas Device Detection support -PROMEX_DESC= Enable Prometheus exporter -OPTIONS_DEFAULT= SPCRE OPENSSL PROMEX - -DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 -SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre -SPCRE_MAKE_ARGS= USE_PCRE=1 USE_STATIC_PCRE=1 USE_PCRE_JIT=1 -DEVICEATLAS_LIB_DEPENDS= libda.so:net/deviceatlas-enterprise-c -DEVICEATLAS_MAKE_ARGS= USE_DEVICEATLAS=1 DEVICEATLAS_LIB=${LOCALBASE}/lib DEVICEATLAS_INC=${LOCALBASE}/include -PROMEX_MAKE_ARGS= EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" -OPENSSL_USES= ssl -OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} -LUA_USES= lua:53 -LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} - -.include - -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -MAKE_ARGS+= USE_REGPARM=1 -.endif - -post-build: - cd ${WRKSRC}/contrib/halog && ${MAKE_CMD} ${MAKE_ENV} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/halog/halog ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) - -.include diff --git a/net/haproxy21/distinfo b/net/haproxy21/distinfo deleted file mode 100644 index 7396492d19a4..000000000000 --- a/net/haproxy21/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1616144307 -SHA256 (haproxy-2.1.12.tar.gz) = acebbf932f2703ee287d6e945bd845cde8c9db9a13f7cbb2a99671499c558056 -SIZE (haproxy-2.1.12.tar.gz) = 2731180 diff --git a/net/haproxy21/files/haproxy.in b/net/haproxy21/files/haproxy.in deleted file mode 100644 index e9eb2147c412..000000000000 --- a/net/haproxy21/files/haproxy.in +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -# PROVIDE: haproxy -# REQUIRE: DAEMON LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable haproxy: -# -# haproxy_enable (bool): default: "NO" -# Set to "YES" to enable haproxy -# haproxy_pidfile (str): default: /var/run/haproxy.pid -# Set to the full path of the pid file -# haproxy_config (str): default: %%PREFIX%%/etc/haproxy.conf -# Set to the full path of the config file -# haproxy_flags (str): default: Autogenerated using pidfile and config options -# Set to override with your own options -# haproxy_profiles (str): default: empty -# Set to space-separated list of profiles: for each profile separate haproxy -# process will be spawned, with haproxy-${profile}.conf config file. -# You can override default pidfile and config file for each profile with -# haproxy_${profile}_config and haproxy_${profile}_pidfile. - -. /etc/rc.subr - -name="haproxy" -rcvar=haproxy_enable -command="%%PREFIX%%/sbin/haproxy" -extra_commands="reload configtest hardstop hardreload softreload" -reload_cmd="haproxy_reload" -hardreload_cmd="haproxy_reload" -hardreload_precmd="def_hardreload_option" -softreload_cmd="haproxy_reload" -softreload_precmd="def_softreload_option" -stop_cmd="haproxy_stop" -hardstop_cmd="haproxy_stop" -hardstop_precmd="def_hardstop_signal" - -: ${haproxy_enable:="NO"} -: ${haproxy_config:="%%PREFIX%%/etc/${name}.conf"} -: ${haproxy_socket:="/var/run/${name}/socket"} -pidfile=${haproxy_pidfile:-"/var/run/haproxy.pid"} - -def_hardreload_option() -{ - reload_opt="-st" -} - -def_softreload_option() -{ - reload_opt="-x ${haproxy_socket} -sf" -} - -def_hardstop_signal() -{ - sig_stop="TERM" -} - -load_rc_config $name - -is_valid_profile() { - local profile - for profile in $haproxy_profiles; do - if [ "$profile" = "$1" ]; then - return 0 - fi - done - return 1 -} - -if [ -n "$2" ]; then - profile=$2 - if ! is_valid_profile $profile; then - echo "$0: no such profile ($profile) defined in ${name}_profiles." - exit 1 - fi - eval haproxy_config="\${haproxy_${profile}_config:-%%PREFIX%%/etc/haproxy-${profile}.conf}" - eval pidfile="\${haproxy_${profile}_pidfile:-/var/run/haproxy-${profile}.pid}" -else - if [ "x${haproxy_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${haproxy_profiles}; do - echo "===> ${name} profile: ${profile}" - %%PREFIX%%/etc/rc.d/haproxy $1 ${profile} - retcode="$?" - if [ ${retcode} -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -: ${haproxy_flags:="-q -f ${haproxy_config} -p ${pidfile}"} -configtest_cmd="$command -c -f $haproxy_config" -start_precmd="$command -q -c -f $haproxy_config" -required_files=$haproxy_config -sig_stop=SIGUSR1 -reload_opt="-sf" - -haproxy_reload() -{ - ${command} -q -c -f ${haproxy_config} - if [ $? -ne 0 ]; then - err 1 "Error found in ${haproxy_config} - not reloading current process!" - fi - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - ${command} ${haproxy_flags} $reload_opt $(cat ${pidfile}) - else - _run_rc_notrunning - return 1 - fi -} - -haproxy_stop() -{ - rc_pid=$(check_pidfile ${pidfile} ${command}) - if [ $rc_pid ]; then - rc_pid=$(cat ${pidfile}) - kill -$sig_stop $rc_pid - wait_for_pids $rc_pid - else - _run_rc_notrunning - return 1 - fi -} - -run_rc_command "$1" diff --git a/net/haproxy21/files/patch-include-common-hathreads.h b/net/haproxy21/files/patch-include-common-hathreads.h deleted file mode 100644 index eddbc9a6e072..000000000000 --- a/net/haproxy21/files/patch-include-common-hathreads.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 -+++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000 -@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit - /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to - * have a header file regrouping all functions dealing with threads. */ - --#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) -+#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) - /* gcc < 4.7 */ - - #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i) diff --git a/net/haproxy21/pkg-descr b/net/haproxy21/pkg-descr deleted file mode 100644 index 678317bd6baf..000000000000 --- a/net/haproxy21/pkg-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. - -WWW: http://www.haproxy.org diff --git a/net/haproxy21/pkg-plist b/net/haproxy21/pkg-plist deleted file mode 100644 index 09381167265d..000000000000 --- a/net/haproxy21/pkg-plist +++ /dev/null @@ -1,98 +0,0 @@ -man/man1/haproxy.1.gz -sbin/halog -sbin/haproxy -%%PORTDOCS%%%%DOCSDIR%%/51Degrees-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/DeviceAtlas-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/SOCKS4.protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/SPOE.txt -%%PORTDOCS%%%%DOCSDIR%%/WURFL-device-detection.txt -%%PORTDOCS%%%%DOCSDIR%%/acl.fig -%%PORTDOCS%%%%DOCSDIR%%/architecture.txt -%%PORTDOCS%%%%DOCSDIR%%/close-options.txt -%%PORTDOCS%%%%DOCSDIR%%/coding-style.txt -%%PORTDOCS%%%%DOCSDIR%%/configuration.txt -%%PORTDOCS%%%%DOCSDIR%%/cookie-options.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends-v0.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/backends.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/be-fe-changes.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/binding-possibilities.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/config-language.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-reuse.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/connection-sharing.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/dynamic-buffers.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/how-it-works.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http2.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/http_load_time.url -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/rate-shaping.txt -%%PORTDOCS%%%%DOCSDIR%%/design-thoughts/sess_par_sec.txt -%%PORTDOCS%%%%DOCSDIR%%/gpl.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy.1 -%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-api.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg -%%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/filters.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/htx-api.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/initcalls.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/list.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.png -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/lua_socket.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/naming.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/notes-layers.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.dia -%%PORTDOCS%%%%DOCSDIR%%/internals/pattern.pdf -%%PORTDOCS%%%%DOCSDIR%%/internals/polling-states.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/repartition-be-fe-fi.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/sequence.fig -%%PORTDOCS%%%%DOCSDIR%%/internals/ssl_cert.dia -%%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt -%%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig -%%PORTDOCS%%%%DOCSDIR%%/intro.txt -%%PORTDOCS%%%%DOCSDIR%%/lgpl.txt -%%PORTDOCS%%%%DOCSDIR%%/linux-syn-cookies.txt -%%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig -%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png -%%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py -%%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst -%%PORTDOCS%%%%DOCSDIR%%/lua.txt -%%PORTDOCS%%%%DOCSDIR%%/management.txt -%%PORTDOCS%%%%DOCSDIR%%/netscaler-client-ip-insertion-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt -%%PORTDOCS%%%%DOCSDIR%%/peers.txt -%%PORTDOCS%%%%DOCSDIR%%/peers-v2.0.txt -%%PORTDOCS%%%%DOCSDIR%%/proxy-protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/queuing.fig -%%PORTDOCS%%%%DOCSDIR%%/regression-testing.txt -%%PORTDOCS%%%%DOCSDIR%%/seamless_reload.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/content-sw-sample.cfg -%%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%%/haproxy.init -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/option-http_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/socks4.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_proxy.cfg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wurfl-example.cfg diff --git a/net/haproxy22/Makefile b/net/haproxy22/Makefile index 9e56c952bba7..74a2f7336f72 100644 --- a/net/haproxy22/Makefile +++ b/net/haproxy22/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy20 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy23/Makefile b/net/haproxy23/Makefile index 8c0a79fcbc92..d763e12d8382 100644 --- a/net/haproxy23/Makefile +++ b/net/haproxy23/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 +CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy diff --git a/net/haproxy24/Makefile b/net/haproxy24/Makefile index 6c294740c5b4..205f9b6fd612 100644 --- a/net/haproxy24/Makefile +++ b/net/haproxy24/Makefile @@ -19,7 +19,7 @@ default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy lua_PKGNAMESUFFIX= 24-lua -CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 +CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy20 USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy