5 files changed, 50 insertions, 16 deletions

diff --git a/ftp/puf/Makefile b/ftp/puf/Makefile
index 661eeff4cd3d..d5a80defaffe 100644
--- a/ftp/puf/Makefile
+++ b/ftp/puf/Makefile
@@ -7,12 +7,12 @@
 #
 
 PORTNAME=	puf
-PORTVERSION=	0.93.2a
-CATEGORIES=	ftp
+PORTVERSION=	0.93.3
+CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jharris@widomaker.com
 COMMENT=	A parallel HTTP downloader similar to wget
 
 GNU_CONFIGURE=	yes
diff --git a/ftp/puf/distinfo b/ftp/puf/distinfo
index c10a4c85a70c..c1f72800ab43 100644
--- a/ftp/puf/distinfo
+++ b/ftp/puf/distinfo
@@ -1,2 +1,5 @@
-MD5 (puf-0.93.2a.tar.gz) = 98be46a7c2717919df73479fce53d547
-SIZE (puf-0.93.2a.tar.gz) = 113073
+MD5 (puf-0.93.3.tar.gz) = 74134692a986a8df8b5bbb1ad4a13e0a
+SHA1 (puf-0.93.3.tar.gz) = 890e107d01ba2056e3759f9b8e74a2fcd74adccd
+RMD160 (puf-0.93.3.tar.gz) = 3423d883af3ecda4b880a5263b690f93cb44a83d
+SHA256 (puf-0.93.3.tar.gz) = 9273e9c6fdee827ab504bb7e598df5ea367d5c8b7f7621d871af35740b078fd8
+SIZE (puf-0.93.3.tar.gz) = 139544
diff --git a/ftp/puf/files/patch-hostlist.c b/ftp/puf/files/patch-hostlist.c
deleted file mode 100644
index 8bc380e7476b..000000000000
--- a/ftp/puf/files/patch-hostlist.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hostlist.c.orig	Sat Jun 12 23:29:16 2004
-+++ src/hostlist.c	Sat Jun 12 23:29:42 2004
-@@ -267,7 +267,7 @@
- 	    else		/*  missed alias  */
- 		return 1;
- 	}
--noadd:
-+noadd:;
-     }
- 
-     if (hapi) {
diff --git a/ftp/puf/files/patch-src-fetch.c b/ftp/puf/files/patch-src-fetch.c
new file mode 100644
index 000000000000..a76947d0c488
--- /dev/null
+++ b/ftp/puf/files/patch-src-fetch.c
@@ -0,0 +1,16 @@
+Index: src/fetch.c
+===================================================================
+RCS file: /cvsroot/puf/puf/src/fetch.c,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -r1.29 -r1.30
+--- src/fetch.c	1 Jul 2004 13:43:29 -0000	1.29
++++ src/fetch.c	5 Jul 2004 07:41:29 -0000	1.30
+@@ -200,6 +200,7 @@
+     signal(SIGINT, sigint);
+     signal(SIGTERM, sigterm);
+     signal(SIGALRM, sigalrm);
++    signal(SIGPIPE, SIG_IGN);
+ 
+     alarm(max_time);
+ 
diff --git a/ftp/puf/files/patch-src-hostlist.c b/ftp/puf/files/patch-src-hostlist.c
new file mode 100644
index 000000000000..476de0b8220a
--- /dev/null
+++ b/ftp/puf/files/patch-src-hostlist.c
@@ -0,0 +1,26 @@
+Index: src/hostlist.c
+===================================================================
+RCS file: /cvsroot/puf/puf/src/hostlist.c,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- src/hostlist.c	22 Jun 2004 09:26:55 -0000	1.15
++++ src/hostlist.c	5 Jul 2004 07:41:29 -0000	1.16
+@@ -103,7 +103,7 @@
+ {
+     int l = strlen(proc->whost->host->name) + 1;
+     dbg(DNS, ("starting dns lookup, helper %d\n", proc->pid));
+-    if (send(proc->fd, proc->whost->host->name, l, MSG_NOSIGNAL) != l) {
++    if (send(proc->fd, proc->whost->host->name, l, 0) != l) {
+ 	prx(ERR, "cannot talk to DNS helper!\n");
+ 	return 0;
+     }
+@@ -121,7 +121,7 @@
+     u_char buf[1024];
+ 
+     dbg(DNS, ("finishing dns lookup, helper %d\n", proc->pid));
+-    if (recv(proc->fd, buf, sizeof(buf), MSG_NOSIGNAL) < (int)sizeof(int)) {
++    if (recv(proc->fd, buf, sizeof(buf), 0) < (int)sizeof(int)) {
+ 	prx(ERR, "cannot talk to DNS helper!\n");
+ 	return 0;
+     }