Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Mar 2013 03:28:09 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/177263: www/wwwoffle: Update MASTER_SITES and WWW: line
Message-ID:  <20130323032809.45961c71e3387e16f2293d79@yahoo.com>
Resent-Message-ID: <201303221840.r2MIe6VP020264@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         177263
>Category:       ports
>Synopsis:       www/wwwoffle: Update MASTER_SITES and WWW: line
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 22 18:40:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES and WWW: line
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Support SUB_FILES/SUB_LIST

New file:
files/pkg-message.in

Remove file:
pkg-message

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/www/wwwoffle/Makefile www/wwwoffle/Makefile
--- /usr/ports/www/wwwoffle/Makefile	2013-02-06 04:55:39.000000000 +0900
+++ www/wwwoffle/Makefile	2013-03-02 06:22:33.000000000 +0900
@@ -1,24 +1,24 @@
-# New ports collection makefile for:	wwwoffle
-# Date created:		1 Jun 1998
-# Whom:			Peter Mutsaers
-#
+# Creaed by: Peter Mutsaers
 # $FreeBSD: head/www/wwwoffle/Makefile 311722 2013-02-05 16:17:06Z novel $
-#
 
 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@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 @@
 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@g' \
-	  ${PKGDIR}/pkg-message > ${PKGMESSAGE}
-
-.endif
-
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL}
 	@${CAT} ${PKGMESSAGE}
diff -urN /usr/ports/www/wwwoffle/files/pkg-message.in www/wwwoffle/files/pkg-message.in
--- /usr/ports/www/wwwoffle/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
+++ www/wwwoffle/files/pkg-message.in	2013-03-22 20:27:12.000000000 +0900
@@ -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
diff -urN /usr/ports/www/wwwoffle/pkg-descr www/wwwoffle/pkg-descr
--- /usr/ports/www/wwwoffle/pkg-descr	2012-11-08 10:31:56.000000000 +0900
+++ www/wwwoffle/pkg-descr	2013-03-02 06:14:22.000000000 +0900
@@ -9,4 +9,4 @@
  * 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/
diff -urN /usr/ports/www/wwwoffle/pkg-message www/wwwoffle/pkg-message
--- /usr/ports/www/wwwoffle/pkg-message	2012-11-08 10:31:57.000000000 +0900
+++ www/wwwoffle/pkg-message	1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
-NOTES:
-
-Please copy /var/spool/wwwoffle/wwwoffle.conf.install to
-/var/spool/wwwoffle/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
-/var/spool/wwwoffle/upgrade-config.pl.  You should run this on your
-configuration file, e.g.:
-
-     $ perl /var/spool/wwwoffle/upgrade-config.pl \
-            /usr/local/etc/wwwoffle.conf
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130323032809.45961c71e3387e16f2293d79>