1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

Upgrade to 2.6b.

This commit is contained in:
Munechika SUMIKAWA 2001-04-11 14:58:15 +00:00
parent 0ab420e05e
commit a497794cd4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=41286
4 changed files with 62 additions and 56 deletions

View File

@ -6,8 +6,7 @@
# #
PORTNAME= wwwoffle PORTNAME= wwwoffle
PORTVERSION= 2.6 PORTVERSION= 2.6b
PORTREVISION= 1
CATEGORIES= www ipv6 CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \ MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \
${MASTER_SITE_SUNSITE} ${MASTER_SITE_SUNSITE}
@ -19,13 +18,14 @@ EXTRACT_SUFX= .tgz
.if ${OSVERSION} >= 400014 .if ${OSVERSION} >= 400014
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \ PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
ftp://ftp.pasta.cs.uit.no/pub/IPv6/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 PATCH_DIST_STRIP= -p1
.endif .endif
MAINTAINER= sumikawa@FreeBSD.org MAINTAINER= sumikawa@FreeBSD.org
USE_PERL5= yes USE_PERL5= yes
USE_GMAKE= yes
# $SPOOL seems like a common name which could be used for other things, so # $SPOOL seems like a common name which could be used for other things, so
# use $WWWOFFLE_SPOOL as the overriding setting. # use $WWWOFFLE_SPOOL as the overriding setting.

View File

@ -1,2 +1,2 @@
MD5 (wwwoffle-2.6.tgz) = 40360860c6f57c27316f1a6efcc90457 MD5 (wwwoffle-2.6b.tgz) = 9697c8ef1781f1d33026327a81d74286
MD5 (wwwoffle-26-v6-20001122.diff.gz) = 135cecfa74212c07ddb3479f39b035a1 MD5 (wwwoffle-26b-v6-20010411.diff.gz) = d62aeca57fd72f5d153efa9ec4347e8e

View File

@ -1,19 +1,22 @@
--- Makefile.orig Sun Oct 22 03:32:41 2000 --- Makefile.orig Sat Mar 24 23:02:31 2001
+++ Makefile Tue Nov 21 01:17:12 2000 +++ Makefile Mon Apr 9 11:01:34 2001
@@ -16,9 +16,9 @@ @@ -18,11 +18,11 @@
LOCALHOST=localhost:8080 LOCALHOST=localhost:8080
# For UNIX.
-INSTDIR=/usr/local -INSTDIR=/usr/local
-SPOOLDIR=/var/spool/wwwoffle -SPOOLDIR=/var/spool/wwwoffle
-CONFDIR=/var/spool/wwwoffle -CONFDIR=/var/spool/wwwoffle
+INSTDIR=$(PREFIX) +INSTDIR=$(PREFIX)
+SPOOLDIR=$(SPOOL)/wwwoffle +SPOOLDIR=$(SPOOL)/wwwoffle
+CONFDIR=$(SPOOL)/wwwoffle +CONFDIR=$(SPOOL)/wwwoffle
MANDIR=$(INSTDIR)/man
-DOCDIR=$(INSTDIR)/doc/wwwoffle
+DOCDIR=$(INSTDIR)/share/doc/wwwoffle
# For Cygwin (win32). # For Cygwin (win32).
#INSTDIR=/wwwoffle #INSTDIR=/wwwoffle
@@ -45,14 +45,13 @@ @@ -50,14 +50,13 @@
######## ########
@ -31,16 +34,16 @@
# For HP/UX this is a good idea. # For HP/UX this is a good idea.
#LDFLAGS= #LDFLAGS=
@@ -72,7 +71,7 @@ @@ -83,7 +82,7 @@
######## #USE_ZLIB=0
INCLUDE= INCLUDE=
-LIBRARY= -LIBRARY=-lz
+LIBRARY+= -lmd +LIBRARY+=-lz -lmd
# For Solaris you need the following instead. # To compile without zlib
#LIBRARY=-lnsl -lsocket #LIBRARY=
@@ -124,7 +123,7 @@ @@ -150,7 +149,7 @@
http.o ftp.o finger.o ssl.o \ http.o ftp.o finger.o ssl.o \
refresh.o messages.o parse.o spool.o \ refresh.o messages.o parse.o spool.o \
$(DOC_PARSERS)\ $(DOC_PARSERS)\
@ -49,7 +52,7 @@
wwwoffle : $(WWWOFFLE_OBJ) wwwoffle : $(WWWOFFLE_OBJ)
$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) $(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
@@ -136,7 +135,7 @@ @@ -162,7 +161,7 @@
$(DOC_PARSERS) \ $(DOC_PARSERS) \
gifmodify.o htmlmodify.o \ 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 \ 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) wwwoffled : $(WWWOFFLED_OBJ)
$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) $(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
@@ -145,7 +144,7 @@ @@ -173,7 +172,7 @@
http.o ftp.o finger.o ssl.o \
WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \
spool.o \ spool.o \
- configfile.o config.o errors.o io.o misc.o proto-none.o sockets.o md5.o messages.o parse.o \
+ configfile.o config.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-tools : $(WWWOFFLE_TOOLS_OBJ) wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) $(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
@@ -153,7 +152,7 @@ @@ -181,7 +180,7 @@
#### ####
CONVERT_OBJ=convert-cache.o \ CONVERT_OBJ=convert-cache.o \
@ -76,7 +79,7 @@
convert-cache : $(CONVERT_OBJ) convert-cache : $(CONVERT_OBJ)
$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY) $(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
@@ -248,15 +247,15 @@ @@ -293,15 +292,15 @@
install_binary : programs install_binary : programs
[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin [ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@ -95,33 +98,29 @@
install_binary-win32 : programs install_binary-win32 : programs
[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin [ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@@ -274,19 +273,19 @@ @@ -323,17 +322,17 @@
install_doc : install_man :
[ -x $(INSTDIR)/man ] || $(INSTALL) -d -m 755 $(INSTDIR)/man [ -x $(MANDIR) ] || $(INSTALL) -d -m 755 $(MANDIR)
[ -x $(INSTDIR)/man/man1 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man1 [ -x $(MANDIR)/man1 ] || $(INSTALL) -d -m 755 $(MANDIR)/man1
- $(INSTALL) -c -m 644 wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1 - $(INSTALL) -c -m 644 wwwoffle.man $(MANDIR)/man1/wwwoffle.1
+ $(INSTALL_MAN) wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1 + $(INSTALL_MAN) -c -m 644 wwwoffle.man $(MANDIR)/man1/wwwoffle.1
[ -x $(INSTDIR)/man/man5 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man5 [ -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 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) -c -m 644 wwwoffle.conf.man.install $(MANDIR)/man5/wwwoffle.conf.5
+ $(INSTALL_MAN) wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5 + $(INSTALL_MAN) -c -m 644 wwwoffle.conf.man.install $(MANDIR)/man5/wwwoffle.conf.5
[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man8 [ -x $(MANDIR)/man8 ] || $(INSTALL) -d -m 755 $(MANDIR)/man8
- $(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8 - $(INSTALL) -c -m 644 wwwoffled.man $(MANDIR)/man8/wwwoffled.8
- [ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle + $(INSTALL_MAN) -c -m 644 wwwoffled.man $(MANDIR)/man8/wwwoffled.8
+ $(INSTALL_MAN) wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
+ [ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle install_doc :
for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \ [ -x $(DOCDIR) ] || $(INSTALL) -d -m 755 $(DOCDIR)
- $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\ for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README README.* ; do \
+ $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\ - $(INSTALL) -c -m 644 $$file $(DOCDIR)/$$file ;\
+ $(INSTALL_MAN) -c -m 644 $$file $(DOCDIR)/$$file ;\
done done
[ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \ [ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \
for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \ for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README README.* ; do \
- [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\ @@ -372,8 +371,8 @@
+ [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
done )
@@ -345,8 +344,8 @@
cd $(SPOOLDIR)/html && ./fixup-install.sh $(SPOOLDIR) $(LOCALHOST) && rm ./fixup-install.sh 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. # 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. # These two will fail unless you are root, that is OK because the owner is already you.
@ -132,7 +131,7 @@
install_config : install_config :
sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install 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: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\
echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\ echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
echo "WWWOFFLE: " ) echo "WWWOFFLE: " )

View File

@ -18,6 +18,7 @@ share/doc/wwwoffle/README.1st
share/doc/wwwoffle/README.CONF share/doc/wwwoffle/README.CONF
share/doc/wwwoffle/README.PWD share/doc/wwwoffle/README.PWD
share/doc/wwwoffle/README.URL share/doc/wwwoffle/README.URL
share/doc/wwwoffle/README.compress
share/doc/wwwoffle/README.htdig share/doc/wwwoffle/README.htdig
share/doc/wwwoffle/README.lang share/doc/wwwoffle/README.lang
share/doc/wwwoffle/README.udmsearch share/doc/wwwoffle/README.udmsearch
@ -25,9 +26,13 @@ share/doc/wwwoffle/README.win32
@dirrm share/doc/wwwoffle @dirrm share/doc/wwwoffle
@cwd %%SPOOL%% @cwd %%SPOOL%%
wwwoffle/html/FAQ.html wwwoffle/html/FAQ.html
wwwoffle/html/README.CONF.html
wwwoffle/html/Welcome.html wwwoffle/html/Welcome.html
wwwoffle/html/index.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/AddCacheInfo.html
wwwoffle/html/messages/AliasRedirect.html wwwoffle/html/messages/AliasRedirect.html
wwwoffle/html/messages/CantRefreshPosted.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/search.html
wwwoffle/html/search/udmsearch/udm.gif wwwoffle/html/search/udmsearch/udm.gif
wwwoffle/html/wwwoffle.pac wwwoffle/html/wwwoffle.pac
wwwoffle/outgoing/Owwwoffle-browser wwwoffle/outgoing/O98hgItueyIbW8udnZuMjpg
wwwoffle/outgoing/Owwwoffle-user wwwoffle/outgoing/Oh-W1UuCia4-wLoZYEnRrXw
wwwoffle/outgoing/Uwwwoffle-browser wwwoffle/outgoing/Ox3oAN7UMcBN5bQi-qYGkoA
wwwoffle/outgoing/Uwwwoffle-user wwwoffle/outgoing/U98hgItueyIbW8udnZuMjpg
wwwoffle/outgoing/Uh-W1UuCia4-wLoZYEnRrXw
wwwoffle/outgoing/Ux3oAN7UMcBN5bQi-qYGkoA
wwwoffle/upgrade-config.pl wwwoffle/upgrade-config.pl
wwwoffle/wwwoffle.conf.default wwwoffle/wwwoffle.conf.default
@dirrm wwwoffle/html/local/images @dirrm wwwoffle/html/local/dontget
@dirrm wwwoffle/html/local @dirrm wwwoffle/html/local
@dirrm wwwoffle/html/messages @dirrm wwwoffle/html/messages
@dirrm wwwoffle/html/search/htdig/conf @dirrm wwwoffle/html/search/htdig/conf