* Fix build problem by using own getline().

* Add LICENSE.
* Add comments to patch files.

5 files changed, 67 insertions, 8 deletions

diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index 1f90d75a212..ff3de0797ee 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/16 20:28:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2011/09/12 16:46:45 taca Exp $
 
 DISTNAME=	ffproxy-1.6
 CATEGORIES=	www
@@ -8,6 +8,7 @@ PKGREVISION=	1
 MAINTAINER=	niklas@noxa.de
 HOMEPAGE=	http://faith.eu.org/programs.html\#ffproxy
 COMMENT=	Filtering HTTP/HTTPS proxy server
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/ffproxy/distinfo b/www/ffproxy/distinfo
index 76daa05879c..df2e2f3d759 100644
--- a/www/ffproxy/distinfo
+++ b/www/ffproxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/10/16 20:28:06 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2011/09/12 16:46:45 taca Exp $
 
 SHA1 (ffproxy-1.6.tar.gz) = 89c78f47f38caf8f88e9cfd0c4d71c81284f0f24
 RMD160 (ffproxy-1.6.tar.gz) = ee04548d22a5d9dd12d6ffc6a36a638b59dc46a5
 Size (ffproxy-1.6.tar.gz) = 77535 bytes
-SHA1 (patch-aa) = e5e0cc7c822470c78e95f3703b3a579f8ec39585
-SHA1 (patch-ab) = 2b669ed830c9e9e1e069a4f99e32b442b60f3b0d
-SHA1 (patch-ac) = f2b6d62ad5e55258c757037269cf854dfe727bdb
+SHA1 (patch-aa) = 63d861ee3c9307f5eb0ad7e7946a120ef35a78a0
+SHA1 (patch-ab) = ae6002a9d65f646877cce59da9b69d6074ac0705
+SHA1 (patch-ac) = 87b7ebc8f76078e2cbe75894b34aa65fb62a6415
diff --git a/www/ffproxy/patches/patch-aa b/www/ffproxy/patches/patch-aa
index 9d06aad7689..bea5fb32ceb 100644
--- a/www/ffproxy/patches/patch-aa
+++ b/www/ffproxy/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/05 19:12:35 garbled Exp $
+$NetBSD: patch-aa,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+Stop installing configuration which handled by pkgsrc's pkginstall framework.
+
 --- Makefile.in.orig	2006-01-05 11:50:45.000000000 -0700
 +++ Makefile.in	2006-01-05 11:51:59.000000000 -0700
 @@ -62,7 +62,7 @@
diff --git a/www/ffproxy/patches/patch-ab b/www/ffproxy/patches/patch-ab
index e4074f33c7d..2f35b7a2e43 100644
--- a/www/ffproxy/patches/patch-ab
+++ b/www/ffproxy/patches/patch-ab
@@ -1,5 +1,47 @@
---- request.c.orig	2008-10-16 22:22:52.000000000 +0200
-+++ request.c	2008-10-16 22:23:27.000000000 +0200
+$NetBSD: patch-ab,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+* Avoid using function name "getline" which conflict with system
+  defined one.
+* Fix parameter to setsockopt(2).
+
+--- request.c.orig	2004-12-31 17:59:54.000000000 +0900
++++ request.c	2010-01-29 16:46:16.000000000 +0900
+@@ -49,7 +49,7 @@
+ 
+ static int      read_header(int, struct req *);
+ static char     sgetc(int);
+-static size_t   getline(int, char[], int);
++static size_t   get_line(int, char[], int);
+ static int      do_request(int, struct req *);
+ 
+ void
+@@ -63,7 +63,7 @@
+ 	(void) memset(&r, 0, sizeof(r));
+ 	r.cl = clinfo;
+ 
+-	if (getline(cl, buf, sizeof(buf)) < 1)
++	if (get_line(cl, buf, sizeof(buf)) < 1)
+ 		*buf = '\0';
+ 
+ 	if ((http_url(&r, buf)) == 0) {
+@@ -189,7 +189,7 @@
+ 	char           *b, *p;
+ 
+ 	i = 0;
+-	while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++	while ((len = get_line(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 		b = buf;
+ 		while (isspace((int) *b) && *(b++) != '\0');
+ 		if (*b == '\0')
+@@ -228,7 +228,7 @@
+ }
+ 
+ static          size_t
+-getline(int s, char buf[], int len)
++get_line(int s, char buf[], int len)
+ {
+ 	int             c;
+ 	size_t          i;
 @@ -288,7 +288,7 @@
  	extern struct cfg config;
  	unsigned long   ip;
@@ -18,3 +60,12 @@
  			DEBUG(("do_request() => setsockopt() failed for %s port %d", r->host, r->port));
  			return E_CON;
  		} else if (connect(s, (struct sockaddr *) & addr, sizeof(addr)) == -1) {
+@@ -493,7 +493,7 @@
+ 	}
+ 	if (r->type != CONNECT) {
+ 		i = 0;
+-		while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
++		while ((len = get_line(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ 			DEBUG(("do_request() => got remote header line: (%s)", buf));
+ 			r->header[i] = (char *) my_alloc(len + 1);
+ 			(void) strcpy(r->header[i++], buf);
diff --git a/www/ffproxy/patches/patch-ac b/www/ffproxy/patches/patch-ac
index fd5e63d8dbb..d643d03fd05 100644
--- a/www/ffproxy/patches/patch-ac
+++ b/www/ffproxy/patches/patch-ac
@@ -1,3 +1,7 @@
+$NetBSD: patch-ac,v 1.2 2011/09/12 16:46:45 taca Exp $
+
+* Fix parameter to setsockopt(2).
+
 --- socket.c.orig	2008-10-16 22:22:57.000000000 +0200
 +++ socket.c	2008-10-16 22:23:42.000000000 +0200
 @@ -64,7 +64,7 @@