diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index dbdc56c2100e..95b32169db4b 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wwwoffle -PORTVERSION= 2.9i -PORTREVISION= 4 +PORTVERSION= 2.9j CATEGORIES= www ipv6 MASTER_SITES= http://www.gedanken.org.uk/software/wwwoffle/download/ @@ -10,10 +9,21 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Caching proxy server for HTTP and FTP designed for dial-up hosts LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/doc/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls USES= perl5 gmake tar:tgz +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc --with-ipv6 \ + --with-gnutls=${LOCALBASE} \ + --with-spooldir=${WWWOFFLE_SPOOL} \ + --docdir=${DOCSDIR} +LIBS+= -lmd + +PLIST_SUB+= WWWOFFLE_SPOOL=${WWWOFFLE_SPOOL} +SUB_FILES= pkg-message +SUB_LIST= WWWOFFLE_SPOOL="${WWWOFFLE_SPOOL}" USE_RC_SUBR= ${PORTNAME}d @@ -21,24 +31,8 @@ USE_RC_SUBR= ${PORTNAME}d # use $WWWOFFLE_SPOOL as the overriding setting. WWWOFFLE_SPOOL?= /var/spool/wwwoffle -PLIST_SUB+= WWWOFFLE_SPOOL=${WWWOFFLE_SPOOL} - -HAS_CONFIGURE= yes -LIBS+= -lmd -CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc --with-ipv6 \ - --with-gnutls=${LOCALBASE} \ - --with-spooldir=${WWWOFFLE_SPOOL} \ - --docdir=${DOCSDIR} \ - --mandir=${MANPREFIX}/man - -SUB_FILES= pkg-message -SUB_LIST= WWWOFFLE_SPOOL="${WWWOFFLE_SPOOL}" - post-install: ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${STAGEDIR}${WWWOFFLE_SPOOL} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}* ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}d -post-stage: - @${RM} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf - .include diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo index 19cf93345dec..32e1aa8061f9 100644 --- a/www/wwwoffle/distinfo +++ b/www/wwwoffle/distinfo @@ -1,2 +1,3 @@ -SHA256 (wwwoffle-2.9i.tgz) = e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae -SIZE (wwwoffle-2.9i.tgz) = 1113771 +TIMESTAMP = 1474306334 +SHA256 (wwwoffle-2.9j.tgz) = b16dd2549dd47834805343025638c06a0d67f8ea7022101c0ce2b6847ba011c6 +SIZE (wwwoffle-2.9j.tgz) = 1110599 diff --git a/www/wwwoffle/files/patch-conf__Makefile.in b/www/wwwoffle/files/patch-conf__Makefile.in index 11ae732a3e50..917fca5a5f4b 100644 --- a/www/wwwoffle/files/patch-conf__Makefile.in +++ b/www/wwwoffle/files/patch-conf__Makefile.in @@ -1,11 +1,12 @@ ---- conf/Makefile.in- Fri Mar 29 16:40:55 2002 -+++ conf/Makefile.in Fri Mar 29 16:39:51 2002 -@@ -49,7 +49,7 @@ +--- conf/Makefile.in.orig 2010-12-28 10:04:45 UTC ++++ conf/Makefile.in +@@ -64,8 +64,7 @@ install : compile echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\ echo "WWWOFFLE: Run 'conf/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) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install - [ -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf +- [ -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf ++ $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.sample ######## CONF FILE ######## + diff --git a/www/wwwoffle/files/patch-conf__wwwoffle.conf b/www/wwwoffle/files/patch-conf_wwwoffle.conf.template similarity index 61% rename from www/wwwoffle/files/patch-conf__wwwoffle.conf rename to www/wwwoffle/files/patch-conf_wwwoffle.conf.template index fdadb74aef47..58edf2a4f668 100644 --- a/www/wwwoffle/files/patch-conf__wwwoffle.conf +++ b/www/wwwoffle/files/patch-conf_wwwoffle.conf.template @@ -1,5 +1,5 @@ ---- conf/wwwoffle.conf.template.orig Sat Feb 4 06:41:35 2006 -+++ conf/wwwoffle.conf.template Mon Apr 3 10:23:41 2006 +--- conf/wwwoffle.conf.template.orig 2016-04-23 12:44:35 UTC ++++ conf/wwwoffle.conf.template @@ -12,7 +12,8 @@ StartUp { diff --git a/www/wwwoffle/files/patch-doc__Makefile.in b/www/wwwoffle/files/patch-doc__Makefile.in index c3eb4a085e75..60bce729f592 100644 --- a/www/wwwoffle/files/patch-doc__Makefile.in +++ b/www/wwwoffle/files/patch-doc__Makefile.in @@ -1,8 +1,8 @@ ---- doc/Makefile.in.orig 2006-02-07 04:06:14.000000000 +0900 -+++ doc/Makefile.in 2009-07-08 16:30:38.000000000 +0900 -@@ -22,7 +22,7 @@ - +--- doc/Makefile.in.orig 2010-12-28 10:04:45 UTC ++++ doc/Makefile.in +@@ -23,7 +23,7 @@ SHELL=/bin/sh prefix=@prefix@ + datarootdir = @datarootdir@ mandir=$(DESTDIR)@mandir@ -docdir=$(DESTDIR)${prefix}/doc/wwwoffle +docdir=$(DESTDIR)@docdir@ diff --git a/www/wwwoffle/files/patch-src__Makefile.in b/www/wwwoffle/files/patch-src__Makefile.in index 91331e2dea6f..8b11f77d8876 100644 --- a/www/wwwoffle/files/patch-src__Makefile.in +++ b/www/wwwoffle/files/patch-src__Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in~ Wed Feb 1 04:02:32 2006 -+++ src/Makefile.in Mon Apr 3 10:21:07 2006 -@@ -140,7 +140,7 @@ +--- src/Makefile.in.orig 2010-12-28 10:04:45 UTC ++++ src/Makefile.in +@@ -140,7 +140,7 @@ WWWOFFLE_OBJ=wwwoffle.o \ document.o html.o css.o xml.o vrml.o javaclass.o \ configrdwr.o configmisc.o configdata.o configfunc.o \ io.o iopriv.o iozlib.o iognutls.o iochunk.o \ @@ -9,7 +9,7 @@ wwwoffle : $(WWWOFFLE_OBJ) $(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) -@@ -156,7 +156,7 @@ +@@ -156,7 +156,7 @@ WWWOFFLED_OBJ=wwwoffled.o wwwoffles.o \ parse.o purge.o refresh.o spool.o \ configrdwr.o configmisc.o configdata.o configfunc.o configedit.o \ io.o iopriv.o iozlib.o iognutls.o iochunk.o \ @@ -18,7 +18,7 @@ wwwoffled : $(WWWOFFLED_OBJ) $(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) -@@ -170,7 +170,7 @@ +@@ -170,7 +170,7 @@ WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \ parse.o \ configrdwr.o configmisc.o configdata.o configfunc.o \ io.o iopriv.o iozlib.o iognutls.o iochunk.o \ @@ -27,7 +27,7 @@ wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ) $(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) -@@ -249,7 +249,6 @@ +@@ -249,7 +249,6 @@ certificates.o : certificates.c sockets.o : sockets.c autoconfig.h errors.h sockets.h \ sockets4.c sockets6.c diff --git a/www/wwwoffle/files/patch-src__miscencdec.c b/www/wwwoffle/files/patch-src__miscencdec.c index 2dc4855c2a4e..233de01bbe10 100644 --- a/www/wwwoffle/files/patch-src__miscencdec.c +++ b/www/wwwoffle/files/patch-src__miscencdec.c @@ -1,6 +1,6 @@ ---- src/miscencdec.c.orig Sun Nov 18 11:39:53 2001 -+++ src/miscencdec.c Tue Feb 26 21:03:13 2002 -@@ -35,7 +35,7 @@ +--- src/miscencdec.c.orig 2016-02-26 15:58:08 UTC ++++ src/miscencdec.c +@@ -31,7 +31,7 @@ #endif #include "misc.h" diff --git a/www/wwwoffle/files/pkg-message.in b/www/wwwoffle/files/pkg-message.in index 195bd62bfc08..c2e7d6c6614b 100644 --- a/www/wwwoffle/files/pkg-message.in +++ b/www/wwwoffle/files/pkg-message.in @@ -1,7 +1,3 @@ -NOTES: - -Please copy %%WWWOFFLE_SPOOL%%/wwwoffle.conf.install to -%%WWWOFFLE_SPOOL%%/wwwoffle.conf, and edit the copy as needed. If you are upgrading from an old version of wwwoffle, you may need to convert the cache directory structure to work with the new version. You diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist index 260e8e4098ca..d95727be56c3 100644 --- a/www/wwwoffle/pkg-plist +++ b/www/wwwoffle/pkg-plist @@ -9,55 +9,51 @@ bin/wwwoffle-read bin/wwwoffle-rm bin/wwwoffle-tools bin/wwwoffle-write -@unexec if cmp -s %D/etc/wwwoffle.conf.install %D/etc/wwwoffle.conf; then rm -f %D/etc/wwwoffle.conf; fi -etc/wwwoffle.conf.install +@sample etc/wwwoffle.conf.sample man/man1/wwwoffle.1.gz man/man5/wwwoffle.conf.5.gz man/man8/wwwoffled.8.gz sbin/wwwoffled -share/doc/wwwoffle/CHANGES.CONF -share/doc/wwwoffle/COPYING -share/doc/wwwoffle/FAQ -share/doc/wwwoffle/INSTALL -share/doc/wwwoffle/NEWS -share/doc/wwwoffle/README -share/doc/wwwoffle/README.1st -share/doc/wwwoffle/README.CONF -share/doc/wwwoffle/README.PWD -share/doc/wwwoffle/README.URL -share/doc/wwwoffle/README.compress -share/doc/wwwoffle/README.htdig -share/doc/wwwoffle/README.https -share/doc/wwwoffle/README.hyperestraier -share/doc/wwwoffle/README.lang -share/doc/wwwoffle/README.mnogosearch -share/doc/wwwoffle/README.namazu -share/doc/wwwoffle/README.win32 -share/doc/wwwoffle/de/CHANGES.CONF -share/doc/wwwoffle/de/INSTALL -share/doc/wwwoffle/de/LSM -share/doc/wwwoffle/de/NEWS -share/doc/wwwoffle/de/README.1st -share/doc/wwwoffle/de/README.CONF -share/doc/wwwoffle/de/README.CONF.html -share/doc/wwwoffle/de/README.html -share/doc/wwwoffle/es/INSTALL -share/doc/wwwoffle/es/LSM -share/doc/wwwoffle/es/README -share/doc/wwwoffle/es/README.1st -share/doc/wwwoffle/es/README.CONF -share/doc/wwwoffle/es/README.PWD -share/doc/wwwoffle/es/README.URL -share/doc/wwwoffle/es/README.htdig -share/doc/wwwoffle/es/README.udmsearch -share/doc/wwwoffle/es/README.win32 -share/doc/wwwoffle/es/wwwoffle.conf -share/doc/wwwoffle/fr/README.CONF -share/doc/wwwoffle/fr/wwwoffle.conf.man -share/doc/wwwoffle/pl/INSTALL -share/doc/wwwoffle/pl/LSM -share/doc/wwwoffle/pl/README.1st -share/doc/wwwoffle/pl/README.lang +%%DOCSDIR%%/CHANGES.CONF +%%DOCSDIR%%/COPYING +%%DOCSDIR%%/FAQ +%%DOCSDIR%%/INSTALL +%%DOCSDIR%%/NEWS +%%DOCSDIR%%/README +%%DOCSDIR%%/README.1st +%%DOCSDIR%%/README.CONF +%%DOCSDIR%%/README.PWD +%%DOCSDIR%%/README.URL +%%DOCSDIR%%/README.compress +%%DOCSDIR%%/README.htdig +%%DOCSDIR%%/README.https +%%DOCSDIR%%/README.hyperestraier +%%DOCSDIR%%/README.lang +%%DOCSDIR%%/README.mnogosearch +%%DOCSDIR%%/README.namazu +%%DOCSDIR%%/README.win32 +%%DOCSDIR%%/de/CHANGES.CONF +%%DOCSDIR%%/de/INSTALL +%%DOCSDIR%%/de/NEWS +%%DOCSDIR%%/de/README.1st +%%DOCSDIR%%/de/README.CONF +%%DOCSDIR%%/de/README.CONF.html +%%DOCSDIR%%/de/README.html +%%DOCSDIR%%/es/INSTALL +%%DOCSDIR%%/es/README +%%DOCSDIR%%/es/README.1st +%%DOCSDIR%%/es/README.CONF +%%DOCSDIR%%/es/README.PWD +%%DOCSDIR%%/es/README.URL +%%DOCSDIR%%/es/README.htdig +%%DOCSDIR%%/es/README.udmsearch +%%DOCSDIR%%/es/README.win32 +%%DOCSDIR%%/es/wwwoffle.conf +%%DOCSDIR%%/fr/README.CONF +%%DOCSDIR%%/fr/wwwoffle.conf.man +%%DOCSDIR%%/pl/INSTALL +%%DOCSDIR%%/pl/README.1st +%%DOCSDIR%%/pl/README.lang %%WWWOFFLE_SPOOL%%/html/README %%WWWOFFLE_SPOOL%%/html/de/README.CONF.html %%WWWOFFLE_SPOOL%%/html/de/Welcome.html @@ -789,12 +785,6 @@ share/doc/wwwoffle/pl/README.lang %%WWWOFFLE_SPOOL%%/html/ru/messages/ServerError.html %%WWWOFFLE_SPOOL%%/html/ru/messages/UserNeedsPass.html %%WWWOFFLE_SPOOL%%/html/ru/messages/WillGet.html -%%WWWOFFLE_SPOOL%%/outgoing/O98hgItueyIbW8udnZuMjpg -%%WWWOFFLE_SPOOL%%/outgoing/Oh-W1UuCia4-wLoZYEnRrXw -%%WWWOFFLE_SPOOL%%/outgoing/Ox3oAN7UMcBN5bQi-qYGkoA -%%WWWOFFLE_SPOOL%%/outgoing/U98hgItueyIbW8udnZuMjpg -%%WWWOFFLE_SPOOL%%/outgoing/Uh-W1UuCia4-wLoZYEnRrXw -%%WWWOFFLE_SPOOL%%/outgoing/Ux3oAN7UMcBN5bQi-qYGkoA %%WWWOFFLE_SPOOL%%/search/htdig/conf/htdig-full.conf %%WWWOFFLE_SPOOL%%/search/htdig/conf/htdig-incr.conf %%WWWOFFLE_SPOOL%%/search/htdig/conf/htdig-lasttime.conf