From cperciva@hexahedron.daemonology.net  Mon Jan 17 04:38:31 2005
Return-Path: <cperciva@hexahedron.daemonology.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 647E316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Jan 2005 04:38:31 +0000 (GMT)
Received: from hexahedron.daemonology.net (S0106006067227a4a.vc.shawcable.net [24.87.233.42])
	by mx1.FreeBSD.org (Postfix) with SMTP id 6EE1743D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Jan 2005 04:38:30 +0000 (GMT)
	(envelope-from cperciva@hexahedron.daemonology.net)
Received: (qmail 92630 invoked by uid 1001); 17 Jan 2005 04:38:29 -0000
Message-Id: <20050117043829.92629.qmail@hexahedron.daemonology.net>
Date: 17 Jan 2005 04:38:29 -0000
From: Colin Percival <cperciva@hexahedron.daemonology.net>
Reply-To: Colin Percival <cperciva@hexahedron.daemonology.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: editors/openoffice-1.1 calls uname needlessly
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76330
>Category:       ports
>Synopsis:       editors/openoffice-1.1 calls uname needlessly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    openoffice
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 17 04:40:37 GMT 2005
>Closed-Date:    Sun Jun 19 02:32:03 GMT 2005
>Last-Modified:  Sun Jun 19 02:32:03 GMT 2005
>Originator:     Colin Percival
>Release:        FreeBSD 5.3-SECURITY i386
>Organization:
>Environment:
System: FreeBSD hexahedron.daemonology.net 5.3-SECURITY FreeBSD 5.3-SECURITY #0: Fri Jan 7 04:09:28 UTC 2005 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386

>Description:

editors/openoffice-1.1/Makefile generates SIMPLEOSVER by parsing the 
output of `uname -r`.  This is pointless, since the same data can be
obtained from the (already generated) OSREL variable.

>How-To-Repeat:
>Fix:

--- oo.diff begins here ---
Index: ports/editors/openoffice-1.1/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/openoffice-1.1/Makefile,v
retrieving revision 1.173
diff -u -p -r1.173 Makefile
--- ports/editors/openoffice-1.1/Makefile	16 Jan 2005 08:47:09 -0000	1.173
+++ ports/editors/openoffice-1.1/Makefile	17 Jan 2005 04:32:36 -0000
@@ -82,7 +82,7 @@ RELEASE_NR=		${PORTVERSION}
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
 EXECBASE=		openoffice.org-${RELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
-SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=       OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 
 # FIXME (Somehow INDEX build fails)
--- oo.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->openoffice 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Jan 17 06:22:47 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76330 
State-Changed-From-To: open->closed 
State-Changed-By: maho 
State-Changed-When: Sun Jun 19 02:31:51 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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