svn commit: r315139 - in head/www/wwwoffle: . files

[Martin Wilke]

Author: miwi
Date: Sun Mar 24 16:12:25 2013
New Revision: 315139
URL: http://svnweb.freebsd.org/changeset/ports/315139

Log:
  - Update MASTER_SITES and WWW: line
  - Add LICENSE
  - Add MAKE_JOBS_SAFE
  - Support SUB_FILES/SUB_LIST
  
  PR:		177263
  Submitted by:	Ports Fury

Added:
  head/www/wwwoffle/files/pkg-message.in   (contents, props changed)
Deleted:
  head/www/wwwoffle/pkg-message
Modified:
  head/www/wwwoffle/Makefile   (contents, props changed)
  head/www/wwwoffle/pkg-descr   (contents, props changed)

Modified: head/www/wwwoffle/Makefile
==============================================================================
--- head/www/wwwoffle/Makefile	Sun Mar 24 16:07:38 2013	(r315138)
+++ head/www/wwwoffle/Makefile	Sun Mar 24 16:12:25 2013	(r315139)
@@ -1,24 +1,24 @@
-# New ports collection makefile for:	wwwoffle
-# Date created:		1 Jun 1998
-# Whom:			Peter Mutsaers
-#
+# Creaed by: Peter Mutsaers
 # $FreeBSD$
-#
 
 PORTNAME=	wwwoffle
 PORTVERSION=	2.9i
 PORTREVISION=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://www.gedanken.demon.co.uk/download-wwwoffle/
+MASTER_SITES=	http://www.gedanken.org.uk/software/wwwoffle/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A caching proxy server for HTTP and FTP designed for dial-up hosts
+COMMENT=	Caching proxy server for HTTP and FTP designed for dial-up hosts
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
 USE_RC_SUBR=	${PORTNAME}d
 
 # $SPOOL seems like a common name which could be used for other things, so
@@ -30,26 +30,18 @@ PLIST_SUB+=	WWWOFFLE_SPOOL=${WWWOFFLE_SP
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS=-lmd
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc --with-ipv6 \
-		--with-gnutls=${PREFIX} \
+		--with-gnutls=${LOCALBASE} \
 		--with-spooldir=${WWWOFFLE_SPOOL} \
 		--docdir=${DOCSDIR} \
 		--mandir=${MANPREFIX}/man
 
+SUB_FILES=	pkg-message
+SUB_LIST=	WWWOFFLE_SPOOL="${WWWOFFLE_SPOOL}"
+
 MAN1=		wwwoffle.1
 MAN5=		wwwoffle.conf.5
 MAN8=		wwwoffled.8
 
-.if ${WWWOFFLE_SPOOL} != "/var/spool/wwwoffle"
-# If using a non-standard spool, change all the documentation (and anything
-# else) to reflect that.
-PKGMESSAGE=${WRKDIR}/MESSAGE
-
-post-configure:
-	@${SED} 's@/var/spool/wwwoffle@${WWWOFFLE_SPOOL}/wwwoffle at g' \
-	  ${PKGDIR}/pkg-message > ${PKGMESSAGE}
-
-.endif
-
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL}
 	@${CAT} ${PKGMESSAGE}

Added: head/www/wwwoffle/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/wwwoffle/files/pkg-message.in	Sun Mar 24 16:12:25 2013	(r315139)
@@ -0,0 +1,15 @@
+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
+can find programs in the WWWOFFLE distribution tarball to do this, along
+with instructions about what is needed.  A more common requirement is to
+run the `upgrade-config.pl' script, so you will find a copy of this in
+%%WWWOFFLE_SPOOL%%/upgrade-config.pl.  You should run this on your
+configuration file, e.g.:
+
+     $ perl %%WWWOFFLE_SPOOL%%/upgrade-config.pl \
+            %%PREFIX%%/etc/wwwoffle.conf

Modified: head/www/wwwoffle/pkg-descr
==============================================================================
--- head/www/wwwoffle/pkg-descr	Sun Mar 24 16:07:38 2013	(r315138)
+++ head/www/wwwoffle/pkg-descr	Sun Mar 24 16:12:25 2013	(r315139)
@@ -9,4 +9,4 @@ browse web pages and read them without h
  * Control which pages can be requested when offline. 
  * Provides non-cached access to intranet servers. 
 
-WWW: http://www.gedanken.demon.co.uk/wwwoffle/
+WWW: http://www.gedanken.org.uk/software/wwwoffle/