From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 24 22:30:25 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73DB416A617 for ; Wed, 24 May 2006 22:30:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 157F943D6D for ; Wed, 24 May 2006 22:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4OMUEUA088285 for ; Wed, 24 May 2006 22:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4OMUEiV088284; Wed, 24 May 2006 22:30:14 GMT (envelope-from gnats) Resent-Date: Wed, 24 May 2006 22:30:14 GMT Resent-Message-Id: <200605242230.k4OMUEiV088284@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Herve Quiroz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 831DB16A441 for ; Wed, 24 May 2006 22:24:25 +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 D859B43D48 for ; Wed, 24 May 2006 22:24:24 +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 k4OMOFmh082533; Thu, 25 May 2006 00:24:15 +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 k4OMOEd9082532; Thu, 25 May 2006 00:24:14 +0200 (CEST) (envelope-from rv) Message-Id: <200605242224.k4OMOEd9082532@arabica.esil.univ-mrs.fr> Date: Thu, 25 May 2006 00:24:14 +0200 (CEST) From: Herve Quiroz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mi@aldan.algebra.com Subject: ports/97856: [PATCH] java/jode: Update to bsd.java.mk 2.0 and other improvements X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 22:30:25 -0000 >Number: 97856 >Category: ports >Synopsis: [PATCH] java/jode: Update to bsd.java.mk 2.0 and other improvements >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 24 22:30:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Tue May 9 17:19:22 CEST >Description: - Update to bsd.java.mk 2.0 - Use DISTVERSION to avoid using a different port version number than the distfile - Set JAVA_VERSION (for javavmwrapper) in the launcher script - Use an absolute path to launch javavmwrapper - JAVAJARDIR -> JAVALIBDIR (for JAR dependencies) - Use %%JAVAJARDIR%% in pkg-plist Port maintainer (mi@aldan.algebra.com) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- jode-1.1.2.p1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/jode/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- Makefile 9 May 2006 00:18:06 -0000 1.4 +++ Makefile 24 May 2006 22:22:27 -0000 @@ -5,9 +5,8 @@ # $FreeBSD: ports/java/jode/Makefile,v 1.4 2006/05/09 00:18:06 edwin Exp $ PORTNAME= jode -PORTVERSION= 1.1.1.1 +DISTVERSION= 1.1.2-pre1 CATEGORIES= java devel -DISTNAME= ${PORTNAME}-${VENDOR_VERSION} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME} @@ -17,20 +16,19 @@ BUILD_DEPENDS= ${GETOPT_JAR}:${PORTSDIR}/java/java-getopt RUN_DEPENDS= ${BUILD_DEPENDS} -VENDOR_VERSION= 1.1.2-pre1 USE_JAVA= 1.2+ NEED_JAVAC= yes GNU_CONFIGURE= yes USE_GMAKE= yes -GETOPT_JAR= ${JAVAJARDIR}/getopt.jar +GETOPT_JAR= ${JAVALIBDIR}/getopt.jar CLASSLIB= ${JAVA_CLASSES}:${GETOPT_JAR} CONFIGURE_ENV+= CLASSLIB=${CLASSLIB} JAR="${JAR}" \ JAVA="${JAVA}" JAVAC="${JAVAC}" -CONFIGURE_ARGS+=--datadir="${JAVAJARDIR}" +CONFIGURE_ARGS+=--datadir="${JAVALIBDIR}" # Don't create the dependencies: MAKE_ARGS+= JAVADEP=: -PLIST_SUB+= VERSION=${VENDOR_VERSION} +PLIST_SUB+= VERSION=${DISTVERSION} post-patch: ${FIND} ${WRKSRC} -name '*.java*' | \ @@ -39,11 +37,11 @@ -e 's,enum([ \.]),enumeration\1,g' post-build: - cd ${WRKSRC} && ${JAR} cvf ${PORTNAME}-${VENDOR_VERSION}.jar \ + cd ${WRKSRC} && ${JAR} cvf ${PORTNAME}-${DISTVERSION}.jar \ `${FIND} jode -name \*.class` post-install: - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${VENDOR_VERSION}.jar \ + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${DISTVERSION}.jar \ ${JAVAJARDIR}/ # Documentation HTML seems broken and out of date. Don't bother #.ifndef (NOPORTDOCS) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/java/jode/pkg-plist,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist --- pkg-plist 24 Jun 2003 20:34:03 -0000 1.1 +++ pkg-plist 24 May 2006 22:22:27 -0000 @@ -1,2 +1,2 @@ bin/jode -share/java/classes/jode-%%VERSION%%.jar +%%JAVAJARDIR%%/jode-%%VERSION%%.jar Index: files/patch-bin-jode =================================================================== RCS file: /home/ncvs/ports/java/jode/files/patch-bin-jode,v retrieving revision 1.2 diff -u -u -r1.2 patch-bin-jode --- files/patch-bin-jode 7 Jul 2005 18:38:19 -0000 1.2 +++ files/patch-bin-jode 24 May 2006 22:22:27 -0000 @@ -14,5 +14,5 @@ -CP=`echo $CLASSPATH | sed s/:/,/` -CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \ -@JAVA@ $CLAZZ --classpath $CP $* -+exec java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \ ++JAVA_VERSION="1.2+" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \ + $CLAZZ $CP "$@" --- jode-1.1.2.p1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: