From rv@arabica.esil.univ-mrs.fr  Thu Aug 17 16:35:18 2006
Return-Path: <rv@arabica.esil.univ-mrs.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6B95816A621;
	Thu, 17 Aug 2006 16:35:18 +0000 (UTC)
	(envelope-from rv@arabica.esil.univ-mrs.fr)
Received: from arabica.esil.univ-mrs.fr (arabica.esil.univ-mrs.fr [139.124.41.108])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D6F3643D80;
	Thu, 17 Aug 2006 16:34:52 +0000 (GMT)
	(envelope-from rv@arabica.esil.univ-mrs.fr)
Received: from arabica.esil.univ-mrs.fr (localhost [127.0.0.1])
	by arabica.esil.univ-mrs.fr (8.13.6/8.13.6) with ESMTP id k7HGYpt1064909;
	Thu, 17 Aug 2006 18:34:51 +0200 (CEST)
	(envelope-from rv@arabica.esil.univ-mrs.fr)
Received: (from rv@localhost)
	by arabica.esil.univ-mrs.fr (8.13.6/8.13.6/Submit) id k7HGYpDN064908;
	Thu, 17 Aug 2006 18:34:51 +0200 (CEST)
	(envelope-from rv)
Message-Id: <200608171634.k7HGYpDN064908@arabica.esil.univ-mrs.fr>
Date: Thu, 17 Aug 2006 18:34:51 +0200 (CEST)
From: Herve Quiroz <hq@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: marcus@freebsd.org
Subject: [PATCH] net-mgmt/confregdecode: Update to bsd.java.mk 2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         102194
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/confregdecode: Update to bsd.java.mk 2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcus
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 17 16:40:20 GMT 2006
>Closed-Date:    Sat Aug 19 17:27:10 GMT 2006
>Last-Modified:  Sat Aug 19 17:27:10 GMT 2006
>Originator:     Herve Quiroz
>Release:        FreeBSD 6.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Mon Jul 24 17:23:17 CEST 2006
>Description:

- Update to bsd.java.mk 2.0
- Install JAR file in DATADIR=${JAVASHAREDIR}/${PORTNAME} (as encouraged in the
  Porter's Handbook)
- 'javavm' -> 'java' (the former is deprecated since javavmwrapper 2.0)
- Bump PORTREVISION because of packing list changes

NOTE: I would suggest switching to using SUB_FILES because all the
substitutions are already registered (LOCALBASE, DATADIR).

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

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

--- confregdecode-1.2.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/confregdecode/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile	23 Feb 2004 04:41:58 -0000	1.8
+++ Makefile	17 Aug 2006 16:33:54 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	confregdecode
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cosi-nms
@@ -15,17 +16,17 @@
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Cisco Systems IOS(tm) configuration register decoder
 
-USE_JAVA=	1.1+
-NEED_JAVAC=	YES
+USE_JAVA=	yes
 ALL_TARGET=	jar
 MAKE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}"
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/java
-	${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${PREFIX}/share/java
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${DATADIR}
 	${SED} \
-		-e s,%%PREFIX%%,${PREFIX}, \
 		-e s,%%LOCALBASE%%,${LOCALBASE}, \
+		-e s,%%DATADIR%%,${DATADIR}, \
 		< ${FILESDIR}/confregdecode > ${WRKSRC}/confregdecode; \
 	${INSTALL_SCRIPT} ${WRKSRC}/confregdecode ${PREFIX}/bin
 
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/confregdecode/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	19 Dec 2003 06:36:06 -0000	1.3
+++ pkg-plist	17 Aug 2006 16:33:54 -0000
@@ -1,5 +1,6 @@
 bin/confregdecode
-share/java/confregdecode.jar
+%%DATADIR%%/confregdecode.jar
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/ConfregDecode.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
Index: files/confregdecode
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/confregdecode/files/confregdecode,v
retrieving revision 1.1
diff -u -u -r1.1 confregdecode
--- files/confregdecode	29 May 2001 17:02:57 -0000	1.1
+++ files/confregdecode	17 Aug 2006 16:33:54 -0000
@@ -6,9 +6,9 @@
 #
 
 # Change this to your path to jre
-JRE=%%LOCALBASE%%/bin/javavm
+JRE=%%LOCALBASE%%/bin/java
 # End changeable things
 
-CLASSPATH=%%PREFIX%%/share/java/confregdecode.jar:${CLASSPATH}
+CLASSPATH=%%DATADIR%%/confregdecode.jar:${CLASSPATH}
 
 exec ${JRE} -classpath ${CLASSPATH} com.marcuscom.confregdecode.ConfregDecode
--- confregdecode-1.2.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->marcus 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 17 16:40:44 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102194 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Sat Aug 19 17:26:59 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102194 
>Unformatted:
