From owner-svn-ports-all@FreeBSD.ORG Thu Jan 15 23:28:10 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4ACFEB0; Thu, 15 Jan 2015 23:28:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFF9CEF; Thu, 15 Jan 2015 23:28:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0FNSAuZ066748; Thu, 15 Jan 2015 23:28:10 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0FNSAjc066740; Thu, 15 Jan 2015 23:28:10 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201501152328.t0FNSAjc066740@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Thu, 15 Jan 2015 23:28:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377144 - in head/java/jode: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2015 23:28:11 -0000 Author: mi Date: Thu Jan 15 23:28:09 2015 New Revision: 377144 URL: https://svnweb.freebsd.org/changeset/ports/377144 QAT: https://qat.redports.org/buildarchive/r377144/ Log: Fix a long-standing problem of the jode-script trying to use the wrong getopt JAR. Bump PORTREVISION. While here improve various bits a bit and add the regression-test target using the bundled tests. Added: head/java/jode/files/jode.in - copied, changed from r376574, head/java/jode/files/patch-bin-jode Deleted: head/java/jode/files/patch-bin-jode Modified: head/java/jode/Makefile head/java/jode/pkg-descr Modified: head/java/jode/Makefile ============================================================================== --- head/java/jode/Makefile Thu Jan 15 22:53:47 2015 (r377143) +++ head/java/jode/Makefile Thu Jan 15 23:28:09 2015 (r377144) @@ -3,7 +3,7 @@ PORTNAME= jode PORTVERSION= 1.1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1.2-pre1 DISTNAME= ${PORTNAME}-${VENDOR_VERSION} @@ -29,6 +29,8 @@ CONFIGURE_ENV+= CLASSLIB=${CLASSLIB} JAR CONFIGURE_ARGS+=--datadir="${JAVALIBDIR}" # Don't create the dependencies: MAKE_ARGS+= JAVADEP=: +SUB_LIST+= GETOPT_JAR=${GETOPT_JAR} +SUB_FILES= jode PLIST_FILES= bin/jode %%JAVAJARDIR%%/jode-${VENDOR_VERSION}.jar post-patch: @@ -41,8 +43,12 @@ post-build: cd ${WRKSRC} && ${JAR} cvf ${PORTNAME}-${VENDOR_VERSION}.jar \ `${FIND} jode -name \*.class` -post-install: +do-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${VENDOR_VERSION}.jar \ ${STAGEDIR}/${JAVAJARDIR}/ + ${INSTALL_SCRIPT} ${WRKDIR}/jode ${STAGEDIR}/${PREFIX}/bin/ + +test check regression-test: build + ${MAKE} -C ${WRKSRC}/test check-TESTS .include Copied and modified: head/java/jode/files/jode.in (from r376574, head/java/jode/files/patch-bin-jode) ============================================================================== --- head/java/jode/files/patch-bin-jode Thu Jan 8 22:53:32 2015 (r376574, copy source) +++ head/java/jode/files/jode.in Thu Jan 15 23:28:09 2015 (r377144) @@ -1,17 +1,13 @@ ---- bin/jode.in Mon Oct 2 09:08:36 2000 -+++ bin/jode.in Tue Jun 24 16:13:17 2003 -@@ -1,4 +1,3 @@ - #!@SHELL@ --prefix=@prefix@ - - case $1 in -@@ -9,6 +8,6 @@ - esac - -+# This will only set CP if CLASSPATH is non-empty: -+CP=`echo $CLASSPATH | sed -e 's/:/,/g' -e 's/..*/--classpath &/'` - --CP=`echo $CLASSPATH | sed s/:/,/` --CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \ --@JAVA@ $CLAZZ --classpath $CP $* -+exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar $CLAZZ $CP "$@" +#!/bin/sh + +case $1 in + [Ss]wi*) CLAZZ=jode.swingui.Main; shift ;; + [Dd]ec*) CLAZZ=jode.decompiler.Main; shift ;; + [Oo]bf*) CLAZZ=jode.obfuscator.Main; shift ;; + *) CLAZZ=jode.decompiler.Main ;; +esac + +# This will only set CP if CLASSPATH is non-empty: +CP=`echo $CLASSPATH | sed -e 's/:/,/g' -e 's/..*/--classpath &/'` + +exec java -cp %%JAVAJARDIR%%/jode-1.1.2-pre1.jar:%%GETOPT_JAR%% $CLAZZ $CP "$@" Modified: head/java/jode/pkg-descr ============================================================================== --- head/java/jode/pkg-descr Thu Jan 15 22:53:47 2015 (r377143) +++ head/java/jode/pkg-descr Thu Jan 15 23:28:09 2015 (r377144) @@ -12,7 +12,6 @@ including inner and anonymous classes. The optimizer transforms class files in various ways with can be controlled by a script file. It supports the following operations: - . Renaming class, method, field and local names to shorter, obfuscated, or unique names or according to a given translation table