diff options
author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-11-20 17:53:19 +0000 |
---|---|---|
committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-11-20 17:53:19 +0000 |
commit | 7fbe47e20c75cd3e5f986ae8a46796c3dadb5d41 (patch) | |
tree | 3dcb79ef44612f57f1697506274d8d5fa315cd26 /www/wwwoffle | |
parent | Update to 1.0.10 (diff) |
- Upgrade to 2.6 and use IPv6 patch.
- I(sumikawa) take over this port.
Notes
Notes:
svn path=/head/; revision=35292
Diffstat (limited to 'www/wwwoffle')
-rw-r--r-- | www/wwwoffle/Makefile | 13 | ||||
-rw-r--r-- | www/wwwoffle/distinfo | 3 | ||||
-rw-r--r-- | www/wwwoffle/files/patch-aa | 64 | ||||
-rw-r--r-- | www/wwwoffle/files/patch-ac | 84 | ||||
-rw-r--r-- | www/wwwoffle/pkg-plist | 108 |
5 files changed, 102 insertions, 170 deletions
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index e8d9c6b287c8..6fae4eb40347 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -6,14 +6,19 @@ # PORTNAME= wwwoffle -PORTVERSION= 2.5e -CATEGORIES= www +PORTVERSION= 2.6 +CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \ ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/www/servers EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ + ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/ +PATCHFILES= wwwoffle-26-v6-20001121.diff.gz +PATCH_DIST_STRIP= -p1 + +MAINTAINER= sumikawa@FreeBSD.org USE_PERL5= yes @@ -51,7 +56,7 @@ do-configure: post-install: @${MKDIR} ${SPOOL}/wwwoffle @${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config.pl ${SPOOL}/wwwoffle - @${INSTALL_SCRIPT} ${FILESDIR}/wwwoffled.sh ${PREFIX}/etc/rc.d/wwwoffled.sh.sample + @${SED} 's@%PREFIX%@${LOCALBASE}@' ${FILESDIR}/wwwoffled.sh > ${PREFIX}/etc/rc.d/wwwoffled.sh @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo index a65e67076552..d010c2b2608c 100644 --- a/www/wwwoffle/distinfo +++ b/www/wwwoffle/distinfo @@ -1 +1,2 @@ -MD5 (wwwoffle-2.5e.tgz) = a622bdfe4045171aed8934220d3c4630 +MD5 (wwwoffle-2.6.tgz) = 40360860c6f57c27316f1a6efcc90457 +MD5 (wwwoffle-26-v6-20001121.diff.gz) = 21704a043ecc8e2cfa0d16ab0b065b62 diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa index d4675aa19c49..caf818c6aff6 100644 --- a/www/wwwoffle/files/patch-aa +++ b/www/wwwoffle/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Fri May 19 11:35:02 2000 -+++ Makefile Fri May 19 11:35:55 2000 +--- Makefile.orig Sun Oct 22 03:32:41 2000 ++++ Makefile Tue Nov 21 01:17:12 2000 @@ -16,9 +16,9 @@ LOCALHOST=localhost:8080 @@ -36,55 +36,47 @@ INCLUDE= -LIBRARY= -+LIBRARY= -lmd ++LIBRARY+= -lmd # For Solaris you need the following instead. #LIBRARY=-lnsl -lsocket -@@ -123,7 +122,7 @@ - WWWOFFLE_OBJ=wwwoffle.o \ +@@ -124,7 +123,7 @@ + http.o ftp.o finger.o ssl.o \ refresh.o messages.o parse.o spool.o \ $(DOC_PARSERS)\ -- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o -+ config-startup.o errors.o io.o misc.o proto-none.o sockets.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 : $(WWWOFFLE_OBJ) $(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) -@@ -135,7 +134,7 @@ +@@ -136,7 +135,7 @@ $(DOC_PARSERS) \ gifmodify.o htmlmodify.o \ - connect.o control.o configedit.o htdig.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \ -- config.o errors.o io.o misc.o proto.o sockets.o md5.o -+ config.o errors.o io.o misc.o proto.o sockets.o + connect.o control.o configedit.o search.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.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 wwwoffled : $(WWWOFFLED_OBJ) $(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) -@@ -144,7 +143,7 @@ +@@ -145,7 +144,7 @@ WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \ spool.o \ -- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o -+ config-startup.o errors.o io.o misc.o proto-none.o sockets.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 wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ) $(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) -@@ -152,14 +151,14 @@ +@@ -153,7 +152,7 @@ #### - UPGRADE_OBJ=upgrade-cache.o \ -- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o -+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o + CONVERT_OBJ=convert-cache.o \ +- configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o md5.o ++ configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o spool.o - upgrade-cache : $(UPGRADE_OBJ) - $(LINK) $(UPGRADE_OBJ) -o $@ $(LIBRARY) - - ENDIAN_OBJ=endian-cache.o \ - spool.o \ -- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o -+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o - - endian-cache : $(ENDIAN_OBJ) - $(LINK) $(ENDIAN_OBJ) -o $@ $(LIBRARY) -@@ -257,15 +256,15 @@ + convert-cache : $(CONVERT_OBJ) + $(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY) +@@ -248,15 +247,15 @@ install_binary : programs [ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin @@ -103,7 +95,7 @@ install_binary-win32 : programs [ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin -@@ -283,19 +282,19 @@ +@@ -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 @@ -118,18 +110,18 @@ - [ -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* UPGRADE ; do \ + 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 ;\ done [ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \ - for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \ + 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 ) -@@ -354,8 +353,8 @@ +@@ -345,8 +344,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. @@ -140,9 +132,9 @@ install_config : sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install -@@ -365,7 +364,7 @@ - echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\ - echo "WWWOFFLE: Run 'perl upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\ +@@ -356,7 +355,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: " ) - [ ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install + $(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.default diff --git a/www/wwwoffle/files/patch-ac b/www/wwwoffle/files/patch-ac deleted file mode 100644 index 7134de8be169..000000000000 --- a/www/wwwoffle/files/patch-ac +++ /dev/null @@ -1,84 +0,0 @@ ---- io.c.orig Sun Jan 2 19:55:12 2000 -+++ io.c Mon May 29 20:40:30 2000 -@@ -135,14 +135,17 @@ - fd_set readfd; - struct timeval tv; - -- FD_ZERO(&readfd); -- -- FD_SET(fd,&readfd); -- -- tv.tv_sec=tv.tv_usec=0; -- -- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0) -- return(nr); -+ while(1) -+ { -+ tv.tv_sec=tv.tv_usec=0; -+ FD_ZERO(&readfd); -+ FD_SET(fd,&readfd); -+ n=select(fd+1,&readfd,NULL,NULL,&tv); -+ if(n>0) -+ break; -+ if(n==0 || errno!=EINTR) -+ return(nr); -+ } - - n=read(fd,fdbuf[fd],BUFSIZE); - -@@ -206,15 +209,18 @@ - fd_set readfd; - struct timeval tv; - -- FD_ZERO(&readfd); -- -- FD_SET(fd,&readfd); -- -- tv.tv_sec=timeout; -- tv.tv_usec=0; -- -- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0) -- return(-1); -+ while(1) -+ { -+ tv.tv_sec=timeout; -+ tv.tv_usec=0; -+ FD_ZERO(&readfd); -+ FD_SET(fd,&readfd); -+ nr=select(fd+1,&readfd,NULL,NULL,&tv); -+ if(nr>0) -+ break; -+ if(nr==0 || errno!=EINTR) -+ return(-1); -+ } - - nr=read(fd,buffer,n); - } -@@ -364,15 +370,18 @@ - fd_set readfd; - struct timeval tv; - -- FD_ZERO(&readfd); -- -- FD_SET(fd,&readfd); -- -- tv.tv_sec=timeout; -- tv.tv_usec=0; -- -- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0) -- return(-1); -+ while(1) -+ { -+ tv.tv_sec=timeout; -+ tv.tv_usec=0; -+ FD_ZERO(&readfd); -+ FD_SET(fd,&readfd); -+ n=select(fd+1,&readfd,NULL,NULL,&tv); -+ if(n>0) -+ break; -+ if(n==0 || errno!=EINTR) -+ return(-1); -+ } - - n=read(fd,fdbuf[fd]+fdbytes[fd],BUFSIZE-fdbytes[fd]); - fdbytes[fd]+=n; diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist index 1f0d255b4089..e91ca3417e9b 100644 --- a/www/wwwoffle/pkg-plist +++ b/www/wwwoffle/pkg-plist @@ -5,7 +5,7 @@ bin/wwwoffle-read bin/wwwoffle-rm bin/wwwoffle-tools bin/wwwoffle-write -etc/rc.d/wwwoffled.sh.sample +etc/rc.d/wwwoffled.sh sbin/wwwoffled share/doc/wwwoffle/CHANGES.CONF share/doc/wwwoffle/CONVERT @@ -17,52 +17,19 @@ share/doc/wwwoffle/README share/doc/wwwoffle/README.1st share/doc/wwwoffle/README.CONF share/doc/wwwoffle/README.PWD +share/doc/wwwoffle/README.URL share/doc/wwwoffle/README.htdig share/doc/wwwoffle/README.lang +share/doc/wwwoffle/README.udmsearch share/doc/wwwoffle/README.win32 -share/doc/wwwoffle/UPGRADE @dirrm share/doc/wwwoffle @cwd %%SPOOL%% wwwoffle/html/FAQ.html wwwoffle/html/Welcome.html -wwwoffle/html/htdig/button1.gif -wwwoffle/html/htdig/button10.gif -wwwoffle/html/htdig/button2.gif -wwwoffle/html/htdig/button3.gif -wwwoffle/html/htdig/button4.gif -wwwoffle/html/htdig/button5.gif -wwwoffle/html/htdig/button6.gif -wwwoffle/html/htdig/button7.gif -wwwoffle/html/htdig/button8.gif -wwwoffle/html/htdig/button9.gif -wwwoffle/html/htdig/buttonl.gif -wwwoffle/html/htdig/buttonr.gif -wwwoffle/html/htdig/conf/htdig-full.conf -wwwoffle/html/htdig/conf/htdig-incr.conf -wwwoffle/html/htdig/conf/htdig-lasttime.conf -wwwoffle/html/htdig/conf/htfuzzy.conf -wwwoffle/html/htdig/conf/htmerge.conf -wwwoffle/html/htdig/conf/htsearch.conf -wwwoffle/html/htdig/htdig.gif -wwwoffle/html/htdig/index.html -wwwoffle/html/htdig/scripts/wwwoffle-htdig-full -wwwoffle/html/htdig/scripts/wwwoffle-htdig-incr -wwwoffle/html/htdig/scripts/wwwoffle-htdig-lasttime -wwwoffle/html/htdig/scripts/wwwoffle-htfuzzy -wwwoffle/html/htdig/scripts/wwwoffle-htsearch -wwwoffle/html/htdig/search.html -wwwoffle/html/htdig/star.gif -wwwoffle/html/htdig/star_blank.gif -wwwoffle/html/htdig/start-lt2.html -wwwoffle/html/htdig/start-lt3.html -wwwoffle/html/htdig/start-lt4.html -wwwoffle/html/htdig/start1.html -wwwoffle/html/htdig/start2.html -wwwoffle/html/htdig/start3.html -wwwoffle/html/htdig/start4.html wwwoffle/html/index.html wwwoffle/html/local/images/trans-1x1.gif wwwoffle/html/messages/AddCacheInfo.html +wwwoffle/html/messages/AliasRedirect.html wwwoffle/html/messages/CantRefreshPosted.html wwwoffle/html/messages/ConfigEditPage-Body.html wwwoffle/html/messages/ConfigEditPage-Head.html @@ -83,6 +50,7 @@ wwwoffle/html/messages/FTPDir-Tail.html wwwoffle/html/messages/FTPDirRedirect.html wwwoffle/html/messages/FTPPut.html wwwoffle/html/messages/FileLocked.html +wwwoffle/html/messages/HostNotCached.html wwwoffle/html/messages/HostNotGot.html wwwoffle/html/messages/IllegalProtocol.html wwwoffle/html/messages/Index-Head.html @@ -92,12 +60,12 @@ wwwoffle/html/messages/IndexHost-Body.html wwwoffle/html/messages/IndexHost-Head.html wwwoffle/html/messages/IndexHost-Tail.html wwwoffle/html/messages/IndexIllegal.html +wwwoffle/html/messages/IndexLastOut-Body.html +wwwoffle/html/messages/IndexLastOut-Head.html +wwwoffle/html/messages/IndexLastOut-Tail.html wwwoffle/html/messages/IndexLastTime-Body.html wwwoffle/html/messages/IndexLastTime-Head.html wwwoffle/html/messages/IndexLastTime-Tail.html -wwwoffle/html/messages/IndexLatest-Body.html -wwwoffle/html/messages/IndexLatest-Head.html -wwwoffle/html/messages/IndexLatest-Tail.html wwwoffle/html/messages/IndexMonitor-Body.html wwwoffle/html/messages/IndexMonitor-Head.html wwwoffle/html/messages/IndexMonitor-Tail.html @@ -127,10 +95,55 @@ wwwoffle/html/messages/RefreshRedirect.html wwwoffle/html/messages/RefreshWillGet.html wwwoffle/html/messages/RefusedRequest.html wwwoffle/html/messages/RemoteHostError.html +wwwoffle/html/messages/SearchIllegal.html wwwoffle/html/messages/ServerError.html wwwoffle/html/messages/UserNeedsPass.html wwwoffle/html/messages/WillGet.html wwwoffle/html/robots.txt +wwwoffle/html/search/htdig/button1.gif +wwwoffle/html/search/htdig/button10.gif +wwwoffle/html/search/htdig/button2.gif +wwwoffle/html/search/htdig/button3.gif +wwwoffle/html/search/htdig/button4.gif +wwwoffle/html/search/htdig/button5.gif +wwwoffle/html/search/htdig/button6.gif +wwwoffle/html/search/htdig/button7.gif +wwwoffle/html/search/htdig/button8.gif +wwwoffle/html/search/htdig/button9.gif +wwwoffle/html/search/htdig/buttonl.gif +wwwoffle/html/search/htdig/buttonr.gif +wwwoffle/html/search/htdig/conf/htdig-full.conf +wwwoffle/html/search/htdig/conf/htdig-incr.conf +wwwoffle/html/search/htdig/conf/htdig-lasttime.conf +wwwoffle/html/search/htdig/conf/htfuzzy.conf +wwwoffle/html/search/htdig/conf/htmerge.conf +wwwoffle/html/search/htdig/conf/htsearch.conf +wwwoffle/html/search/htdig/htdig.gif +wwwoffle/html/search/htdig/index.html +wwwoffle/html/search/htdig/scripts/wwwoffle-htdig-full +wwwoffle/html/search/htdig/scripts/wwwoffle-htdig-incr +wwwoffle/html/search/htdig/scripts/wwwoffle-htdig-lasttime +wwwoffle/html/search/htdig/scripts/wwwoffle-htfuzzy +wwwoffle/html/search/htdig/scripts/wwwoffle-htsearch +wwwoffle/html/search/htdig/search.html +wwwoffle/html/search/htdig/star.gif +wwwoffle/html/search/htdig/star_blank.gif +wwwoffle/html/search/start-lt2.html +wwwoffle/html/search/start-lt3.html +wwwoffle/html/search/start-lt4.html +wwwoffle/html/search/start1.html +wwwoffle/html/search/start2.html +wwwoffle/html/search/start3.html +wwwoffle/html/search/start4.html +wwwoffle/html/search/udmsearch/conf/indexer-full.conf +wwwoffle/html/search/udmsearch/conf/indexer-incr.conf +wwwoffle/html/search/udmsearch/conf/search.html +wwwoffle/html/search/udmsearch/index.html +wwwoffle/html/search/udmsearch/scripts/wwwoffle-indexer-full +wwwoffle/html/search/udmsearch/scripts/wwwoffle-indexer-incr +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 @@ -138,17 +151,22 @@ wwwoffle/outgoing/Uwwwoffle-browser wwwoffle/outgoing/Uwwwoffle-user wwwoffle/upgrade-config.pl wwwoffle/wwwoffle.conf.default -@dirrm wwwoffle/html/htdig/conf -@dirrm wwwoffle/html/htdig/db -@dirrm wwwoffle/html/htdig/db-lasttime -@dirrm wwwoffle/html/htdig/scripts -@dirrm wwwoffle/html/htdig @dirrm wwwoffle/html/local/images @dirrm wwwoffle/html/local @dirrm wwwoffle/html/messages +@dirrm wwwoffle/html/search/htdig/conf +@dirrm wwwoffle/html/search/htdig/db +@dirrm wwwoffle/html/search/htdig/db-lasttime +@dirrm wwwoffle/html/search/htdig/scripts +@dirrm wwwoffle/html/search/htdig +@dirrm wwwoffle/html/search/udmsearch/conf +@dirrm wwwoffle/html/search/udmsearch/scripts +@dirrm wwwoffle/html/search/udmsearch +@dirrm wwwoffle/html/search @dirrm wwwoffle/html @dirrm wwwoffle/http @dirrm wwwoffle/lasttime @dirrm wwwoffle/monitor @dirrm wwwoffle/outgoing @dirrm wwwoffle/prevtime1 +@dirrm wwwoffle |