From 71a61cc61902bf287657802b60091d0dd9a44591 Mon Sep 17 00:00:00 2001
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Date: Tue, 29 Dec 2020 22:34:29 +0000
Subject: [PATCH] security/sslproxy: Update version 0.7.0=>0.8.2

Relnotes:	https://github.com/sonertari/SSLproxy/blob/master/NEWS.md
---
 security/sslproxy/Makefile                    |  5 +-
 security/sslproxy/distinfo                    |  6 +--
 security/sslproxy/files/patch-GNUmakefile     | 50 -------------------
 security/sslproxy/files/patch-Mk_main.mk      | 11 ++++
 security/sslproxy/files/patch-src_GNUmakefile | 25 ++++++++++
 5 files changed, 43 insertions(+), 54 deletions(-)
 delete mode 100644 security/sslproxy/files/patch-GNUmakefile
 create mode 100644 security/sslproxy/files/patch-Mk_main.mk
 create mode 100644 security/sslproxy/files/patch-src_GNUmakefile

diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index a4c8dc1ec69a..a6d1aed286a7 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sslproxy
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.2
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	security
@@ -24,4 +24,7 @@ MAKE_ENV=	DESTDIR=${STAGEDIR} MANDIR=man INSTALLUID=${UID} INSTALLGID=${GID}
 PLIST_FILES=	bin/sslproxy man/man1/sslproxy.1.gz man/man5/sslproxy.conf.5.gz \
 		"@sample etc/sslproxy.conf.sample"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Mk/main.mk
+
 .include <bsd.port.mk>
diff --git a/security/sslproxy/distinfo b/security/sslproxy/distinfo
index f76eee287eb1..6f1aef4e0ff6 100644
--- a/security/sslproxy/distinfo
+++ b/security/sslproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569357473
-SHA256 (sonertari-SSLproxy-v0.7.0_GH0.tar.gz) = 73f1e4be0185dd3636201b17cfcc023dc9de5333bcec52dfaa15cfd35d113b44
-SIZE (sonertari-SSLproxy-v0.7.0_GH0.tar.gz) = 1902659
+TIMESTAMP = 1609077747
+SHA256 (sonertari-SSLproxy-v0.8.2_GH0.tar.gz) = a85e70f0d7b93ab9609ecb6d3371bfe3c9b9e5fddbdda1d9f9fe483239e0cccd
+SIZE (sonertari-SSLproxy-v0.8.2_GH0.tar.gz) = 1906425
diff --git a/security/sslproxy/files/patch-GNUmakefile b/security/sslproxy/files/patch-GNUmakefile
deleted file mode 100644
index ca08fa382416..000000000000
--- a/security/sslproxy/files/patch-GNUmakefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- GNUmakefile.orig	2019-05-02 16:06:48 UTC
-+++ GNUmakefile
-@@ -178,7 +178,7 @@ endif
- 
- PREFIX?=	/usr/local
- MANDIR?=	share/man
--EXAMPLESDIR?=	share/examples
-+ETCDIR?=	etc
- 
- INSTALLUID?=	0
- INSTALLGID?=	0
-@@ -191,7 +191,7 @@ CNFMODE?=	0644
- MANUID?=	$(INSTALLUID)
- MANGID?=	$(INSTALLGID)
- MANMODE?=	0644
--EXAMPLESMODE?=	0444
-+ETCMODE?=	0444
- ifeq ($(shell id -u),0)
- BINOWNERFLAGS?=	-o $(BINUID) -g $(BINGID)
- CNFOWNERFLAGS?=	-o $(CNFUID) -g $(CNFGID)
-@@ -524,26 +524,19 @@ clean:
- 	$(RM) -rf *.dSYM
- 
- install: $(TARGET)
--	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
--	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
--		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
--	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
--		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
--	test -d $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET) || \
--		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)
- 	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
- 		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
- 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
- 		$(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
- 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
- 		$(TARGET).conf.5 $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/
--	$(INSTALL) $(MANOWNERFLAGS) -m $(EXAMPLESMODE) \
--		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
-+	$(INSTALL) $(MANOWNERFLAGS) -m $(ETCMODE) \
-+		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(ETCDIR)/$(TARGET).conf.sample
- 
- deinstall:
- 	$(RM) -f $(DESTDIR)$(PREFIX)/bin/$(TARGET) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/$(TARGET).1 \
- 		$(DESTDIR)$(PREFIX)/$(MANDIR)/man5/$(TARGET).conf.5
--	$(RM) -rf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
-+	$(RM) -rf $(DESTDIR)$(PREFIX)/$(ETCDIR)/$(TARGET)/
- 
- ifdef GITDIR
- lint:
diff --git a/security/sslproxy/files/patch-Mk_main.mk b/security/sslproxy/files/patch-Mk_main.mk
new file mode 100644
index 000000000000..28ddba83a9e1
--- /dev/null
+++ b/security/sslproxy/files/patch-Mk_main.mk
@@ -0,0 +1,11 @@
+--- Mk/main.mk.orig	2020-12-15 14:12:50 UTC
++++ Mk/main.mk
+@@ -201,7 +201,7 @@ endif
+ 
+ PREFIX?=	/usr/local
+ MANDIR?=	share/man
+-EXAMPLESDIR?=	share/examples
++EXAMPLESDIR?=	etc
+ 
+ INSTALLUID?=	0
+ INSTALLGID?=	0
diff --git a/security/sslproxy/files/patch-src_GNUmakefile b/security/sslproxy/files/patch-src_GNUmakefile
new file mode 100644
index 000000000000..2f85bf66cb2c
--- /dev/null
+++ b/security/sslproxy/files/patch-src_GNUmakefile
@@ -0,0 +1,25 @@
+--- src/GNUmakefile.orig	2020-12-27 15:40:56 UTC
++++ src/GNUmakefile
+@@ -26,13 +26,6 @@ clean:
+ 	$(RM) -rf *.dSYM
+ 
+ install: $(TARGET)
+-	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+-	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+-	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+-	test -d $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET) || \
+-		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)
+ 	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+ 		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
+ 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+@@ -40,7 +33,7 @@ install: $(TARGET)
+ 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+ 		$(TARGET).conf.5 $(DESTDIR)$(PREFIX)/$(MANDIR)/man5/
+ 	$(INSTALL) $(MANOWNERFLAGS) -m $(EXAMPLESMODE) \
+-		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET)/
++		$(TARGET).conf $(DESTDIR)$(PREFIX)/$(EXAMPLESDIR)/$(TARGET).conf.sample
+ 
+ deinstall:
+ 	$(RM) -f $(DESTDIR)$(PREFIX)/bin/$(TARGET) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/$(TARGET).1 \