Attachment #8707 for bug #18111

Lines 23-29 Link Here

(-)wwwoffle/Makefile (-1 / +4 lines)
23		23
24	SPOOL= /var/spool	24	SPOOL= /var/spool
25		25
26	MAKE_ENV+= SPOOL=$(SPOOL)	26	MAKE_ENV+= SPOOL="${SPOOL}" \
		27	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
		28	INSTALL_DATA="${INSTALL_DATA}" \
		29	INSTALL_MAN="${INSTALL_MAN}"
27		30
28	post-install:	31	post-install:
29	@${MKDIR} ${SPOOL}/wwwoffle	32	@${MKDIR} ${SPOOL}/wwwoffle




--- Makefile.orig	Sun Apr  2 18:27:30 2000
+++ Makefile	Thu Apr 20 15:27:06 2000
@@ -16,9 +16,9 @@
 
 LOCALHOST=localhost:8080

 
 # For Cygwin (win32).
 #INSTDIR=/wwwoffle
@@ -45,14 +45,13 @@
 
 ########
 
-CC=gcc
-CFLAGS=-O2 -Wall -g
+CC?=gcc
 
 # This is used in the FreeBSD port (http://www.freebsd.org/ports/).
 #CFLAGS=-O2 -Wall
 
-LD=gcc
-LDFLAGS=-g
+LD=$(CC)
+LDFLAGS=-s
 
 # For HP/UX this is a good idea.
 #LDFLAGS=
@@ -72,7 +71,7 @@
 ########
 
 INCLUDE=
-LIBRARY=
+LIBRARY= -lmd
 
 # For Solaris you need the following instead.
 #LIBRARY=-lnsl -lsocket
@@ -123,7 +122,7 @@
 WWWOFFLE_OBJ=wwwoffle.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
 
 wwwoffle : $(WWWOFFLE_OBJ)
 	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
@@ -135,7 +134,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
 
 wwwoffled : $(WWWOFFLED_OBJ)
 	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
@@ -144,7 +143,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
 
 wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
 	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
@@ -152,14 +151,14 @@
 ####
 
 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
 
 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 @@
 
 install_binary : programs
 	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
-	$(INSTALL) -c -m 755 wwwoffle $(INSTDIR)/bin
-	$(INSTALL) -c -m 755 wwwoffle-tools $(INSTDIR)/bin
+	$(INSTALL_PROGRAM) wwwoffle $(INSTDIR)/bin
+	$(INSTALL_PROGRAM) wwwoffle-tools $(INSTDIR)/bin
 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-ls
 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-mv
 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-rm
 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-read
 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-write
 	[ -x $(INSTDIR)/sbin ] || $(INSTALL) -d -m 755 $(INSTDIR)/sbin
-	$(INSTALL) -c -m 755 wwwoffled $(INSTDIR)/sbin
+	$(INSTALL_PROGRAM) wwwoffled $(INSTDIR)/sbin
 
 install_binary-win32 : programs
 	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@@ -283,19 +282,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
 	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)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
-	[ -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 \
+	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
-	  $(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 \
+	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
-	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
+	    [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
 	  done )
 
 

 	  echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\
 	  echo "WWWOFFLE: Run 'perl upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
 	  echo "WWWOFFLE: " )
+	$(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
-	[  ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
+	$(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
 	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
 
 install_fixup-win32:

Line 0 Link Here

(-)wwwoffle/patches/patch-ab (+11 lines)
	1	--- misc.c.orig Thu Apr 20 15:20:56 2000
	2	+++ misc.c Thu Apr 20 15:21:12 2000
	3	@@ -28,7 +28,7 @@
	4	#include "errors.h"
	5	#include "proto.h"
	6	#include "config.h"
	7	-#include "md5.h"
	8	+#include <md5.h>
	9
	10
	11	/*++++++++++++++++++++++++++++++++++++++

Lines 5-10 Link Here

(-)wwwoffle/pkg/PLIST (+1 lines)
5	bin/wwwoffle-rm	5	bin/wwwoffle-rm
6	bin/wwwoffle-tools	6	bin/wwwoffle-tools
7	bin/wwwoffle-write	7	bin/wwwoffle-write
		8	etc/rc.d/wwwoffled.sh
8	sbin/wwwoffled	9	sbin/wwwoffled
9	share/doc/wwwoffle/CHANGES.CONF	10	share/doc/wwwoffle/CHANGES.CONF
10	share/doc/wwwoffle/CONVERT	11	share/doc/wwwoffle/CONVERT

Return to bug 18111

Lines 1-5 Link Here

(-)wwwoffle/patches/patch-aa (-12 / +96 lines)
1	--- Makefile.orig Thu Dec 3 19:19:46 1998	1	--- Makefile.orig Sun Apr 2 18:27:30 2000
2	+++ Makefile Sun Mar 7 09:13:34 1999	2	+++ Makefile Thu Apr 20 15:27:06 2000
3	@@ -16,9 +16,9 @@	3	@@ -16,9 +16,9 @@
4		4
5	LOCALHOST=localhost:8080	5	LOCALHOST=localhost:8080
Lines 13-47 Link Here
13		13
14	# For Cygwin (win32).	14	# For Cygwin (win32).
15	#INSTDIR=/wwwoffle	15	#INSTDIR=/wwwoffle
16	@@ -46,13 +46,12 @@	16	@@ -45,14 +45,13 @@
		17
17	########	18	########
18		19
19	CC=gcc	20	-CC=gcc
20	-CFLAGS=-O2 -Wall -g	21	-CFLAGS=-O2 -Wall -g
		22	+CC?=gcc
21		23
22	# This is used in the FreeBSD port (http://www.freebsd.org/ports/).	24	# This is used in the FreeBSD port (http://www.freebsd.org/ports/).
23	#CFLAGS=-O2 -Wall	25	#CFLAGS=-O2 -Wall
24		26
25	LD=gcc	27	-LD=gcc
26	-LDFLAGS=-g	28	-LDFLAGS=-g
		29	+LD=$(CC)
27	+LDFLAGS=-s	30	+LDFLAGS=-s
28		31
29	# For HP/UX this is a good idea.	32	# For HP/UX this is a good idea.
30	#LDFLAGS=	33	#LDFLAGS=
31	@@ -289,13 +288,13 @@	34	@@ -72,7 +71,7 @@
32	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5	35	########
		36
		37	INCLUDE=
		38	-LIBRARY=
		39	+LIBRARY= -lmd
		40
		41	# For Solaris you need the following instead.
		42	#LIBRARY=-lnsl -lsocket
		43	@@ -123,7 +122,7 @@
		44	WWWOFFLE_OBJ=wwwoffle.o \
		45	refresh.o messages.o parse.o spool.o \
		46	$(DOC_PARSERS)\
		47	- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
		48	+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o
		49
		50	wwwoffle : $(WWWOFFLE_OBJ)
		51	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
		52	@@ -135,7 +134,7 @@
		53	$(DOC_PARSERS) \
		54	gifmodify.o htmlmodify.o \
		55	connect.o control.o configedit.o htdig.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \
		56	- config.o errors.o io.o misc.o proto.o sockets.o md5.o
		57	+ config.o errors.o io.o misc.o proto.o sockets.o
		58
		59	wwwoffled : $(WWWOFFLED_OBJ)
		60	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
		61	@@ -144,7 +143,7 @@
		62
		63	WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \
		64	spool.o \
		65	- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
		66	+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o
		67
		68	wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
		69	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
		70	@@ -152,14 +151,14 @@
		71	####
		72
		73	UPGRADE_OBJ=upgrade-cache.o \
		74	- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
		75	+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o
		76
		77	upgrade-cache : $(UPGRADE_OBJ)
		78	$(LINK) $(UPGRADE_OBJ) -o $@ $(LIBRARY)
		79
		80	ENDIAN_OBJ=endian-cache.o \
		81	spool.o \
		82	- config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
		83	+ config-startup.o errors.o io.o misc.o proto-none.o sockets.o
		84
		85	endian-cache : $(ENDIAN_OBJ)
		86	$(LINK) $(ENDIAN_OBJ) -o $@ $(LIBRARY)
		87	@@ -257,15 +256,15 @@
		88
		89	install_binary : programs
		90	[ -x $(INSTDIR)/bin ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/bin
		91	- $(INSTALL) -c -m 755 wwwoffle $(INSTDIR)/bin
		92	- $(INSTALL) -c -m 755 wwwoffle-tools $(INSTDIR)/bin
		93	+ $(INSTALL_PROGRAM) wwwoffle $(INSTDIR)/bin
		94	+ $(INSTALL_PROGRAM) wwwoffle-tools $(INSTDIR)/bin
		95	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-ls
		96	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-mv
		97	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-rm
		98	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-read
		99	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-write
100	[ -x $(INSTDIR)/sbin ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/sbin
101	- $(INSTALL) -c -m 755 wwwoffled $(INSTDIR)/sbin
102	+ $(INSTALL_PROGRAM) wwwoffled $(INSTDIR)/sbin
103
104	install_binary-win32 : programs
105	[ -x $(INSTDIR)/bin ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/bin
106	@@ -283,19 +282,19 @@
107	install_doc :
108	[ -x $(INSTDIR)/man ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/man
109	[ -x $(INSTDIR)/man/man1 ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/man/man1
110	- $(INSTALL) -c -m 644 wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
111	+ $(INSTALL_MAN) wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
112	[ -x $(INSTDIR)/man/man5 ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/man/man5
113	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf.man > wwwoffle.conf.man.install
114	- $(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
115	+ $(INSTALL_MAN) wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
33	[ -x $(INSTDIR)/man/man8 ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/man/man8	116	[ -x $(INSTDIR)/man/man8 ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/man/man8
34	$(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8	117	- $(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
35	+ [ -x $(INSTDIR)/share/doc/wwwoffle ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
36	- [ -x $(INSTDIR)/doc/wwwoffle ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle	118	- [ -x $(INSTDIR)/doc/wwwoffle ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle
		119	+ $(INSTALL_MAN) wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
		120	+ [ -x $(INSTDIR)/share/doc/wwwoffle ] \|\| $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
37	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \	121	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
38	+ $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
39	- $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\	122	- $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
		123	+ $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
40	done	124	done
41	[ "x$(LANG)" = "x" ] \|\| [ ! -d lang-$(LANG) ] \|\| ( cd lang-$(LANG) && \	125	[ "x$(LANG)" = "x" ] \|\| [ ! -d lang-$(LANG) ] \|\| ( cd lang-$(LANG) && \
42	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \	126	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
43	+ [ ! -f $$file ] \|\| $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
44	- [ ! -f $$file ] \|\| $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\	127	- [ ! -f $$file ] \|\| $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
		128	+ [ ! -f $$file ] \|\| $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
45	done )	129	done )
46		130
47		131
Lines 49-56 Link Here
49	echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\	133	echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\
50	echo "WWWOFFLE: Run 'perl upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\	134	echo "WWWOFFLE: Run 'perl upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
51	echo "WWWOFFLE: " )	135	echo "WWWOFFLE: " )
52	+ $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
53	- [ ! -f $(CONFDIR)/wwwoffle.conf ] \|\| $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install	136	- [ ! -f $(CONFDIR)/wwwoffle.conf ] \|\| $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
		137	+ $(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
54	[ -f $(CONFDIR)/wwwoffle.conf ] \|\| $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf	138	[ -f $(CONFDIR)/wwwoffle.conf ] \|\| $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
55		139
56	install_fixup-win32:	140	install_fixup-win32: