- Update to 1.5.0

- Reformat pkg-descr
- Pass maintainership to submitter

PR:		ports/85002
Submitted by:	Emanuel Haupt <ehaupt@critical.ch>

5 files changed, 39 insertions, 24 deletions

diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index 1a6153da0539..fd5cc5001f9d 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -1,31 +1,39 @@
 # New ports collection makefile for:		proxytunnel
-# Date created:			Sun Nov 25 15:16:44 BRST 2001
-# Whom:			Hammurabi Mendes <hmendes@brturbo.com>
+# Date created:					Sun Nov 25 15:16:44 BRST 2001
+# Whom:						Hammurabi Mendes <hmendes@brturbo.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	proxytunnel
-PORTVERSION=	1.2.3
+PORTVERSION=	1.5.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ehaupt@critical.ch
 COMMENT=	Connects stdin and stdout to an origin server through an HTTPS proxy
 
-ALL_TARGET=	${PORTNAME}
 USE_GETOPT_LONG=yes
+USE_REINPLACE=	yes
+
+ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/proxytunnel
 PORTDOCS=	CHANGES CREDITS README
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^CFLAGS*/d; /^CC*/d' ${WRKSRC}/Makefile
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/proxytunnel/distinfo b/security/proxytunnel/distinfo
index a054cb645703..4ffbcd426eba 100644
--- a/security/proxytunnel/distinfo
+++ b/security/proxytunnel/distinfo
@@ -1,2 +1,2 @@
-MD5 (proxytunnel-1.2.3.tgz) = 83a2f9994bfb20232f5a039032f13ed4
-SIZE (proxytunnel-1.2.3.tgz) = 24966
+MD5 (proxytunnel-1.5.0.tgz) = 2a36409580391e25421fc06e82eed4ce
+SIZE (proxytunnel-1.5.0.tgz) = 56775
diff --git a/security/proxytunnel/files/patch-Makefile b/security/proxytunnel/files/patch-Makefile
deleted file mode 100644
index f0a32c76920f..000000000000
--- a/security/proxytunnel/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Jan 13 15:45:50 2005
-+++ Makefile	Thu Jan 13 15:46:00 2005
-@@ -2,8 +2,6 @@
- #
- # Please uncomment the appropriate settings
- 
--CC = gcc
--CFLAGS = -Wall -DHAVE_GETOPT_LONG
- LDFLAGS =
- INSTALLPATH = $(DESTDIR)/usr/local/bin
- MANPATH = $(DESTDIR)/usr/local/man/man1
diff --git a/security/proxytunnel/files/patch-ntlm.c b/security/proxytunnel/files/patch-ntlm.c
new file mode 100644
index 000000000000..436657f39cc1
--- /dev/null
+++ b/security/proxytunnel/files/patch-ntlm.c
@@ -0,0 +1,18 @@
+--- ntlm.c.orig	Mon Aug 15 12:05:33 2005
++++ ntlm.c	Tue Aug 16 19:33:37 2005
+@@ -70,13 +70,14 @@
+ 
+ 	int len = unbase64(t2_buf, buf, TYPE2_BUF_SIZE);
+ 	int i;
++	ntlm_type2 *t2;
+ 
+ 	if (len <= 0) {
+ 		message("parse_type2: failed to decode the message\n");
+ 		return -1;
+ 	}
+ 
+-	ntlm_type2 *t2 = (ntlm_type2 *)t2_buf;
++	t2 = (ntlm_type2 *)t2_buf;
+ 
+ 	if (strcmp(t2->signature, "NTLMSSP") != 0) {
+ 		message("parse_type2: Signature did not match\n");
diff --git a/security/proxytunnel/pkg-descr b/security/proxytunnel/pkg-descr
index 9bb30a10dda2..34c122ea8d6c 100644
--- a/security/proxytunnel/pkg-descr
+++ b/security/proxytunnel/pkg-descr
@@ -1,5 +1,5 @@
-A program that connects stdin and stdout to an origin server somewhere
-in the Internet through an industry standard HTTPS proxy.
+A program that connects stdin and stdout to an origin server somewhere in the
+Internet through an industry standard HTTPS proxy.
 
 Author: Jos Visser <josv@osp.nl>, Mark Janssen <maniac@maniac.nl>
 WWW: http://proxytunnel.sourceforge.net/