Update port to 1.16

4 files changed, 75 insertions, 2 deletions

diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index 12cc35e0db57..41bb4b265f16 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webfs
-PORTVERSION=	1.13
+PORTVERSION=	1.16
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://bytesex.org/misc/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -25,6 +25,7 @@ BROKEN=		"Requires FreeBSD 4.x or greater due to ipv6 support"
 
 do-configure:
 	@${PERL} -pi.orig -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/Makefile
+	@${PERL} -pi.orig -e 's|/etc/mime.types|${MIMEFILE}|' ${WRKSRC}/webfsd.man
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/webfsd ${PREFIX}/sbin
diff --git a/www/webfs/distinfo b/www/webfs/distinfo
index d325c522b8f1..179ee577136f 100644
--- a/www/webfs/distinfo
+++ b/www/webfs/distinfo
@@ -1 +1 @@
-MD5 (webfs_1.13.tar.gz) = 6972771708a4a7a84a80df8e43d0592e
+MD5 (webfs_1.16.tar.gz) = 1f7b7682e8f98925a9aea0c90f8f9ada
diff --git a/www/webfs/files/patch-ls.c b/www/webfs/files/patch-ls.c
new file mode 100644
index 000000000000..2f50423700dd
--- /dev/null
+++ b/www/webfs/files/patch-ls.c
@@ -0,0 +1,19 @@
+--- ls.c.orig	Thu Oct 18 03:37:27 2001
++++ ls.c	Wed Jan 30 08:29:37 2002
+@@ -317,13 +317,13 @@
+ 	} else if (!S_ISREG(files[i]->s.st_mode)) {
+ 	    len += sprintf(buf+len,"     --  ");
+ 	} else if (files[i]->s.st_size < 1024*9) {
+-	    len += sprintf(buf+len,"%4ld  B  ",
++	    len += sprintf(buf+len,"%4lld  B  ",
+ 			   files[i]->s.st_size);
+ 	} else if (files[i]->s.st_size < 1024*1024*9) {
+-	    len += sprintf(buf+len,"%4ld kB  ",
++	    len += sprintf(buf+len,"%4lld kB  ",
+ 			   files[i]->s.st_size>>10);
+ 	} else {
+-	    len += sprintf(buf+len,"%4ld MB  ",
++	    len += sprintf(buf+len,"%4lld MB  ",
+ 			   files[i]->s.st_size>>20);
+ 	}
+ 	
diff --git a/www/webfs/files/patch-response.c b/www/webfs/files/patch-response.c
new file mode 100644
index 000000000000..64edeb54a5f4
--- /dev/null
+++ b/www/webfs/files/patch-response.c
@@ -0,0 +1,53 @@
+--- response.c.orig	Fri Oct 12 11:48:48 2001
++++ response.c	Wed Jan 30 08:28:59 2002
+@@ -201,12 +201,12 @@
+     req->r_hlen[i] = sprintf(req->r_head+i*BR_HEADER,
+ 			     "\r\n--" BOUNDARY "\r\n"
+ 			     "Content-type: %s\r\n"
+-			     "Content-range: bytes %ld-%ld/%ld\r\n"
++			     "Content-range: bytes %lld-%lld/%lld\r\n"
+ 			     "\r\n",
+ 			     now, req->mime,
+ 			     req->r_start[i],req->r_end[i]-1,req->bst.st_size);
+     if (debug > 1)
+-	fprintf(stderr,"%03d: send range: %ld-%ld/%ld (%ld byte)\n",
++	fprintf(stderr,"%03d: send range: %lld-%lld/%lld (%lld byte)\n",
+ 		req->fd,
+ 		req->r_start[i],req->r_end[i],req->bst.st_size,
+ 		req->r_end[i]-req->r_start[i]);
+@@ -230,14 +230,14 @@
+     if (req->ranges == 0) {
+ 	req->lres += sprintf(req->hres+req->lres,
+ 			     "Content-Type: %s\r\n"
+-			     "Content-Length: %ld\r\n",
++			     "Content-Length: %lld\r\n",
+ 			     req->mime,
+ 			     req->body ? req->lbody : req->bst.st_size);
+     } else if (req->ranges == 1) {
+ 	req->lres += sprintf(req->hres+req->lres,
+ 			     "Content-Type: %s\r\n"
+-			     "Content-Range: bytes %ld-%ld/%ld\r\n"
+-			     "Content-Length: %ld\r\n",
++			     "Content-Range: bytes %lld-%lld/%lld\r\n"
++			     "Content-Length: %lld\r\n",
+ 			     req->mime,
+ 			     req->r_start[0],req->r_end[0]-1,req->bst.st_size,
+ 			     req->r_end[0]-req->r_start[0]);
+@@ -253,7 +253,7 @@
+ 	req->lres += sprintf(req->hres+req->lres,
+ 			     "Content-Type: multipart/byteranges;"
+ 			     " boundary=" BOUNDARY "\r\n"
+-			     "Content-Length: %ld\r\n",
++			     "Content-Length: %lld\r\n",
+ 			     now,len);
+     }
+     if (mtime != -1) {
+@@ -388,7 +388,7 @@
+ 		return;
+ 	    default:
+ 		if (debug > 1)
+-		    fprintf(stderr,"%03d: %ld/%ld (%ld%%)\r",req->fd,
++		    fprintf(stderr,"%03d: %lld/%lld (%lld%%)\r",req->fd,
+ 			    req->written,req->bst.st_size,
+ 			    req->written*100/req->bst.st_size);
+ 		req->written += rc;