1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
freebsd-ports/www/wwwoffle/files/patch-aa
Munechika SUMIKAWA a497794cd4 Upgrade to 2.6b.
2001-04-11 14:58:15 +00:00

143 lines
5.3 KiB
Plaintext

--- 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
@@ -50,14 +50,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=
@@ -83,7 +82,7 @@
#USE_ZLIB=0
INCLUDE=
-LIBRARY=-lz
+LIBRARY+=-lz -lmd
# 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)\
- 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)
@@ -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 \
- 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)
@@ -173,7 +172,7 @@
http.o ftp.o finger.o ssl.o \
spool.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)
@@ -181,7 +180,7 @@
####
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
convert-cache : $(CONVERT_OBJ)
$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
@@ -293,15 +292,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
@@ -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 $(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 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.
- -chown -R 0 $(SPOOLDIR)/html > /dev/null 2>&1
- -chgrp -R 0 $(SPOOLDIR)/html > /dev/null 2>&1
+ -chown -R ${BINOWN} $(SPOOLDIR)/html > /dev/null 2>&1
+ -chgrp -R ${BINGRP} $(SPOOLDIR)/html > /dev/null 2>&1
install_config :
sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
@@ -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: " )
- [ ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
+ $(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.default
[ -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
install_fixup-win32: