net/3proxy: update to 0.9.4

PR:	256951

5 files changed, 9 insertions, 162 deletions

diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index 66d4c4d4d67b..25f111abb964 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -1,7 +1,7 @@
 # Created by: tim@relay.nnn.tstu.ru
 
 PORTNAME=	3proxy
-PORTVERSION=	0.9.3
+DISTVERSION=	0.9.4
 CATEGORIES=	net
 
 MAINTAINER=	timp87@gmail.com
@@ -28,6 +28,9 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample
+	@${REINPLACE_CMD} -E -e 's| proxy( ?\(8\))| httppr\1|' ${WRKSRC}/man/*
+	@${REINPLACE_CMD} -E -e 's|([^P] "?)proxy|\1httppr|' ${WRKSRC}/man/proxy.8
+	@${REINPLACE_CMD} -E -e 's|#!/.+|#!${PREFIX}/bin/3proxy|' -e 's|/[^ ]+/3proxy\.cfg|${PREFIX}/etc/3proxy.cfg|' ${WRKSRC}/man/3proxy.8
 
 post-build:
 	${MV} ${WRKSRC}/bin/proxy ${WRKSRC}/bin/httppr
diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo
index 3e889b0972c3..541d63152f25 100644
--- a/net/3proxy/distinfo
+++ b/net/3proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612815039
-SHA256 (z3APA3A-3proxy-0.9.3_GH0.tar.gz) = 84861f4a7879468728c6a4ddd6ca2a8334a5249831282e70d059dc0e09304c72
-SIZE (z3APA3A-3proxy-0.9.3_GH0.tar.gz) = 607678
+TIMESTAMP = 1625251720
+SHA256 (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = b497f74d6cc7ee58ff824457427acc02c6f7a102e483816fbb1b2494942ef983
+SIZE (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = 610340
diff --git a/net/3proxy/files/patch-Makefile.FreeBSD b/net/3proxy/files/patch-Makefile.FreeBSD
index 27a6e89adde5..27c2a3b9a6ef 100644
--- a/net/3proxy/files/patch-Makefile.FreeBSD
+++ b/net/3proxy/files/patch-Makefile.FreeBSD
@@ -1,4 +1,4 @@
---- Makefile.FreeBSD.orig	2020-10-28 21:12:45 UTC
+--- Makefile.FreeBSD.orig	2021-07-01 16:59:57 UTC
 +++ Makefile.FreeBSD
 @@ -10,10 +10,10 @@
  BUILDDIR = ../bin/
diff --git a/net/3proxy/files/patch-cfg_3proxy.cfg.sample b/net/3proxy/files/patch-cfg_3proxy.cfg.sample
index 6e2d9ad27db4..997125abb6e1 100644
--- a/net/3proxy/files/patch-cfg_3proxy.cfg.sample
+++ b/net/3proxy/files/patch-cfg_3proxy.cfg.sample
@@ -1,4 +1,4 @@
---- cfg/3proxy.cfg.sample.orig	2020-10-22 08:38:44 UTC
+--- cfg/3proxy.cfg.sample.orig	2021-07-01 16:59:57 UTC
 +++ cfg/3proxy.cfg.sample
 @@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$CHFTUFGqkjue9H
  # this example shows you how to include passwd file. For included files
diff --git a/net/3proxy/files/patch-man b/net/3proxy/files/patch-man
deleted file mode 100644
index d74bed88a661..000000000000
--- a/net/3proxy/files/patch-man
+++ /dev/null
@@ -1,156 +0,0 @@
---- man/3proxy.8.orig	2020-10-22 08:38:44 UTC
-+++ man/3proxy.8
-@@ -26,7 +26,7 @@ It can establish multiple
- gateways with HTTP and HTTPS proxy with FTP over HTTP support, SOCKS v4,
- v4.5 and v5, POP3 proxy, UDP and TCP portmappers. Each gateway is started
- from configuration file like independant service 
--.BR proxy (8)
-+.BR httppr (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -84,7 +84,7 @@ directory). Under Unix, if no config file is specified
- configuration from stdin. It makes it possible to use 3proxy.cfg file as
- executable script just by setting +x mode and adding
- .br
--#!/usr/local/3proxy/3proxy
-+#!/usr/local/bin/3proxy
- .br
- as a first line in 3proxy.cfg
- .TP
-@@ -133,14 +133,14 @@ Web admin service can also be used to reload configura
- wget to automate this task.
- .SH FILES
- .TP
--.I "/usr/local/3proxy/3proxy.cfg (3proxy.cfg)"
-+.I "/usr/local/etc/3proxy.cfg (3proxy.cfg)"
- .BR 3proxy
- configuration file
- .SH BUGS
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
-+3proxy.cfg(3), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
- kill(1), syslogd(8),
- .br
- https://3proxy.org/
---- man/3proxy.cfg.3.orig	2020-10-22 08:38:44 UTC
-+++ man/3proxy.cfg.3
-@@ -174,7 +174,7 @@ By default external address is reported. It's only use
- of IP-IP NAT (will not work for PAT)
- .br
-  Also, all options mentioned for 
--.BR proxy (8)
-+.BR httppr (8)
- .BR socks (8)
- .BR pop3p (8)
- .BR tcppm (8)
-@@ -1055,7 +1055,7 @@ corruption and/or Content-Length chaging. Default is 1
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
- .br
-  https://3proxy.org/
- .SH TRIVIA
---- man/ftppr.8.orig	2020-10-22 08:38:44 UTC
-+++ man/ftppr.8
-@@ -79,7 +79,7 @@ Only cleartext authentication is currently supported.
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/icqpr.8.orig	2020-10-22 08:38:44 UTC
-+++ man/icqpr.8
-@@ -72,7 +72,7 @@ as a destination in client application. Connection is 
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/pop3p.8.orig	2020-10-22 08:38:44 UTC
-+++ man/pop3p.8
-@@ -75,7 +75,7 @@ we know which server to connect.
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/proxy.8.orig	2020-10-22 08:38:44 UTC
-+++ man/proxy.8
-@@ -1,15 +1,15 @@
--.TH proxy "8" "January 2019" "3proxy 0.9" "Universal proxy server"
-+.TH httppr "8" "July 2009" "3proxy 0.7" "Universal proxy server"
- .SH NAME
--.B proxy
-+.B httppr
- \- HTTP proxy gateway service
- .SH SYNOPSIS
--.BR "proxy " [ -d ][ -a ]
-+.BR "httppr " [ -d ][ -a ]
- .IB \fR[ -l \fR[ \fR[ @ \fR] logfile \fR]]
- .IB \fR[ -p port\fR]
- .IB \fR[ -i internal_ip\fR]
- .IB \fR[ -e external_ip\fR]
- .SH DESCRIPTION
--.B proxy
-+.B httppr
- is HTTP gateway service with HTTPS and FTP over HTTPS support.
- .SH OPTIONS
- .TP
---- man/smtpp.8.orig	2020-10-22 08:38:44 UTC
-+++ man/smtpp.8
-@@ -76,7 +76,7 @@ we know which server to connect.
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), ftppr(8), httppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/socks.8.orig	2020-10-22 08:38:44 UTC
-+++ man/socks.8
-@@ -76,7 +76,7 @@ instead.
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/tcppm.8.orig	2020-10-22 08:38:44 UTC
-+++ man/tcppm.8
-@@ -65,7 +65,7 @@ as a destination in client application. Connection is 
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS
---- man/udppm.8.orig	2020-10-22 08:38:44 UTC
-+++ man/udppm.8
-@@ -71,7 +71,7 @@ as a destination in client application. All datagrams 
- Report all bugs to
- .BR 3proxy@3proxy.ru
- .SH SEE ALSO
--3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
-+3proxy(8), httppr(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
- .br
- https://3proxy.org/
- .SH AUTHORS