Pullup ticket 456 - requested by Takahiro Kambe

portability fix for ftpproxy

Revisions pulled up:
- pkgsrc/net/ftpproxy/Makefile		1.9
- pkgsrc/net/ftpproxy/distinfo		1.6
- pkgsrc/net/ftpproxy/patches/patch-aa	1.3
- pkgsrc/net/ftpproxy/patches/patch-ab	removed

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Mon Apr 11 15:32:48 UTC 2005

   Modified Files:
   	pkgsrc/net/ftpproxy: Makefile distinfo
   	pkgsrc/net/ftpproxy/patches: patch-aa
   Removed Files:
   	pkgsrc/net/ftpproxy/patches: patch-ab

   Log Message:
   Update ftpproxy package to 1.2.3.

   pkgsrc fix: try to make it work on Solaris.

   Version 1.2.3
   - --------------------------------

     * Fixed bug in waitpid handling in daemon mode.

     * Added optional xferlog logging.

     * Added -q option to set the source IP of the outgoing control
       connection (which set also the IP for data connections).

4 files changed, 17 insertions, 35 deletions

diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile
index 1463cea9dd0..d2948a13d68 100644
--- a/net/ftpproxy/Makefile
+++ b/net/ftpproxy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/03/14 19:55:39 tv Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2005/04/20 15:44:39 salo Exp $
 #
 
-DISTNAME=	ftpproxy-1.2.2
-PKGREVISION=	1
+DISTNAME=	ftpproxy-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	http://www.ftpproxy.org/download/ \
 		http://www.ftpproxy.org/download/older_releases/
@@ -12,12 +11,16 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ftpproxy.org/
 COMMENT=	Application level gateway for FTP
 
+BUILD_DIRS=	${WRKSRC}/src
+VERSION=	1.2.3
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 LIBS+=		"-lsocket -lnsl"
-MAKE_ENV+=	LIBS=${LIBS}
+OSFLAG=		-DSOLARIS
 .endif
+MAKE_ENV+=	OSFLAG=${OSFLAG} OSLIB=${LIBS} VERSION=${VERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ftp.proxy ${PREFIX}/libexec/
diff --git a/net/ftpproxy/distinfo b/net/ftpproxy/distinfo
index f65f61a77b1..81b65f1e639 100644
--- a/net/ftpproxy/distinfo
+++ b/net/ftpproxy/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.5.2.1 2005/04/20 15:44:39 salo Exp $
 
-SHA1 (ftpproxy-1.2.2.tgz) = c98f6fb4f6318065f5ebf197760dd197227ff06f
-RMD160 (ftpproxy-1.2.2.tgz) = 6b92cc1d20eef49a4642bc28e1cbe30c6ec757ed
-Size (ftpproxy-1.2.2.tgz) = 80800 bytes
-SHA1 (patch-aa) = bb9d75d843d3855e7f7fa20181abc7ded500ce47
-SHA1 (patch-ab) = 1d982575a96e06f2908f1c2ec7f837570c5b1a09
+SHA1 (ftpproxy-1.2.3.tgz) = cf3279b17ed5faa9d1f796305111a6a53559cfdc
+RMD160 (ftpproxy-1.2.3.tgz) = bf9ccceab0259363fa35c76620b163cde414132b
+Size (ftpproxy-1.2.3.tgz) = 81625 bytes
+SHA1 (patch-aa) = 6240a5d4c73a36edcaeb182ee2aa5b69cc9a1d8e
diff --git a/net/ftpproxy/patches/patch-aa b/net/ftpproxy/patches/patch-aa
index 51639cec4fb..074ae7d5f14 100644
--- a/net/ftpproxy/patches/patch-aa
+++ b/net/ftpproxy/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2003/09/02 17:27:18 taca Exp $
+$NetBSD: patch-aa,v 1.2.12.1 2005/04/20 15:44:39 salo Exp $
 
---- doc/ftp.proxy.1.orig	2003-01-24 01:18:47.000000000 +0900
+--- doc/ftp.proxy.1.orig	2004-07-30 21:50:28.000000000 +0900
 +++ doc/ftp.proxy.1
 @@ -13,7 +13,7 @@
  .in -0.5i
@@ -14,13 +14,13 @@ $NetBSD: patch-aa,v 1.2 2003/09/02 17:27:18 taca Exp $
 @@ -29,7 +29,7 @@ client.
  .PP
  .I ftp.proxy
- must be started from a TCP superserver like
+ can be started from a TCP superserver like
 -.IR inetd (1)
 +.IR inetd (8)
  or
  .IR tcpproxy (1).
- It can't bind to a TCP/IP port on it's own.
-@@ -291,7 +291,7 @@ Daemon log facility on other.
+ but can also bind to a TCP/IP port on it's own and run in standalone (or
+@@ -419,7 +419,7 @@ Daemon log facility on other.
  .SH "AUTHOR"
  Andreas Schoenberg <asg@ftpproxy.org>
  .SH "SEE ALSO"
diff --git a/net/ftpproxy/patches/patch-ab b/net/ftpproxy/patches/patch-ab
deleted file mode 100644
index 5bd4193984c..00000000000
--- a/net/ftpproxy/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/09/02 17:27:18 taca Exp $
-
---- Makefile.orig	2003-08-19 23:32:15.000000000 +0900
-+++ Makefile
-@@ -3,13 +3,11 @@ VERSION =	1.2.1
- DIR =		ftpproxy-$(VERSION)
- TAR =		ftpproxy-$(VERSION)
- 
--export VERSION
--
- TARGETS =	ftp.proxy
- 
- 
--all:	$(TARGETS)
--	cd src; make all 
-+all:
-+	cd src; make VERSION=${VERSION} all 
- 
- 
- install:	all