diff options
author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2001-04-11 14:58:15 +0000 |
---|---|---|
committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2001-04-11 14:58:15 +0000 |
commit | a497794cd4f759d70b399fcde77c76d3900bebda (patch) | |
tree | ab35e02d34368f082c555ca90487b61137a5eedb /www/wwwoffle/files | |
parent | Ooops, this should've been part of my yesterday's commit... (diff) |
Upgrade to 2.6b.
Notes
Notes:
svn path=/head/; revision=41286
Diffstat (limited to 'www/wwwoffle/files')
-rw-r--r-- | www/wwwoffle/files/patch-aa | 89 |
1 files changed, 44 insertions, 45 deletions
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: " ) |