Upgrade to 2.8.

4 files changed, 34 insertions, 33 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index f8b51a95dd49..c412f7200570 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wwwoffle
-PORTVERSION=	2.7h
-PORTREVISION=	2
+PORTVERSION=	2.8
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.gedanken.freeserve.co.uk/download-wwwoffle/
 EXTRACT_SUFX=	.tgz
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 752d2fd0852a..502d2f760daa 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1 +1 @@
-MD5 (wwwoffle-2.7h.tgz) = 3226cbe65feca747f92393114d9de5f0
+MD5 (wwwoffle-2.8.tgz) = cdd8cf0011e34e9d67ecfeefeecd4584
diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index 9a9841526a8f..f38635f839f6 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,55 +1,55 @@
---- src/Makefile.in.orig	Mon Apr 22 02:01:32 2002
-+++ src/Makefile.in	Mon Apr 22 20:50:31 2002
-@@ -132,7 +132,7 @@
- 	     parse.o spool.o \
- 	     document.o html.o xml.o vrml.o javaclass.o \
+--- src/Makefile.in.orig	Tue Sep  2 19:24:28 2003
++++ src/Makefile.in	Tue Oct  7 13:49:09 2003
+@@ -136,7 +136,7 @@
+ 	     document.o html.o css.o xml.o vrml.o javaclass.o \
  	     configrdwr.o configmisc.o configdata.o configfunc.o \
--	     errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
-+	     errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
+ 	     io.o iopriv.o iozlib.o iochunk.o \
+-	     errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
++	     errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
  
  wwwoffle : $(WWWOFFLE_OBJ)
  	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
-@@ -147,7 +147,7 @@
-               messages.o local.o cgi.o \
+@@ -152,7 +152,7 @@
                parse.o purge.o refresh.o spool.o \
  	      configrdwr.o configmisc.o configdata.o configfunc.o configedit.o \
--	      errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
-+	      errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
+ 	      io.o iopriv.o iozlib.o iochunk.o \
+-	      errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
++	      errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
  
  wwwoffled : $(WWWOFFLED_OBJ)
  	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
-@@ -160,7 +160,7 @@
- 		   messages.o local.o cgi.o \
+@@ -166,7 +166,7 @@
  	           parse.o \
  	           configrdwr.o configmisc.o configdata.o configfunc.o \
--	           errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
-+	           errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
+ 	           io.o iopriv.o iozlib.o iochunk.o \
+-	           errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o md5.o
++	           errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o
  
  wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
  	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
-@@ -172,7 +172,7 @@
- 	    messages.o local.o cgi.o \
+@@ -179,7 +179,7 @@
  	    parse.o \
  	    configrdwr.o configmisc.o configdata.o configfunc.o \
--	    errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o md5.o
-+	    errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o
+ 	    io.o iopriv.o iozlib.o iochunk.o \
+-	    errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o md5.o
++	    errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o
  
  convert-cache : $(CONVERT_OBJ)
  	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
-@@ -184,7 +184,7 @@
- 	       messages.o local.o cgi.o \
+@@ -192,7 +192,7 @@
  	       parse.o \
  	       configrdwr.o configmisc.o configdata.o configfunc.o \
--	       errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o md5.o
-+	       errors.o io.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o
+ 	       io.o iopriv.o iozlib.o iochunk.o \
+-	       errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o md5.o
++	       errors.o miscurl.o miscencdec.o headbody.o proto.o sockets.o spool.o
  
  uncompress-cache : $(UNCOMPRESS_OBJ)
  	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY)
-@@ -253,7 +253,6 @@
- sockets.o          : sockets.c          autoconfig.h                   errors.h          sockets.h \
+@@ -269,7 +269,6 @@
+ sockets.o          : sockets.c          autoconfig.h                        errors.h          sockets.h                                                         \
                       sockets4.c sockets6.c
  
--md5.o              : md5.c                                                                                                      md5.h
+-md5.o              : md5.c                                                                                                                                 md5.h
  
  ######## SOURCE FILES ########
  
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index 20a4cd5bd2cc..2bd154977800 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -230,14 +230,15 @@ html/en/messages/IndexProtocol-Head.html
 html/en/messages/IndexProtocol-Tail.html
 html/en/messages/IndexRoot-Body.html
 html/en/messages/IndexSeparator-Body.html
-html/en/messages/InfoCached-Body.html
-html/en/messages/InfoCached-Head.html
-html/en/messages/InfoCached-Tail.html
+html/en/messages/InfoCached.html
 html/en/messages/InfoContents-Body.html
+html/en/messages/InfoContents-Head.html
+html/en/messages/InfoContents-Tail.html
 html/en/messages/InfoIllegal.html
 html/en/messages/InfoRequest.html
 html/en/messages/InfoRequested.html
-html/en/messages/InfoSource-Body.html
+html/en/messages/InfoSource-Head.html
+html/en/messages/InfoSource-Tail.html
 html/en/messages/MethodUnsupported.html
 html/en/messages/MonitorFormError.html
 html/en/messages/MonitorIllegal.html
@@ -290,6 +291,7 @@ html/en/search/start2.html
 html/en/search/start3.html
 html/en/search/start4.html
 html/en/search/udmsearch
+html/en/wwwoffle.css
 html/en/wwwoffle.pac
 html/es/FAQ.html
 html/es/README.CONF.html