Date: Thu, 20 Apr 2000 06:10:03 -0700 (PDT) From: Maxim Sobolev <sobomax@altavista.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/18111: port update: wwwoffle 2.5e Message-ID: <200004201310.GAA51396@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/18111; it has been noted by GNATS.
From: Maxim Sobolev <sobomax@altavista.net>
To: freebsd-gnats-submit@FreeBSD.org, ben@scientia.demon.co.uk
Cc:
Subject: Re: ports/18111: port update: wwwoffle 2.5e
Date: Thu, 20 Apr 2000 16:03:14 +0300
This is a multi-part message in MIME format.
--------------A8EBE6D712EBA90805E664AC
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Hi,
I'm also working in background on this port, but your outstripped me ;). Here
is some additional patches against yours which includes following cleanups:
1. $(INSTALL_XXX) now used instead of $(INSTALL).
2. Stock libmd used instead of port's custom version.
3. ${PREFIX}/etc/rc.d/wwwoffled.sh now being properly uninstalled (I donno why
you think that it shouldn't be uninstalled).
-Maxim
--------------A8EBE6D712EBA90805E664AC
Content-Type: text/plain; charset=koi8-r;
name="wwo.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="wwo.patch"
diff -ruN /tmp/wwwoffle.orig/Makefile wwwoffle/Makefile
--- /tmp/wwwoffle.orig/Makefile Thu Apr 20 15:10:21 2000
+++ wwwoffle/Makefile Thu Apr 20 15:32:48 2000
@@ -23,7 +23,10 @@
SPOOL= /var/spool
-MAKE_ENV+= SPOOL=$(SPOOL)
+MAKE_ENV+= SPOOL="${SPOOL}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_MAN="${INSTALL_MAN}"
post-install:
@${MKDIR} ${SPOOL}/wwwoffle
diff -ruN /tmp/wwwoffle.orig/patches/patch-aa wwwoffle/patches/patch-aa
--- /tmp/wwwoffle.orig/patches/patch-aa Thu Apr 20 15:10:21 2000
+++ wwwoffle/patches/patch-aa Thu Apr 20 15:32:33 2000
@@ -1,5 +1,5 @@
---- Makefile.orig Thu Dec 3 19:19:46 1998
-+++ Makefile Sun Mar 7 09:13:34 1999
+--- Makefile.orig Sun Apr 2 18:27:30 2000
++++ Makefile Thu Apr 20 15:27:06 2000
@@ -16,9 +16,9 @@
LOCALHOST=localhost:8080
@@ -13,35 +13,119 @@
# For Cygwin (win32).
#INSTDIR=/wwwoffle
-@@ -46,13 +46,12 @@
+@@ -45,14 +45,13 @@
+
########
- CC=gcc
+-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
+-LD=gcc
-LDFLAGS=-g
++LD=$(CC)
+LDFLAGS=-s
# For HP/UX this is a good idea.
#LDFLAGS=
-@@ -289,13 +288,13 @@
- $(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
+@@ -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
+- $(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)/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 )
@@ -49,8 +133,8 @@
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:
diff -ruN /tmp/wwwoffle.orig/patches/patch-ab wwwoffle/patches/patch-ab
--- /tmp/wwwoffle.orig/patches/patch-ab Thu Jan 1 03:00:00 1970
+++ wwwoffle/patches/patch-ab Thu Apr 20 15:22:36 2000
@@ -0,0 +1,11 @@
+--- misc.c.orig Thu Apr 20 15:20:56 2000
++++ misc.c Thu Apr 20 15:21:12 2000
+@@ -28,7 +28,7 @@
+ #include "errors.h"
+ #include "proto.h"
+ #include "config.h"
+-#include "md5.h"
++#include <md5.h>
+
+
+ /*++++++++++++++++++++++++++++++++++++++
diff -ruN /tmp/wwwoffle.orig/pkg/PLIST wwwoffle/pkg/PLIST
--- /tmp/wwwoffle.orig/pkg/PLIST Thu Apr 20 15:47:12 2000
+++ wwwoffle/pkg/PLIST Thu Apr 20 15:47:06 2000
@@ -5,6 +5,7 @@
bin/wwwoffle-rm
bin/wwwoffle-tools
bin/wwwoffle-write
+etc/rc.d/wwwoffled.sh
sbin/wwwoffled
share/doc/wwwoffle/CHANGES.CONF
share/doc/wwwoffle/CONVERT
--------------A8EBE6D712EBA90805E664AC--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004201310.GAA51396>