Upgrade to 2.6b.

4 files changed, 62 insertions, 56 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 05e3ae002cd4..b3fdcb0dfddb 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wwwoffle
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	2.6b
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		${MASTER_SITE_SUNSITE}
@@ -19,13 +18,14 @@ EXTRACT_SUFX=	.tgz
 .if ${OSVERSION} >= 400014
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/ \
 		ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/
-PATCHFILES=	wwwoffle-26-v6-20001122.diff.gz
+PATCHFILES=	wwwoffle-26b-v6-20010411.diff.gz
 PATCH_DIST_STRIP=	-p1
 .endif
 
 MAINTAINER=	sumikawa@FreeBSD.org
 
 USE_PERL5=	yes
+USE_GMAKE=	yes
 
 # $SPOOL seems like a common name which could be used for other things, so
 # use $WWWOFFLE_SPOOL as the overriding setting.
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 334853e2618b..e68d720fb2bf 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,2 +1,2 @@
-MD5 (wwwoffle-2.6.tgz) = 40360860c6f57c27316f1a6efcc90457
-MD5 (wwwoffle-26-v6-20001122.diff.gz) = 135cecfa74212c07ddb3479f39b035a1
+MD5 (wwwoffle-2.6b.tgz) = 9697c8ef1781f1d33026327a81d74286
+MD5 (wwwoffle-26b-v6-20010411.diff.gz) = d62aeca57fd72f5d153efa9ec4347e8e
diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index caf818c6aff6..5670b799e8de 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,19 +1,22 @@
---- Makefile.orig	Sun Oct 22 03:32:41 2000
-+++ Makefile	Tue Nov 21 01:17:12 2000
-@@ -16,9 +16,9 @@
- 
+--- Makefile.orig	Sat Mar 24 23:02:31 2001
++++ Makefile	Mon Apr  9 11:01:34 2001
+@@ -18,11 +18,11 @@
  LOCALHOST=localhost:8080
  
+ # For UNIX.
 -INSTDIR=/usr/local
 -SPOOLDIR=/var/spool/wwwoffle
 -CONFDIR=/var/spool/wwwoffle
 +INSTDIR=$(PREFIX)
 +SPOOLDIR=$(SPOOL)/wwwoffle
 +CONFDIR=$(SPOOL)/wwwoffle
+ MANDIR=$(INSTDIR)/man
+-DOCDIR=$(INSTDIR)/doc/wwwoffle
++DOCDIR=$(INSTDIR)/share/doc/wwwoffle
  
  # For Cygwin (win32).
  #INSTDIR=/wwwoffle
-@@ -45,14 +45,13 @@
+@@ -50,14 +50,13 @@
  
  ########
  
@@ -31,16 +34,16 @@
  
  # For HP/UX this is a good idea.
  #LDFLAGS=
-@@ -72,7 +71,7 @@
- ########
+@@ -83,7 +82,7 @@
+ #USE_ZLIB=0
  
  INCLUDE=
--LIBRARY=
-+LIBRARY+= -lmd
+-LIBRARY=-lz
++LIBRARY+=-lz -lmd
  
- # For Solaris you need the following instead.
- #LIBRARY=-lnsl -lsocket
-@@ -124,7 +123,7 @@
+ # To compile without zlib
+ #LIBRARY=
+@@ -150,7 +149,7 @@
  	     http.o ftp.o finger.o ssl.o \
  	     refresh.o messages.o parse.o spool.o \
  	     $(DOC_PARSERS)\
@@ -49,7 +52,7 @@
  
  wwwoffle : $(WWWOFFLE_OBJ)
  	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
-@@ -136,7 +135,7 @@
+@@ -162,7 +161,7 @@
  	      $(DOC_PARSERS) \
  	      gifmodify.o htmlmodify.o \
  	      connect.o control.o configedit.o search.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \
@@ -58,16 +61,16 @@
  
  wwwoffled : $(WWWOFFLED_OBJ)
  	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
-@@ -145,7 +144,7 @@
- 
- WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \
+@@ -173,7 +172,7 @@
+ 	           http.o ftp.o finger.o ssl.o \
  	           spool.o \
--	           configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o md5.o
-+	           configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o
+ 		   messages.o parse.o \
+-	           configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
++	           configfile.o config.o errors.o io.o misc.o proto.o sockets.o
  
  wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
  	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
-@@ -153,7 +152,7 @@
+@@ -181,7 +180,7 @@
  ####
  
  CONVERT_OBJ=convert-cache.o \
@@ -76,7 +79,7 @@
  
  convert-cache : $(CONVERT_OBJ)
  	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
-@@ -248,15 +247,15 @@
+@@ -293,15 +292,15 @@
  
  install_binary : programs
  	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@@ -95,33 +98,29 @@
  
  install_binary-win32 : programs
  	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
-@@ -274,19 +273,19 @@
- install_doc :
- 	[ -x $(INSTDIR)/man ] || $(INSTALL) -d -m 755 $(INSTDIR)/man
- 	[ -x $(INSTDIR)/man/man1 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man1
--	$(INSTALL) -c -m 644 wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
-+	$(INSTALL_MAN) wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
- 	[ -x $(INSTDIR)/man/man5 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man5
+@@ -323,17 +322,17 @@
+ install_man :
+ 	[ -x $(MANDIR) ] || $(INSTALL) -d -m 755 $(MANDIR)
+ 	[ -x $(MANDIR)/man1 ] || $(INSTALL) -d -m 755 $(MANDIR)/man1
+-	$(INSTALL) -c -m 644 wwwoffle.man $(MANDIR)/man1/wwwoffle.1
++	$(INSTALL_MAN) -c -m 644 wwwoffle.man $(MANDIR)/man1/wwwoffle.1
+ 	[ -x $(MANDIR)/man5 ] || $(INSTALL) -d -m 755 $(MANDIR)/man5
  	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf.man > wwwoffle.conf.man.install
--	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
-+	$(INSTALL_MAN) wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
- 	[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man8
--	$(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
--	[ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle
-+	$(INSTALL_MAN) wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
-+	[ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
- 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
--	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
-+	  $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
+-	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(MANDIR)/man5/wwwoffle.conf.5
++	$(INSTALL_MAN) -c -m 644 wwwoffle.conf.man.install $(MANDIR)/man5/wwwoffle.conf.5
+ 	[ -x $(MANDIR)/man8 ] || $(INSTALL) -d -m 755 $(MANDIR)/man8
+-	$(INSTALL) -c -m 644 wwwoffled.man $(MANDIR)/man8/wwwoffled.8
++	$(INSTALL_MAN) -c -m 644 wwwoffled.man $(MANDIR)/man8/wwwoffled.8
+ 
+ install_doc :
+ 	[ -x $(DOCDIR) ] || $(INSTALL) -d -m 755 $(DOCDIR)
+ 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README README.* ; do \
+-	  $(INSTALL) -c -m 644 $$file $(DOCDIR)/$$file ;\
++	  $(INSTALL_MAN) -c -m 644 $$file $(DOCDIR)/$$file ;\
  	done
  	[ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \
- 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
--	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
-+	    [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
- 	  done )
- 
- 
-@@ -345,8 +344,8 @@
+ 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README README.* ; do \
+@@ -372,8 +371,8 @@
  	cd $(SPOOLDIR)/html && ./fixup-install.sh $(SPOOLDIR) $(LOCALHOST) && rm ./fixup-install.sh
  # Now fix the permissions that tar preserved, we needed to use 'tar xpf' to get round root's umask.
  # These two will fail unless you are root, that is OK because the owner is already you.
@@ -132,7 +131,7 @@
  
  install_config :
  	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
-@@ -356,7 +355,7 @@
+@@ -383,7 +382,7 @@
  	  echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\
  	  echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
  	  echo "WWWOFFLE: " )
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index e91ca3417e9b..75f75d7cd229 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -18,6 +18,7 @@ share/doc/wwwoffle/README.1st
 share/doc/wwwoffle/README.CONF
 share/doc/wwwoffle/README.PWD
 share/doc/wwwoffle/README.URL
+share/doc/wwwoffle/README.compress
 share/doc/wwwoffle/README.htdig
 share/doc/wwwoffle/README.lang
 share/doc/wwwoffle/README.udmsearch
@@ -25,9 +26,13 @@ share/doc/wwwoffle/README.win32
 @dirrm share/doc/wwwoffle
 @cwd %%SPOOL%%
 wwwoffle/html/FAQ.html
+wwwoffle/html/README.CONF.html
 wwwoffle/html/Welcome.html
 wwwoffle/html/index.html
-wwwoffle/html/local/images/trans-1x1.gif
+wwwoffle/html/local/index.html
+wwwoffle/html/local/dontget/replacement.gif
+wwwoffle/html/local/dontget/replacement.js
+wwwoffle/html/local/dontget/replacement.png
 wwwoffle/html/messages/AddCacheInfo.html
 wwwoffle/html/messages/AliasRedirect.html
 wwwoffle/html/messages/CantRefreshPosted.html
@@ -145,13 +150,15 @@ wwwoffle/html/search/udmsearch/scripts/wwwoffle-udmsearch
 wwwoffle/html/search/udmsearch/search.html
 wwwoffle/html/search/udmsearch/udm.gif
 wwwoffle/html/wwwoffle.pac
-wwwoffle/outgoing/Owwwoffle-browser
-wwwoffle/outgoing/Owwwoffle-user
-wwwoffle/outgoing/Uwwwoffle-browser
-wwwoffle/outgoing/Uwwwoffle-user
+wwwoffle/outgoing/O98hgItueyIbW8udnZuMjpg
+wwwoffle/outgoing/Oh-W1UuCia4-wLoZYEnRrXw
+wwwoffle/outgoing/Ox3oAN7UMcBN5bQi-qYGkoA
+wwwoffle/outgoing/U98hgItueyIbW8udnZuMjpg
+wwwoffle/outgoing/Uh-W1UuCia4-wLoZYEnRrXw
+wwwoffle/outgoing/Ux3oAN7UMcBN5bQi-qYGkoA
 wwwoffle/upgrade-config.pl
 wwwoffle/wwwoffle.conf.default
-@dirrm wwwoffle/html/local/images
+@dirrm wwwoffle/html/local/dontget
 @dirrm wwwoffle/html/local
 @dirrm wwwoffle/html/messages
 @dirrm wwwoffle/html/search/htdig/conf