From stolz@i2.informatik.rwth-aachen.de  Mon Dec  1 02:20:59 2003
Return-Path: <stolz@i2.informatik.rwth-aachen.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9212D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  1 Dec 2003 02:20:59 -0800 (PST)
Received: from atlas.informatik.rwth-aachen.de (atlas.Informatik.RWTH-Aachen.DE [137.226.194.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C632643FBF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  1 Dec 2003 02:20:57 -0800 (PST)
	(envelope-from stolz@i2.informatik.rwth-aachen.de)
Received: from menelaos.informatik.rwth-aachen.de (menelaos.Informatik.RWTH-Aachen.DE [137.226.194.73])
	by atlas.informatik.rwth-aachen.de (8.11.3/8.11.3/SuSE Linux 8.11.1-0.5-michaelw-20030918) with ESMTP id hB1AKne28764;
	Mon, 1 Dec 2003 11:20:49 +0100
Received: (from stolz@localhost)
	by menelaos.informatik.rwth-aachen.de (8.12.9p2/8.12.9/Submit) id hB1AKn0l025408;
	Mon, 1 Dec 2003 11:20:49 +0100 (CET)
	(envelope-from stolz)
Message-Id: <200312011020.hB1AKn0l025408@menelaos.informatik.rwth-aachen.de>
Date: Mon, 1 Dec 2003 11:20:49 +0100 (CET)
From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Reply-To: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jharris@widomaker.com
Subject: [patch] math/units: Unbreak on -CURRENT (nmu)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59866
>Category:       ports
>Synopsis:       [patch] math/units: Unbreak on -CURRENT (nmu)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 01 02:30:18 PST 2003
>Closed-Date:    Wed Dec 03 11:49:52 PST 2003
>Last-Modified:  Wed Dec 03 11:49:52 PST 2003
>Originator:     Volker Stolz
>Release:        FreeBSD 4.9-RC i386
>Organization:
Lehrstuhl fr Informatik II
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC #10: Tue Oct 7 12:32:25 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386


>Description:
Fix gcc33-issue; cpp is prying into invalid code inside of #if 0.

cc:maintainer. Please consider changing mastersite to
http://www.cam.cornell.edu/~adrian/units.html where more recent
versions are available!

Tested on: -STABLE, -CURRENT
>How-To-Repeat:
http://bento.freebsd.org/errorlogs/i386-5-latest/units-1.80.log
>Fix:
[Ab]use C++-style comments for offending section.

Add new patch-file: files/patch-units.c
--- patch-units.c begins here ---
--- units.c.orig	Mon Dec  1 11:09:41 2003
+++ units.c	Mon Dec  1 11:10:00 2003
@@ -2358,9 +2358,9 @@
 
 #if 0
 
-    "sed 's/.*/& ft\"
-    "m/' feet|units -q|sed 's/^[[:space:]]*\* //"
-    "/^[[:space:]]*\//d'"
+//    "sed 's/.*/& ft\"
+//    "m/' feet|units -q|sed 's/^[[:space:]]*\* //"
+//    "/^[[:space:]]*\//d'"
 
 #endif
 
--- patch-units.c ends here ---
>Release-Note:
>Audit-Trail:

From: Jason Harris <jharris@widomaker.com>
To: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>,
	FreeBSD-gnats-submit@freebsd.org
Cc: Jason Harris <jharris@widomaker.com>
Subject: Re: ports/59866: [patch] math/units: Unbreak on -CURRENT (nmu)
Date: Mon, 1 Dec 2003 18:28:58 -0500

 --FoibaoN3dya3u5fy
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Mon, Dec 01, 2003 at 11:20:49AM +0100, Volker Stolz wrote:
 =20
 >>Number:         59866
 >>Category:       ports
 >>Synopsis:       [patch] math/units: Unbreak on -CURRENT (nmu)
 
 >>Release:        FreeBSD 4.9-RC i386
 
 >>Environment:
 > System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC =
 #10: Tue Oct 7 12:32:25 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/=
 usr/obj/usr/src/sys/MENELAOS i386
 =20
 =20
 >>Description:
 > Fix gcc33-issue; cpp is prying into invalid code inside of #if 0.
 
 Then it is severely broken.  However, your patch doesn't seem to
 harm anything, so I hereby approve it iff it is necessary.
 =20
 > cc:maintainer. Please consider changing mastersite to
 > http://www.cam.cornell.edu/~adrian/units.html where more recent
 > versions are available!
 
 Alpha versions, which are better suited for a -devel spinoff
 of the current port.
 
 > Tested on: -STABLE, -CURRENT
 
 >>How-To-Repeat:
 > http://bento.freebsd.org/errorlogs/i386-5-latest/units-1.80.log
 
 No, bento has a newer version of readline.  Adrian (author, BCC'd),
 can you look into making the next release of units also work with
 the newest readline library?  Thanks.
 
 --=20
 Jason Harris          | NIC:  JH329, PGP:  This _is_ PGP-signed, isn't it?
 jharris@widomaker.com | web:  http://keyserver.kjsl.com/~jharris/
 
 --FoibaoN3dya3u5fy
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQE/y86xSypIl9OdoOMRAoKdAKC01s0stdrDW31EQQb353XlYzDuHwCcDDZd
 ykPDpBUB5nV2WTcowLLqeGc=
 =nV1D
 -----END PGP SIGNATURE-----
 
 --FoibaoN3dya3u5fy--

From: radian@cox.net (Adrian Mariano)
To: Jason Harris <jharris@widomaker.com>,
	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>,
	FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/59866: [patch] math/units: Unbreak on -CURRENT (nmu)
Date: Mon, 1 Dec 2003 20:03:03 -0500

 > >>Number:         59866
 > >>Category:       ports
 > >>Synopsis:       [patch] math/units: Unbreak on -CURRENT (nmu)
 > 
 > >>Release:        FreeBSD 4.9-RC i386
 > 
 > >>Environment:
 > > System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC =
 > #10: Tue Oct 7 12:32:25 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/=
 > usr/obj/usr/src/sys/MENELAOS i386
 > =20
 > =20
 > >>Description:
 > > Fix gcc33-issue; cpp is prying into invalid code inside of #if 0.
 > 
 > Then it is severely broken.  However, your patch doesn't seem to
 > harm anything, so I hereby approve it iff it is necessary.
 
 I have deleted the offending material from my development version
 because of this issue (and it wasn't a big deal to delete it).  
 
 > No, bento has a newer version of readline.  Adrian (author, BCC'd),
 > can you look into making the next release of units also work with
 > the newest readline library?  Thanks.
 
 I'll look into this.  I'm getting ready to issue a new release as soon
 as I have some time, actually.  (No telling how soon that will
 actually be, though.)
 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Dec 3 11:49:41 PST 2003 
State-Changed-Why:  
Fix committed, thanks! 

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