From sevan@newbie.thingamajig-systems.co.uk  Thu Jan 14 04:15:03 2010
Return-Path: <sevan@newbie.thingamajig-systems.co.uk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7DA8106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Jan 2010 04:15:03 +0000 (UTC)
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: from newbie.thingamajig-systems.co.uk (newbie.thingamajig-systems.co.uk [93.97.185.103])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D4188FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Jan 2010 04:15:02 +0000 (UTC)
Received: from newbie.thingamajig-systems.co.uk (localhost [127.0.0.1])
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3) with ESMTP id o0E4B6ZO036760;
	Thu, 14 Jan 2010 04:11:06 GMT
	(envelope-from sevan@newbie.thingamajig-systems.co.uk)
Received: (from root@localhost)
	by newbie.thingamajig-systems.co.uk (8.14.3/8.14.3/Submit) id o0E4B6RW036759;
	Thu, 14 Jan 2010 04:11:06 GMT
	(envelope-from sevan)
Message-Id: <201001140411.o0E4B6RW036759@newbie.thingamajig-systems.co.uk>
Date: Thu, 14 Jan 2010 04:11:06 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nivit@freebsd.org
Subject: [PATCH] math/mprime: Use SUB_FILES to update files
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142812
>Category:       ports
>Synopsis:       [PATCH] math/mprime: Use SUB_FILES to update files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 14 04:20:02 UTC 2010
>Closed-Date:    Wed Sep 08 22:05:45 UTC 2010
>Last-Modified:  Wed Sep  8 22:10:01 UTC 2010
>Originator:     Sevan Janiyan
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD newbie.thingamajig-systems.co.uk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Tue Jan  5 21:11:58 UTC
>Description:
No need to invoke sed manually.

Added file(s):
- files/pkg-message.in
- files/wrapper.sh.in

Removed file(s):
- pkg-message
- files/wrapper.sh

Port maintainer (nivit@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mprime-0.0.24.14.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/math/mprime/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	1 Apr 2007 07:33:25 -0000	1.11
+++ Makefile	14 Jan 2010 04:09:49 -0000
@@ -18,15 +18,11 @@
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+SUB_FILES=	pkg-message wrapper.sh
+
 # source code version
 SOURCE_VERSION=	24.14
 
-post-patch:
-# prepare wrapper
-	@${SED} \
-		-e 's|%%PREFIX%%|${PREFIX}|' ${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mprime ${PREFIX}/bin/mprime-real
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mprime
@@ -36,6 +32,8 @@
 .endif
 
 post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	29 Apr 2003 12:23:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please, make sure that you read
-/usr/local/share/doc/mprime/license.txt
-and agree to the licensing terms before running this application.
-
-Furthermore, read
-/usr/local/share/doc/mprime/readme.txt
-It contains important information about both configuring and running
-mprime.  You will have problems running it if you do not read it.
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	14 Jan 2010 04:09:49 -0000
@@ -0,0 +1,10 @@
+	ATTENTIONATTENTION:
+
+Please, make sure that you read
+%%DOCSDIR%%/license.txt
+and agree to the licensing terms before running this application.
+
+Furthermore, read
+%%DOCSDIR%%/readme.txt
+It contains important information about both configuring and running
+mprime.  You will have problems running it if you do not read it.
Index: files/wrapper.sh
===================================================================
RCS file: files/wrapper.sh
diff -N files/wrapper.sh
--- files/wrapper.sh	29 Apr 2003 12:23:05 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PREFIX="%%PREFIX%%"
-PROGRAM="${0}"
-DIRNAME=${HOME}/.mprime
-
-if [ ! -d ${DIRNAME} ]
-then
-	mkdir -p ${DIRNAME}
-fi
-
-if [ ! -h ${DIRNAME}/${PROGRAM##*/} ]
-then
-	ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/}
-fi
-
-echo " ${*} " | grep " \-createdironly " ||
-{
-	cd ${DIRNAME} &&
-	echo Running under ${DIRNAME} &&
-	exec ./${PROGRAM##*/} "${@}" ||
-	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
-}
Index: files/wrapper.sh.in
===================================================================
RCS file: files/wrapper.sh.in
diff -N files/wrapper.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/wrapper.sh.in	14 Jan 2010 04:09:49 -0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%"
+PROGRAM="${0}"
+DIRNAME=${HOME}/.mprime
+
+if [ ! -d ${DIRNAME} ]
+then
+	mkdir -p ${DIRNAME}
+fi
+
+if [ ! -h ${DIRNAME}/${PROGRAM##*/} ]
+then
+	ln -sf ${PREFIX}/bin/${PROGRAM##*/}-real ${DIRNAME}/${PROGRAM##*/}
+fi
+
+echo " ${*} " | grep " \-createdironly " ||
+{
+	cd ${DIRNAME} &&
+	echo Running under ${DIRNAME} &&
+	exec ./${PROGRAM##*/} "${@}" ||
+	echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again
+}
--- mprime-0.0.24.14.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nivit 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 14 04:20:12 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142812 
Responsible-Changed-From-To: nivit->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Sep 2 05:34:18 UTC 2010 
Responsible-Changed-Why:  
maintainer timeout (nivit ; 231 days) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142812 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Wed Sep 8 22:05:44 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142812: commit references a PR
Date: Wed,  8 Sep 2010 22:04:53 +0000 (UTC)

 pgollucci    2010-09-08 22:04:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/mprime          Makefile 
   Added files:
     math/mprime/files    pkg-message.in wrapper.sh.in 
   Removed files:
     math/mprime          pkg-message 
     math/mprime/files    wrapper.sh 
   Log:
   - use SUB_FILES appropriately instead of SED directly
   
   PR:             ports/142812
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   Approved by:    maintainer timeout (nivit ; 231 days)
   
   Revision  Changes    Path
   1.12      +5 -7      ports/math/mprime/Makefile
   1.1       +10 -0     ports/math/mprime/files/pkg-message.in (new)
   1.2       +0 -23     ports/math/mprime/files/wrapper.sh (dead)
   1.1       +23 -0     ports/math/mprime/files/wrapper.sh.in (new)
   1.2       +0 -10     ports/math/mprime/pkg-message (dead)
 _______________________________________________
 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:
