mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-06 22:51:41 +00:00
Code Issues Releases Activity
0181081672
freebsd-ports/www/wwwoffle/files/patch-aa
Maxim Sobolev 0181081672 Several fixes and improvements: 
"The wwwoffle port has "/var/spool/wwwoffle" hardcoded as the path for
the spool, both in the Makefile and PLIST.  Even if a user overrides
this in Makefile they may not know PLIST needs changing.

Also, the installation attempted to change the ownership of some files
to root:wheel, this changes that to ${BINOWN}:${BINGRP}.  This means
one less warning message while testing the port as a non-root user if
nothing else."

PR:		18372
Submitted by:	maintainer
2000-05-19 08:44:38 +00:00

152 lines
5.8 KiB
Plaintext
Raw Blame History

--- Makefile.orig Fri May 19 11:35:02 2000
+++ Makefile Fri May 19 11:35:55 2000
@@ -16,9 +16,9 @@
LOCALHOST=localhost:8080
-INSTDIR=/usr/local
-SPOOLDIR=/var/tmp/w/wwwoffle
-CONFDIR=/var/tmp/w/wwwoffle
+INSTDIR=$(PREFIX)
+SPOOLDIR=$(SPOOL)/wwwoffle
+CONFDIR=$(SPOOL)/wwwoffle
# 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)/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)/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)/doc/wwwoffle/$$file-$(LANG) ;\
+ [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
done )
@@ -354,8 +353,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
@@ -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." ;\
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:
Reference in New Issue View Git Blame Copy Permalink