From owner-freebsd-ports-bugs@FreeBSD.ORG  Mon Feb  2 00:11:37 2004
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 319B816A4CE; Mon,  2 Feb 2004 00:11:37 -0800 (PST)
Received: from blues.jpj.net (blues.jpj.net [208.210.80.156])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id AD8FA43D2D; Mon,  2 Feb 2004 00:11:35 -0800 (PST)
	(envelope-from trevor@jpj.net)
Received: from blues.jpj.net (localhost [127.0.0.1])
	by blues.jpj.net (8.12.9p2/8.12.9) with ESMTP id i128Bhrr076939;
	Mon, 2 Feb 2004 03:11:43 -0500 (EST)
	(envelope-from trevor@jpj.net)
Received: from localhost (trevor@localhost)i128Bf75076936;
	Mon, 2 Feb 2004 03:11:43 -0500 (EST)
X-Authentication-Warning: blues.jpj.net: trevor owned process doing -bs
Date: Mon, 2 Feb 2004 03:11:41 -0500 (EST)
From: Trevor Johnson <trevor@jpj.net>
To: Jason Harris <jharris@widomaker.com>
In-Reply-To: <200401262328.i0QNSV8f053327@pm1.ric-07.lft.widomaker.com>
Message-ID: <20040202025212.W17349@blues.jpj.net>
References: <200401262328.i0QNSV8f053327@pm1.ric-07.lft.widomaker.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Scanned-By: MIMEDefang 2.39
cc: freebsd-ports-bugs@freebsd.org
cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/61972: make USE_SIZE the default in bsd.port.mk
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 08:11:37 -0000

> --- bsd.port.mk.orig	Mon Jan 26 18:11:56 2004
> +++ bsd.port.mk	Mon Jan 26 18:20:34 2004
> @@ -4084,6 +4084,7 @@
>
>  # Checksumming utilities
>
> +USE_SIZE?=	yes
>  .if !target(makesum)
>  makesum:
>  	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch NO_CHECKSUM=yes
> @@ -4091,7 +4092,7 @@
>  	@(cd ${DISTDIR}; \
>  	 for file in ${_CKSUMFILES}; do \
>  		${MD5} $$file >> ${MD5_FILE}; \
> -		if [ -n "${USE_SIZE}" ]; then \
> +		if [ ${USE_SIZE} = "yes" ]; then \
>  			${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${MD5_FILE}; \
>  		fi; \
>  	 done)

Here's a slightly different way to do the same thing:

Index: /usr/ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.483
diff -u -r1.483 bsd.port.mk
--- /usr/ports/Mk/bsd.port.mk	24 Jan 2004 01:26:30 -0000	1.483
+++ /usr/ports/Mk/bsd.port.mk	2 Feb 2004 08:07:38 -0000
@@ -725,6 +725,12 @@
 #				  to 0:0.  Set this variable if you want to turn off this
 #				  feature.
 #
+# For makesum:
+#
+# NO_SIZE	- Don't record size data in distinfo, needed when the master site
+# does not report file sizes, or when multiple valid versions of a distfile,
+# having different sizes, exist.
+#
 # For patch:
 #
 # EXTRA_PATCHES - Define this variable if you have patches not in
@@ -4091,7 +4097,7 @@
 	@(cd ${DISTDIR}; \
 	 for file in ${_CKSUMFILES}; do \
 		${MD5} $$file >> ${MD5_FILE}; \
-		if [ -n "${USE_SIZE}" ]; then \
+		if [ -z "${NO_SIZE}" ]; then \
 			${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${MD5_FILE}; \
 		fi; \
 	 done)
-- 
Trevor Johnson