ports/111410: Update port: ftp/ftp-proxy updated to OpenBSD 4.1 code base

[Christian Ludwig]

>Number:         111410
>Category:       ports
>Synopsis:       Update port: ftp/ftp-proxy updated to OpenBSD 4.1 code base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 09 13:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Christian Ludwig
>Release:        6.2-stable
>Organization:
>Environment:
FreeBSD chrissicool.shacknet.nu 6.2-STABLE FreeBSD 6.2-STABLE #5: Thu Mar  1 18:44:55 CET 2007     root at chrissicool.shacknet.nu:/usr/obj/usr/src/sys/KERNEL  i386
>Description:
Please find attached the port-upgrade of ftp-proxy to reflect changes between OpenBSD 4.0 and OpenBSD 4.1 releases.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur ftp-proxy.bak/Makefile ftp-proxy/Makefile
--- ftp-proxy.bak/Makefile	Sat Apr  7 23:41:11 2007
+++ ftp-proxy/Makefile	Mon Apr  9 12:57:25 2007
@@ -2,30 +2,35 @@
 # Date created:        4. March 2007
 # Whom:                Christian Ludwig
 #
-# $FreeBSD: ports/ftp/ftp-proxy/Makefile,v 1.1 2007/03/07 09:27:02 miwi Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	ftp-proxy
-PORTVERSION=	4.0p0
+PORTVERSION=	4.1p1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.chrissicool.net/projects/ftp-proxy/distfiles/
 
 MAINTAINER=	chrissicool at chrissicool.net
 COMMENT=	A port of OpenBSD's ftp-proxy
 
-LIB_DEPENDS=	event:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	event-1.3b:${PORTSDIR}/devel/libevent
 
 MAN8=		ftp-proxy.8
 MANCOMPRESSED=	yes
 
-PLIST_FILES=	sbin/ftp-proxy		\
-		etc/rc.d/ftp-proxy.sh
+PLIST_FILES=	sbin/ftp-proxy
+USE_RC_SUBR=	ftp-proxy
 
 CFLAGS+=	-I${PREFIX}/include
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 502106
+IGNORE=		only for 5.3 and above
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ftp-proxy ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${FILESDIR}/ftp-proxy.sh ${PREFIX}/etc/rc.d
 	${INSTALL_MAN} ${WRKSRC}/ftp-proxy.8.gz ${PREFIX}/man/man8
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nur ftp-proxy.bak/distinfo ftp-proxy/distinfo
--- ftp-proxy.bak/distinfo	Sat Apr  7 23:41:11 2007
+++ ftp-proxy/distinfo	Mon Apr  9 12:57:25 2007
@@ -1,3 +1,3 @@
-MD5 (ftp-proxy-4.0p0.tar.gz) = 1defe7411ed13966910d1ec25784db86
-SHA256 (ftp-proxy-4.0p0.tar.gz) = cabd125a011d6548f40c72e29a254e71decde306f55ff5d037018cb33901867f
-SIZE (ftp-proxy-4.0p0.tar.gz) = 13381
+MD5 (ftp-proxy-4.1p1.tar.gz) = 6809f67b62f3b38c96077a1ec4fd4f59
+SHA256 (ftp-proxy-4.1p1.tar.gz) = 37854e5a7ccd36dc43d644cba55020114a796430541365f537a6ef2b32376ac5
+SIZE (ftp-proxy-4.1p1.tar.gz) = 12849
diff -Nur ftp-proxy.bak/files/ftp-proxy.in ftp-proxy/files/ftp-proxy.in
--- ftp-proxy.bak/files/ftp-proxy.in	Thu Jan  1 00:00:00 1970
+++ ftp-proxy/files/ftp-proxy.in	Mon Apr  9 12:57:25 2007
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# PROVIDE: ftp-proxy
+# REQUIRE: DAEMON pf
+#
+# Add the following lines to /etc/rc.conf to enable ftp-proxy:
+#
+# ftpproxy_enable (bool)	Set to "YES" to enable ftp-proxy.
+#				Default is "NO".
+# ftpproxy_flags (flags):	Set extra flags to ftp-proxy.
+#				Default is "". See ftp-proxy(8).
+#
+
+. %%RC_SUBR%%
+
+name="ftpproxy"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${ftpproxy_enable="NO"}
+
+command="%%PREFIX%%/sbin/ftp-proxy"
+
+run_rc_command "$1"
diff -Nur ftp-proxy.bak/pkg-descr ftp-proxy/pkg-descr
--- ftp-proxy.bak/pkg-descr	Sat Apr  7 23:41:11 2007
+++ ftp-proxy/pkg-descr	Mon Apr  9 12:57:25 2007
@@ -1,3 +1,3 @@
 A ftp proxy for firewalled connections,using pf's anchors and rules.
 
-WWW: http://www.openbsd.org/
+WWW: http://www.chrissicool.net/projects/ftp-proxy/

>Release-Note:
>Audit-Trail:
>Unformatted: