From sevan@newbie.thingamajig-systems.co.uk  Mon Jan 11 02:21:53 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 4DDFE10656B1
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 02:21:53 +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 8DCE18FC2C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Jan 2010 02:21:52 +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 o0B2I7lk019103;
	Mon, 11 Jan 2010 02:18:07 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 o0B2I7iV019102;
	Mon, 11 Jan 2010 02:18:07 GMT
	(envelope-from sevan)
Message-Id: <201001110218.o0B2I7iV019102@newbie.thingamajig-systems.co.uk>
Date: Mon, 11 Jan 2010 02:18:07 GMT
From: Sevan Janiyan <venture37@geeklan.co.uk>
To: FreeBSD-gnats-submit@freebsd.org
Cc: java@freebsd.org
Subject: [PATCH] java/jai-imageio: use $SUB_FILES to dynamically adjust pkg-message
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         142704
>Category:       ports
>Synopsis:       [PATCH] java/jai-imageio: use $SUB_FILES to dynamically adjust pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-java
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 11 02:30:01 UTC 2010
>Closed-Date:    Wed May 11 04:59:21 UTC 2011
>Last-Modified:  Wed May 11 05:00:21 UTC 2011
>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:
use $SUB_FILES & SUB_LIST to dynamically adjust pkg-message instead of invoking sed manually
IGNORE & RESTRICTED messages should not be quoted

Added file(s):
- files/pkg-message-jre.in
- files/pkg-message-libmap.in

Removed file(s):
- pkg-message-jre
- pkg-message-libmap

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

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

--- jai-imageio-1.0_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jai-imageio/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	6 Jun 2008 13:38:37 -0000	1.5
+++ Makefile	11 Jan 2010 02:14:12 -0000
@@ -21,7 +21,7 @@
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
 
-RESTRICTED=	"Redistribution is not permitted"
+RESTRICTED=	Redistribution is not permitted
 
 DOWNLOAD_URL=	http://java.sun.com/products/java-media/jai/downloads/download-iio.html
 
@@ -32,7 +32,7 @@
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE=		"You must manually fetch the \"Linux Install\" distribution \(${DISTNAME}${EXTRACT_SUFX}\) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again"
+IGNORE=		you must manually fetch the "Linux Install" distribution (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
 .if ${JAVA_PORT_OS} == "native"
@@ -48,14 +48,15 @@
 
 pre-install:
 .if defined(NOINSTALL_IN_JRE)
-		@${SED} -e "s:%%TARGET_DIR%%:${TARGET_DIR}:g" ${MASTERDIR}/pkg-message-jre > ${PKGMESSAGE}
+SUB_FILES=	pkg-message-jre
+SUB_LIST=	TARGET_DIR=${TARGET_DIR}
 .endif
 .if defined(WITH_PLUGINWRAPPER)
+SUB_FILES=	pkg-message-libmap
 .if defined(NOINSTALL_IN_JRE)
-		@${ECHO_CMD} >> ${PKGMESSAGE}
-		@${SED} -e "s:%%LIBDIR%%:${TARGET_DIR}/lib:g" ${MASTERDIR}/pkg-message-libmap >> ${PKGMESSAGE}
+SUB_LIST=	LIBDIR=${TARGET_DIR}/lib
 .else
-		@${SED} -e "s:%%LIBDIR%%:${JAVA_HOME}/jre/lib/i386:g" ${MASTERDIR}/pkg-message-libmap > ${PKGMESSAGE}
+SUB_LIST=	LIBDIR=${JAVA_HOME}/jre/lib/i386
 .endif
 .endif
 
Index: pkg-message-jre
===================================================================
RCS file: pkg-message-jre
diff -N pkg-message-jre
--- pkg-message-jre	11 Jan 2004 10:53:07 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-The JAI Image I/O Tools are not installed in JRE, so you have to add
-  %%TARGET_DIR%%/jar/clibwrapper_jiio.jar
-  %%TARGET_DIR%%/jar/jai_imageio.jar
-  %%TARGET_DIR%%/jar/mlibwrapper_jai.jar
-to the CLASSPATH environment variable, and add
-  %%TARGET_DIR%%/lib
-to the LD_LIBRARY_PATH environment variable.
Index: pkg-message-libmap
===================================================================
RCS file: pkg-message-libmap
diff -N pkg-message-libmap
--- pkg-message-libmap	11 Jan 2004 10:53:07 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-In order to use the JAI Image I/O Tools on FreeBSD native JavaVM,
-describe as follows to your /etc/libmap.conf.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[%%LIBDIR%%/libclib_jiio.so]
-libm.so.6	libm.so.2
-libc.so.6	pluginwrapper/jai.so
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: files/pkg-message-jre.in
===================================================================
RCS file: files/pkg-message-jre.in
diff -N files/pkg-message-jre.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message-jre.in	11 Jan 2010 02:14:12 -0000
@@ -0,0 +1,7 @@
+The JAI Image I/O Tools are not installed in JRE, so you have to add
+  %%TARGET_DIR%%/jar/clibwrapper_jiio.jar
+  %%TARGET_DIR%%/jar/jai_imageio.jar
+  %%TARGET_DIR%%/jar/mlibwrapper_jai.jar
+to the CLASSPATH environment variable, and add
+  %%TARGET_DIR%%/lib
+to the LD_LIBRARY_PATH environment variable.
Index: files/pkg-message-libmap.in
===================================================================
RCS file: files/pkg-message-libmap.in
diff -N files/pkg-message-libmap.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message-libmap.in	11 Jan 2010 02:14:12 -0000
@@ -0,0 +1,7 @@
+In order to use the JAI Image I/O Tools on FreeBSD native JavaVM,
+describe as follows to your /etc/libmap.conf.
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[%%LIBDIR%%/libclib_jiio.so]
+libm.so.6	libm.so.2
+libc.so.6	pluginwrapper/jai.so
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- jai-imageio-1.0_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Mon Jan 11 02:35:11 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142704 
Responsible-Changed-From-To: pgollucci->java 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Mon Jan 11 02:56:57 UTC 2010 
Responsible-Changed-Why:  
oops 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142704 
Responsible-Changed-From-To: java->freebsd-java 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Jan 11 11:40:24 UTC 2010 
Responsible-Changed-Why:  
Canonicalize assignment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142704 
State-Changed-From-To: open->feedback 
State-Changed-By: glewis 
State-Changed-When: Sun Feb 28 23:16:26 UTC 2010 
State-Changed-Why:  
The patches look good to me, but the port is currently unfetchable so 
its difficult to test them.  It looks like it might be downloadable 
at https://jai-imageio.dev.java.net/binary-builds.html#Release_builds 
though.  But it looks like only 1.0_1 and 1.1 are available, not 1.0. 

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

From: Venture37 <venture37@geeklan.co.uk>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/142704: [PATCH] java/jai-imageio: use $SUB_FILES to dynamically
 adjust pkg-message
Date: Mon, 01 Mar 2010 12:06:23 +0000

 Managed to fetch manually from:
 http://java.sun.com/products/java-media/jai/downloads/download-iio.html
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Thu Sep 16 23:09:58 UTC 2010 
State-Changed-Why:  
Feedback received 

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

From: "Sevan / Venture37" <venture37@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142704: [PATCH] java/jai-imageio: use $SUB_FILES to
 dynamically adjust pkg-message
Date: Tue, 3 May 2011 11:54:50 +0100

 Can this be commited?
 v1.0 is fetchable manually from
 http://java.sun.com/products/java-media/jai/downloads/download-iio.html
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Wed May 11 04:57:55 UTC 2011 
State-Changed-Why:  
Committed.  Thanks! 

Please note that by default this port has a RUN_DEPENDS on a port 
(www/linuxpluginwrapper) that doesn't work for FreeBSD 8.0. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142704: commit references a PR
Date: Wed, 11 May 2011 04:57:43 +0000 (UTC)

 glewis      2011-05-11 04:57:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     java/jai-imageio     Makefile 
   Added files:
     java/jai-imageio/files pkg-message-jre.in 
                            pkg-message-libmap.in 
   Removed files:
     java/jai-imageio     pkg-message-jre pkg-message-libmap 
   Log:
   . Use $SUB_FILES & SUB_LIST to dynamically adjust pkg-message instead of
     invoking sed manually.
   . IGNORE & RESTRICTED messages should not be quoted
   
   PR:             142704
   Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>
   
   Revision  Changes    Path
   1.6       +7 -6      ports/java/jai-imageio/Makefile
   1.1       +7 -0      ports/java/jai-imageio/files/pkg-message-jre.in (new)
   1.1       +7 -0      ports/java/jai-imageio/files/pkg-message-libmap.in (new)
   1.2       +0 -7      ports/java/jai-imageio/pkg-message-jre (dead)
   1.2       +0 -7      ports/java/jai-imageio/pkg-message-libmap (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:
