From jason@pm1.ric-07.lft.widomaker.com  Mon Jan 26 15:28:40 2004
Return-Path: <jason@pm1.ric-07.lft.widomaker.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 074FC16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Jan 2004 15:28:40 -0800 (PST)
Received: from pm1.ric-07.lft.widomaker.com (pm1.ric-07.lft.widomaker.com [209.96.189.23])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7EF4243D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 26 Jan 2004 15:28:37 -0800 (PST)
	(envelope-from jason@pm1.ric-07.lft.widomaker.com)
Received: (from jason@localhost)
	by pm1.ric-07.lft.widomaker.com (8.12.10/8.12.10) id i0QNSV8f053327;
	Mon, 26 Jan 2004 18:28:32 -0500 (EST)
Message-Id: <200401262328.i0QNSV8f053327@pm1.ric-07.lft.widomaker.com>
Date: Mon, 26 Jan 2004 18:28:32 -0500 (EST)
From: Jason Harris <jharris@widomaker.com>
Reply-To: Jason Harris <jharris@widomaker.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jason Harris <jharris@widomaker.com>
Subject: make USE_SIZE the default in bsd.port.mk
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61972
>Category:       ports
>Synopsis:       make USE_SIZE the default in bsd.port.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 26 15:30:21 PST 2004
>Closed-Date:    Tue Feb 03 21:37:42 PST 2004
>Last-Modified:  Tue Feb 03 21:37:42 PST 2004
>Originator:     Jason Harris
>Release:        FreeBSD 4.3-RELEASE i386
>Organization:
none here
>Environment:
System: FreeBSD 4.3-RELEASE i386

>Description:

	Very few people are submitting new ports and updates with file
	sizes specified, so make USE_SIZE the default, but allow it
	to be overridden.
>How-To-Repeat:

	apply patch below
>Fix:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message

--- 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)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAFaG8SypIl9OdoOMRAuJMAJ4m9RsZmPOAsLT6s3Zm3y06ICNCUwCgtcnD
DSVcuXU+QS+AefXCFEykgp4=
=OF/4
-----END PGP SIGNATURE-----
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: clement 
Responsible-Changed-When: Mon Jan 26 16:50:17 PST 2004 
Responsible-Changed-Why:  
Over to portmgr. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61972 

From: Trevor Johnson <trevor@jpj.net>
To: Jason Harris <jharris@widomaker.com>
Cc: freebsd-ports-bugs@freebsd.org, FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/61972: make USE_SIZE the default in bsd.port.mk
Date: Mon, 2 Feb 2004 03:11:41 -0500 (EST)

 > --- 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
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Feb 3 21:37:27 PST 2004 
State-Changed-Why:  
We went with Trevor's patch.  Thanks for the suggestion. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61972 
>Unformatted:
