From nobody@FreeBSD.org  Sun Jan 10 17:47:31 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 94C91106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jan 2010 17:47:31 +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 6BFC58FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jan 2010 17:47:31 +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 o0AHlVsn071179
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Jan 2010 17:47:31 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o0AHlVJd071178;
	Sun, 10 Jan 2010 17:47:31 GMT
	(envelope-from nobody)
Message-Id: <201001101747.o0AHlVJd071178@www.freebsd.org>
Date: Sun, 10 Jan 2010 17:47:31 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] irc/gdesklets-irc use $SUB_FILES to dynamically adjust pkg-message 
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         142587
>Category:       ports
>Synopsis:       [patch] irc/gdesklets-irc use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    perky
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 10 17:50:01 UTC 2010
>Closed-Date:    Sat Feb 13 19:29:16 UTC 2010
>Last-Modified:  Sat Feb 13 23:41:30 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/irc/gdesklets-irc/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	6 Jun 2008 13:36:39 -0000	1.10
+++ Makefile	10 Jan 2010 17:41:55 -0000
@@ -23,12 +23,12 @@
 NAME=		irc
 DATADIR=	${PREFIX}/share/gdesklets
 LANG=		ko
-PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${NAME}
+SUB_FILES=	pkg-message
+SUB_LIST=	NAME=${NAME}
 
 do-build:
 	@${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
-	@${CAT} pkg-message | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' > ${PKGMESSAGE}
 
 do-install:
 	@${MKDIR} ${DATADIR}/Displays/${NAME}/gfx
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	24 Oct 2007 23:35:59 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-##
-To view the installed applets:
-
-	ls %%PREFIX%%/share/gdesklets/Displays
-
-To use this applet:
-
-	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
-
-NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory
-      and/or gconf database.
-##
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	10 Jan 2010 17:41:55 -0000
@@ -0,0 +1,13 @@
+##
+To view the installed applets:
+
+	ls %%PREFIX%%/share/gdesklets/Displays
+
+To use this applet:
+
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory
+      and/or gconf database.
+##


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perky 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 10 17:50:47 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142587 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Feb 13 19:29:15 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142587: commit references a PR
Date: Sat, 13 Feb 2010 19:29:20 +0000 (UTC)

 miwi        2010-02-13 19:29:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/gdesklets-irc    Makefile 
   Added files:
     irc/gdesklets-irc/files pkg-message.in 
   Removed files:
     irc/gdesklets-irc    pkg-message 
   Log:
   - Use $SUB_FILES to dynamically adjust pkg-message
   
   PR:             142587
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.12      +2 -2      ports/irc/gdesklets-irc/Makefile
   1.1       +13 -0     ports/irc/gdesklets-irc/files/pkg-message.in (new)
   1.4       +0 -13     ports/irc/gdesklets-irc/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:
