From nobody@FreeBSD.org  Fri Jan  8 00:17:40 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6809B106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Jan 2010 00:17:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 56E778FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Jan 2010 00:17:40 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o080HeAt028320
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 8 Jan 2010 00:17:40 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o080Heig028319;
	Fri, 8 Jan 2010 00:17:40 GMT
	(envelope-from nobody)
Message-Id: <201001080017.o080Heig028319@www.freebsd.org>
Date: Fri, 8 Jan 2010 00:17:40 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] editors/openoffice.org-3-RC use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142451
>Category:       ports
>Synopsis:       [patch] editors/openoffice.org-3-RC use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    openoffice
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 08 00:20:05 UTC 2010
>Closed-Date:    Tue Feb 16 23:23:59 UTC 2010
>Last-Modified:  Tue Feb 16 23:30:07 UTC 2010
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice.org-3-RC/Makefile,v
retrieving revision 1.410
diff -u -r1.410 Makefile
--- Makefile	23 Dec 2009 03:02:39 -0000	1.410
+++ Makefile	8 Jan 2010 00:11:53 -0000
@@ -122,7 +122,8 @@
 GNU_CONFIGURE=	yes
 WRKSRC?=		${WRKDIR}/${OOOTAG}
 TCSH?=		/bin/tcsh
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
 
 .if defined(DISABLE_MAKE_JOBS)
 MAKE_JOBS_NUMBER=	1
@@ -291,12 +292,6 @@
 	@${ECHO_CMD} "@unexec ${RM} %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
-			-e 's#%%OOODIR%%#${OOODIR}#g' \
-			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->openoffice 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jan 8 00:20:20 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142451 
State-Changed-From-To: open->closed 
State-Changed-By: maho 
State-Changed-When: Tue Feb 16 23:23:46 UTC 2010 
State-Changed-Why:  
committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142451: commit references a PR
Date: Tue, 16 Feb 2010 23:23:02 +0000 (UTC)

 maho        2010-02-16 23:21:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     editors/openoffice.org-2 Makefile 
     editors/openoffice.org-3 Makefile 
     editors/openoffice.org-3-RC Makefile 
     editors/openoffice.org-3-devel Makefile 
   Log:
   Use $SUB_FILES & $SUB_LIST to dynamically adjust pkg-message.
   
   PR:             142449, 142450, 142451 and 142452
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.323     +2 -8      ports/editors/openoffice.org-2/Makefile
   1.418     +2 -7      ports/editors/openoffice.org-3-RC/Makefile
   1.465     +2 -7      ports/editors/openoffice.org-3-devel/Makefile
   1.328     +2 -7      ports/editors/openoffice.org-3/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
