aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/haproxy-devel/Makefile12
-rw-r--r--net/haproxy-devel/distinfo2
-rw-r--r--net/haproxy-devel/files/patch-Makefile30
-rw-r--r--net/haproxy/Makefile12
-rw-r--r--net/haproxy/distinfo2
-rw-r--r--net/haproxy/files/patch-Makefile30
6 files changed, 62 insertions, 26 deletions
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 0a91200a0b0a..8d0116ff012e 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= haproxy
-PORTVERSION= 1.1.20
+PORTVERSION= 1.1.21
PORTREVISION= 0
CATEGORIES= net www
MASTER_SITES= http://w.ods.org/tools/haproxy/ \
@@ -15,7 +15,7 @@ MASTER_SITES= http://w.ods.org/tools/haproxy/ \
MAINTAINER= sheepkiller@cultdeadsheep.org
COMMENT= High-performance and highly-robust TCP/HTTP load balancer
-STATS_INTERVAL= 0
+STATS_INTERVAL?= 0
REGEX_TYPE?= libc
MAKE_ENV+= REGEX=${REGEX_TYPE} INTERVAL=${STATS_INTERVAL}
@@ -26,6 +26,14 @@ PKGNAMESUFFIX= -pcre
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
.endif
+pre-fetch:
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Available options:"
+ @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine"
+ @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds,"
+ @${ECHO_MSG} " (default to 0, disabled)"
+ @${ECHO_MSG} ""
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index f60fa7fde7bf..29d53b11d553 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1 +1 @@
-MD5 (haproxy-1.1.20.tar.gz) = 0017b1fac1a61c3daccc504000edc4f2
+MD5 (haproxy-1.1.21.tar.gz) = 181d68471dd02c63c5a3dc65e9d6cdfe
diff --git a/net/haproxy-devel/files/patch-Makefile b/net/haproxy-devel/files/patch-Makefile
index 682befbd7c94..dba4715d5658 100644
--- a/net/haproxy-devel/files/patch-Makefile
+++ b/net/haproxy-devel/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Apr 16 21:43:09 2003
-+++ Makefile Wed Apr 30 17:07:18 2003
-@@ -1,22 +1,18 @@
+--- Makefile.orig Tue May 6 00:11:59 2003
++++ Makefile Tue Jun 3 16:22:55 2003
+@@ -1,22 +1,21 @@
# Select target OS. TARGET must match a system for which COPTS and LIBS are
# correctly defined below.
# You can set it on make's command line. eg: make TARGET=solaris
@@ -9,25 +9,35 @@
#TARGET = linux22
#TARGET = solaris
#TARGET = solarisv9
--#TARGET = openbsd
+ #TARGET = openbsd
-
-CC = gcc
-LD = gcc
-+TARGET = openbsd
++TARGET = FreeBSD
# By default, we use libc's regex.
-REGEX=libc
++#REGEX=libc
#REGEX=pcre
# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
--PCREDIR := $(shell pcre-config --prefix 2>/dev/null)
--#PCREDIR=/usr/local
-+#PCREDIR := $(shell pcre-config --prefix 2>/dev/null)
+-PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :)
++#PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :)
+ #PCREDIR=/usr/local
+PCREDIR=${LOCALBASE}
# This is for Linux 2.4 with netfilter
COPTS.linux24 = -O2 -DNETFILTER
-@@ -44,8 +40,8 @@
+@@ -38,14 +37,17 @@
+ COPTS.openbsd = -O2
+ LIBS.openbsd =
+
++COPTS.FreeBSD = -O2
++LIBS.FreeBSD =
++
+ COPTS.libc=
+ LIBS.libs=
+
COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
@@ -38,7 +48,7 @@
COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX))
LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX))
-@@ -53,16 +49,13 @@
+@@ -53,16 +55,13 @@
# - use -DSTATTIME=0 to disable statistics, else specify an interval in
# milliseconds.
# - use -DTPROXY to compile with transparent proxy support.
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 0a91200a0b0a..8d0116ff012e 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= haproxy
-PORTVERSION= 1.1.20
+PORTVERSION= 1.1.21
PORTREVISION= 0
CATEGORIES= net www
MASTER_SITES= http://w.ods.org/tools/haproxy/ \
@@ -15,7 +15,7 @@ MASTER_SITES= http://w.ods.org/tools/haproxy/ \
MAINTAINER= sheepkiller@cultdeadsheep.org
COMMENT= High-performance and highly-robust TCP/HTTP load balancer
-STATS_INTERVAL= 0
+STATS_INTERVAL?= 0
REGEX_TYPE?= libc
MAKE_ENV+= REGEX=${REGEX_TYPE} INTERVAL=${STATS_INTERVAL}
@@ -26,6 +26,14 @@ PKGNAMESUFFIX= -pcre
LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
.endif
+pre-fetch:
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Available options:"
+ @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine"
+ @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds,"
+ @${ECHO_MSG} " (default to 0, disabled)"
+ @${ECHO_MSG} ""
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index f60fa7fde7bf..29d53b11d553 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1 +1 @@
-MD5 (haproxy-1.1.20.tar.gz) = 0017b1fac1a61c3daccc504000edc4f2
+MD5 (haproxy-1.1.21.tar.gz) = 181d68471dd02c63c5a3dc65e9d6cdfe
diff --git a/net/haproxy/files/patch-Makefile b/net/haproxy/files/patch-Makefile
index 682befbd7c94..dba4715d5658 100644
--- a/net/haproxy/files/patch-Makefile
+++ b/net/haproxy/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Apr 16 21:43:09 2003
-+++ Makefile Wed Apr 30 17:07:18 2003
-@@ -1,22 +1,18 @@
+--- Makefile.orig Tue May 6 00:11:59 2003
++++ Makefile Tue Jun 3 16:22:55 2003
+@@ -1,22 +1,21 @@
# Select target OS. TARGET must match a system for which COPTS and LIBS are
# correctly defined below.
# You can set it on make's command line. eg: make TARGET=solaris
@@ -9,25 +9,35 @@
#TARGET = linux22
#TARGET = solaris
#TARGET = solarisv9
--#TARGET = openbsd
+ #TARGET = openbsd
-
-CC = gcc
-LD = gcc
-+TARGET = openbsd
++TARGET = FreeBSD
# By default, we use libc's regex.
-REGEX=libc
++#REGEX=libc
#REGEX=pcre
# This is the directory hosting include/pcre.h and lib/libpcre.* when REGEX=pcre
--PCREDIR := $(shell pcre-config --prefix 2>/dev/null)
--#PCREDIR=/usr/local
-+#PCREDIR := $(shell pcre-config --prefix 2>/dev/null)
+-PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :)
++#PCREDIR := $(shell pcre-config --prefix 2>/dev/null || :)
+ #PCREDIR=/usr/local
+PCREDIR=${LOCALBASE}
# This is for Linux 2.4 with netfilter
COPTS.linux24 = -O2 -DNETFILTER
-@@ -44,8 +40,8 @@
+@@ -38,14 +37,17 @@
+ COPTS.openbsd = -O2
+ LIBS.openbsd =
+
++COPTS.FreeBSD = -O2
++LIBS.FreeBSD =
++
+ COPTS.libc=
+ LIBS.libs=
+
COPTS.pcre=-DUSE_PCRE -I$(PCREDIR)/include
LIBS.pcre=-L$(PCREDIR)/lib -lpcreposix -lpcre
@@ -38,7 +48,7 @@
COPTS=$(COPTS.$(TARGET)) $(COPTS.$(REGEX))
LIBS=$(LIBS.$(TARGET)) $(LIBS.$(REGEX))
-@@ -53,16 +49,13 @@
+@@ -53,16 +55,13 @@
# - use -DSTATTIME=0 to disable statistics, else specify an interval in
# milliseconds.
# - use -DTPROXY to compile with transparent proxy support.
generated by cgit (git 2.34.1) at 2024-12-29 13:35:58 +0800