ports/83777: [update] ftp/ftpproxy to 1.2.3

[Andrej Zverev]

>Number:         83777
>Category:       ports
>Synopsis:       [update] ftp/ftpproxy to 1.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 20 09:30:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrej Zverev
>Release:        FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD az.inec.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #1: Mon May 23 20:34:48 MSD 2005 az at az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	1. Update to 1.2.3

	Removed files:
	files/patch-Makefile
	
	
>How-To-Repeat:
	
>Fix:

	

--- ftpproxy.diff begins here ---
diff -Nru ftpproxy.orig/Makefile ftpproxy/Makefile
--- ftpproxy.orig/Makefile	Sun May 30 10:22:58 2004
+++ ftpproxy/Makefile	Wed Jul 20 13:13:43 2005
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	ftpproxy
-PORTVERSION=	1.1.5
+PORTVERSION=	1.2.3
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.ftpproxy.org/download/older_releases/
+MASTER_SITES=	http://www.ftpproxy.org/download/ \
+		http://www.ftpproxy.org/download/older_releases/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	philippe at le-berre.com
 COMMENT=	A ftp proxy
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
+CFLAGS +=-DVERSION=\\\"${PORTVERSION}\\\"
 
 MAN1=		ftp.proxy.1
 MANCOMPRESSED=	no
 PLIST_FILES=	sbin/ftp.proxy
 
-pre-patch:
-	@${RM} -Rf ${WRKSRC}/*.o ${WRKSRC}/src/ftp.proxy
-	@${REINPLACE_CMD} -e 's|SOL_TCP|SOL_SOCKET|' ${WRKSRC}/ftp.c
+pre-build:
+	@${REINPLACE_CMD} -e 's|^CFLAGS|#CFLAGS|' ${WRKSRC}/src/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ftp.proxy ${PREFIX}/sbin
-	@${INSTALL_MAN} ${WRKSRC}/../doc/ftp.proxy.1 ${PREFIX}/man/man1
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/ftp.proxy ${PREFIX}/sbin
+	@${INSTALL_MAN} ${WRKSRC}/doc/ftp.proxy.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -Nru ftpproxy.orig/distinfo ftpproxy/distinfo
--- ftpproxy.orig/distinfo	Wed Mar 31 07:07:47 2004
+++ ftpproxy/distinfo	Wed Jul 20 12:28:03 2005
@@ -1,2 +1,2 @@
-MD5 (ftpproxy-1.1.5.tgz) = 4db5116f29e0477fa35f4c563e5aa2ad
-SIZE (ftpproxy-1.1.5.tgz) = 148035
+MD5 (ftpproxy-1.2.3.tgz) = c2068bc452e1d7554d3bda08030aa433
+SIZE (ftpproxy-1.2.3.tgz) = 81625
diff -Nru ftpproxy.orig/files/patch-Makefile ftpproxy/files/patch-Makefile
--- ftpproxy.orig/files/patch-Makefile	Sat Jan 26 03:07:18 2002
+++ ftpproxy/files/patch-Makefile	Thu Jan  1 03:00:00 1970
@@ -1,25 +0,0 @@
---- Makefile.orig	Wed Jan 23 23:42:24 2002
-+++ Makefile	Wed Jan 23 23:49:22 2002
-@@ -1,20 +1,4 @@
--
--CC =		gcc
--CFLAGS =	-O2 -Wall -ggdb
--
- FTPPROXY =	main.o ftp.o ip-lib.o lib.o
- 
--TARGETS =	ftp.proxy
--
--
--all:		$(TARGETS)
--	-ctags *.[ch]
--
--
--ftp.proxy:	$(FTPPROXY)
--	$(CC) -o $@ $(FTPPROXY)
--
--	
--clean:
--	rm -f *.o cut out $(TARGETS) $(TAR).tar.gz
--
-+all: $(FTPPROXY)
-+	$(CC) $(CFLAGS) -o ftp.proxy $(FTPPROXY)
--- ftpproxy.diff ends here ---



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