From nobody@FreeBSD.org  Sat Jan  9 05:50:42 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 E3140106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 05:50:42 +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 B8AB98FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Jan 2010 05:50:42 +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 o095ogfA033525
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 9 Jan 2010 05:50:42 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o095ogY4033524;
	Sat, 9 Jan 2010 05:50:42 GMT
	(envelope-from nobody)
Message-Id: <201001090550.o095ogY4033524@www.freebsd.org>
Date: Sat, 9 Jan 2010 05:50:42 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] emulators/vMac use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142514
>Category:       ports
>Synopsis:       [patch] emulators/vMac use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 06:00:10 UTC 2010
>Closed-Date:    Sun Jan 10 00:36:45 UTC 2010
>Last-Modified:  Sun Jan 10 00:40:01 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/emulators/vMac/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	19 Apr 2008 17:48:37 -0000	1.12
+++ Makefile	9 Jan 2010 05:45:05 -0000
@@ -17,9 +17,10 @@
 COMMENT=	Emulates a MacPlus machine!  Runs MacOS versions up to 7.5.5
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE= 	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 ice sm xext
+SUB_FILES=	pkg-message
 
 pre-patch:
 	(cd ${WRKSRC} && ${SH} ${FILESDIR}/dos2unx gemulator.c)
@@ -35,6 +36,6 @@
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.rom ${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	29 Aug 1999 05:51:19 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
- - --------------------------------------------------------------------- -
- -  You need to obtain a vMac ROM file to use vMac.  Instructions are    -
- -  found in /usr/local/share/doc/vMac/README.rom.                       -
- -                                                                       -
- -  Also reading /usr/local/share/doc/vMac/README is a good idea         -
- -                                                                       -
- -  vMac Website: http://www.vmac.org/                                   -
- - --------------------------------------------------------------------- -
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	9 Jan 2010 05:45:05 -0000
@@ -0,0 +1,8 @@
+ - --------------------------------------------------------------------- -
+ -  You need to obtain a vMac ROM file to use vMac.  Instructions are    -
+ -  found in %%DOCSDIR%%/README.rom.                       -
+ -                                                                       -
+ -  Also reading %%DOCSDIR%%/README is a good idea         -
+ -                                                                       -
+ -  vMac Website: http://www.vmac.org/                                   -
+ - --------------------------------------------------------------------- -


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Sat Jan 9 22:05:17 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142514 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Sun Jan 10 00:36:44 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142514: commit references a PR
Date: Sun, 10 Jan 2010 00:35:50 +0000 (UTC)

 pgollucci    2010-01-10 00:35:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/vMac       Makefile 
   Added files:
     emulators/vMac/files pkg-message.in 
   Removed files:
     emulators/vMac       pkg-message 
   Log:
   SUBFILES += pkg-message
   
   PR:             ports/142514
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.13      +3 -2      ports/emulators/vMac/Makefile
   1.1       +8 -0      ports/emulators/vMac/files/pkg-message.in (new)
   1.2       +0 -8      ports/emulators/vMac/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:
