misc/142537: [patch] graphics/cairo-java use $SUB_FILES to dynamically adjust pkg-message

[Sevan Janiyan]

>Number:         142537
>Category:       misc
>Synopsis:       [patch] graphics/cairo-java use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 09 18:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sevan Janiyan
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/cairo-java/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	25 Jul 2008 14:34:24 -0000	1.14
+++ Makefile	9 Jan 2010 18:39:00 -0000
@@ -32,7 +32,8 @@
 CAIRO_API_VERSION=	1.0
 GLIB_API_VERSION=	0.4
 PLIST_SUB=		CAIRO_API_VERSION=${CAIRO_API_VERSION} PORTNAME=${PORTNAME}
-PKGMESSAGE=		${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	JAVAJARDIR=${JAVAJARDIR} CAIRO_API_VERSION=${CAIRO_API_VERSION}
 
 # jikes related
 CONFIGURE_ENV+=	BOOTCLASSPATH=${JAVA_CLASSES}
@@ -64,10 +65,6 @@
 	cd ${WRKSRC}/doc/api && ${FIND} . | ${CPIO} -pdmu ${DOCSDIR}/api
 	${TOUCH} ${DOCSDIR}/api/packages.html
 .endif
-	@${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%CAIRO_API_VERSION%%|${CAIRO_API_VERSION}|g' \
-		 < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	5 Nov 2005 06:29:24 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-************************************************************************
-Libgtk-java was successfully installed.  In order to build and run cairo
-Java applications, you must add the following to your CLASSPATH:
-
-%%JAVAJARDIR%%/cairo%%CAIRO_API_VERSION%%.jar
-
-************************************************************************
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 18:39:00 -0000
@@ -0,0 +1,7 @@
+************************************************************************
+Libgtk-java was successfully installed.  In order to build and run cairo
+Java applications, you must add the following to your CLASSPATH:
+
+%%JAVAJARDIR%%/cairo%%CAIRO_API_VERSION%%.jar
+
+************************************************************************


>Release-Note:
>Audit-Trail:
>Unformatted: