summaryrefslogtreecommitdiff
path: root/www/wwwoffle
diff options
context:
space:
mode:
authorMunechika SUMIKAWA <sumikawa@FreeBSD.org>2001-10-28 20:16:49 +0000
committerMunechika SUMIKAWA <sumikawa@FreeBSD.org>2001-10-28 20:16:49 +0000
commit262f6ea9f902074e7f457b7a99192a0b9af7a44c (patch)
tree3e797c5fbc7b0cc3f583c17bbc552e961375dc3d /www/wwwoffle
parentRemove an extra `y'. (diff)
- Upgrade to 2.6d. KAME IPv6 patch was migrated.
- Configuration file was moved into /usr/local/etc/wwwoffle.conf. I believe this is suitable for FreeBSD style.
Notes
Notes: svn path=/head/; revision=49298
Diffstat (limited to 'www/wwwoffle')
-rw-r--r--www/wwwoffle/Makefile13
-rw-r--r--www/wwwoffle/distinfo2
-rw-r--r--www/wwwoffle/files/patch-aa53
-rw-r--r--www/wwwoffle/pkg-message2
-rw-r--r--www/wwwoffle/pkg-plist2
5 files changed, 41 insertions, 31 deletions
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index b3fdcb0dfddb..490056f645a5 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -6,22 +6,13 @@
#
PORTNAME= wwwoffle
-PORTVERSION= 2.6b
+PORTVERSION= 2.6d
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/httpd/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/www/servers
EXTRACT_SUFX= .tgz
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400014
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ \
- ftp://ftp.pasta.cs.uit.no/pub/IPv6/misc/
-PATCHFILES= wwwoffle-26b-v6-20010411.diff.gz
-PATCH_DIST_STRIP= -p1
-.endif
-
MAINTAINER= sumikawa@FreeBSD.org
USE_PERL5= yes
@@ -65,4 +56,4 @@ post-install:
@${CHMOD} +x ${PREFIX}/etc/rc.d/wwwoffled.sh
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index e68d720fb2bf..20eefee1cabe 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,2 +1,2 @@
-MD5 (wwwoffle-2.6b.tgz) = 9697c8ef1781f1d33026327a81d74286
+MD5 (wwwoffle-2.6d.tgz) = 2a6de704d05fdc3c19f5dfbcec68d8bd
MD5 (wwwoffle-26b-v6-20010411.diff.gz) = d62aeca57fd72f5d153efa9ec4347e8e
diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index 5670b799e8de..46d1d29c2383 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Mar 24 23:02:31 2001
-+++ Makefile Mon Apr 9 11:01:34 2001
+--- Makefile.orig Wed May 30 03:29:03 2001
++++ Makefile Thu Oct 25 14:42:19 2001
@@ -18,11 +18,11 @@
LOCALHOST=localhost:8080
@@ -9,14 +9,14 @@
-CONFDIR=/var/spool/wwwoffle
+INSTDIR=$(PREFIX)
+SPOOLDIR=$(SPOOL)/wwwoffle
-+CONFDIR=$(SPOOL)/wwwoffle
++CONFDIR=$(PREFIX)/etc
MANDIR=$(INSTDIR)/man
-DOCDIR=$(INSTDIR)/doc/wwwoffle
+DOCDIR=$(INSTDIR)/share/doc/wwwoffle
# For Cygwin (win32).
#INSTDIR=/wwwoffle
-@@ -50,14 +50,13 @@
+@@ -53,14 +53,13 @@
########
@@ -34,16 +34,26 @@
# For HP/UX this is a good idea.
#LDFLAGS=
-@@ -83,7 +82,7 @@
+@@ -86,15 +85,15 @@
#USE_ZLIB=0
+ # The option to use IPv6 sockets if required.
+-#USE_IPV6=1
++USE_IPV6=1
+
+ # The option to use IPv6 sockets if required.
+-USE_IPV6=0
++#USE_IPV6=0
+
+ ########
+
INCLUDE=
-LIBRARY=-lz
+LIBRARY+=-lz -lmd
# To compile without zlib
#LIBRARY=
-@@ -150,7 +149,7 @@
+@@ -164,7 +163,7 @@
http.o ftp.o finger.o ssl.o \
refresh.o messages.o parse.o spool.o \
$(DOC_PARSERS)\
@@ -52,7 +62,7 @@
wwwoffle : $(WWWOFFLE_OBJ)
$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
-@@ -162,7 +161,7 @@
+@@ -176,7 +175,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 \
@@ -61,7 +71,7 @@
wwwoffled : $(WWWOFFLED_OBJ)
$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
-@@ -173,7 +172,7 @@
+@@ -187,7 +186,7 @@
http.o ftp.o finger.o ssl.o \
spool.o \
messages.o parse.o \
@@ -70,16 +80,25 @@
wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
-@@ -181,7 +180,7 @@
- ####
-
+@@ -197,7 +196,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
+ http.o ftp.o finger.o ssl.o \
+ messages.o parse.o \
+- configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
++ configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o
convert-cache : $(CONVERT_OBJ)
$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
-@@ -293,15 +292,15 @@
+@@ -207,7 +206,7 @@
+ UNCOMPRESS_OBJ=uncompress-cache.o \
+ http.o ftp.o finger.o ssl.o \
+ messages.o parse.o \
+- configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
++ configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o
+
+ uncompress-cache : $(UNCOMPRESS_OBJ)
+ $(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY)
+@@ -308,15 +307,15 @@
install_binary : programs
[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
@@ -98,7 +117,7 @@
install_binary-win32 : programs
[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
-@@ -323,17 +322,17 @@
+@@ -338,17 +337,17 @@
install_man :
[ -x $(MANDIR) ] || $(INSTALL) -d -m 755 $(MANDIR)
[ -x $(MANDIR)/man1 ] || $(INSTALL) -d -m 755 $(MANDIR)/man1
@@ -120,7 +139,7 @@
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 @@
+@@ -387,8 +386,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.
@@ -131,7 +150,7 @@
install_config :
sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
-@@ -383,7 +382,7 @@
+@@ -398,7 +397,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: " )
diff --git a/www/wwwoffle/pkg-message b/www/wwwoffle/pkg-message
index 0d03be342813..7c5cbdaf1b13 100644
--- a/www/wwwoffle/pkg-message
+++ b/www/wwwoffle/pkg-message
@@ -12,4 +12,4 @@ the `upgrade-config.pl' script, so you will find a copy of this in
configuration file, e.g.:
$ perl /var/spool/wwwoffle/upgrade-config.pl \
- /var/spool/wwwoffle/wwwoffle.conf
+ /usr/local/etc/wwwoffle.conf
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index 75f75d7cd229..b2aa069705fe 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -6,6 +6,7 @@ bin/wwwoffle-rm
bin/wwwoffle-tools
bin/wwwoffle-write
etc/rc.d/wwwoffled.sh
+etc/wwwoffle.conf.default
sbin/wwwoffled
share/doc/wwwoffle/CHANGES.CONF
share/doc/wwwoffle/CONVERT
@@ -157,7 +158,6 @@ wwwoffle/outgoing/U98hgItueyIbW8udnZuMjpg
wwwoffle/outgoing/Uh-W1UuCia4-wLoZYEnRrXw
wwwoffle/outgoing/Ux3oAN7UMcBN5bQi-qYGkoA
wwwoffle/upgrade-config.pl
-wwwoffle/wwwoffle.conf.default
@dirrm wwwoffle/html/local/dontget
@dirrm wwwoffle/html/local
@dirrm wwwoffle/html/messages