From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 15 12:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8477810656E6 for ; Thu, 15 Jan 2009 12:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5F1CE8FC24 for ; Thu, 15 Jan 2009 12:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n0FCo2rl082731 for ; Thu, 15 Jan 2009 12:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n0FCo26Y082723; Thu, 15 Jan 2009 12:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jan 2009 12:50:02 GMT Resent-Message-Id: <200901151250.n0FCo26Y082723@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, Björn König Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62CAB1065676 for ; Thu, 15 Jan 2009 12:41:41 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203]) by mx1.freebsd.org (Postfix) with ESMTP id CF4618FC17 for ; Thu, 15 Jan 2009 12:41:40 +0000 (UTC) (envelope-from bkoenig@alpha-tierchen.de) Received: from home.alpha-tierchen.de (port-87-234-81-139.dynamic.qsc.de [87.234.81.139]) by mail.liberty-hosting.de (Postfix) with ESMTP id C975B3E8E27 for ; Thu, 15 Jan 2009 13:34:20 +0100 (CET) Received: by home.alpha-tierchen.de (Postfix, from userid 2000) id 1CC092858B; Thu, 15 Jan 2009 13:41:23 +0100 (CET) Message-Id: <20090115124123.1CC092858B@home.alpha-tierchen.de> Date: Thu, 15 Jan 2009 13:41:23 +0100 (CET) From: Björn König To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/130584: [maintainer] update java/classpath X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Björn König List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2009 12:50:03 -0000 >Number: 130584 >Category: ports >Synopsis: [maintainer] update java/classpath >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 15 12:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Björn König >Release: >Organization: >Environment: >Description: The patch below updates the port java/classpath form 0.93 to 0.97.2. >How-To-Repeat: >Fix: --- ports-java-classpath.diff begins here --- diff --git ports/java/classpath/Makefile ports/java/classpath/Makefile index 201d2c6..8934166 100644 --- ports/java/classpath/Makefile +++ ports/java/classpath/Makefile @@ -7,8 +7,7 @@ # PORTNAME= classpath -PORTVERSION= 0.93 -PORTREVISION= 3 +PORTVERSION= 0.97.2 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SAVANNAH} @@ -17,18 +16,32 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= bkoenig@alpha-tierchen.de COMMENT= A GNU project to create a free Java class library -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - jikes:${PORTSDIR}/java/jikes +BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +USE_JAVA= yes +JAVA_VERSION= 1.5+ USE_XORG= x11 ice xtst xaw xproto xext USE_LDCONFIG= yes USE_GNOME= gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS= --enable-jni --with-jikes --disable-alsa --disable-dssi --disable-plugin +CONFIGURE_ARGS= --enable-jni --disable-alsa --disable-dssi --disable-plugin USE_GMAKE= yes -INFO= hacking tools vmintegration +MAN1= gappletviewer.1 \ + gjar.1 \ + gjarsigner.1 \ + gjavah.1 \ + gcjh.1 \ + gkeytool.1 \ + gnative2ascii.1 \ + gorbd.1 \ + grmid.1 \ + grmiregistry.1 \ + gserialver.1 \ + gtnameserv.1 + +INFO= cp-hacking cp-tools cp-vmintegration CONFLICTS= sablevm-classpath-* @@ -75,8 +88,4 @@ PLIST_SUB+= QT4="" PLIST_SUB+= QT4="@comment " .endif -post-extract: - @${REINPLACE_CMD} -e 's,^\(include_HEADERS = \)jni.h jni_md.h \(.*\),\1\2,' \ - ${WRKSRC}/include/Makefile.in - .include diff --git ports/java/classpath/distinfo ports/java/classpath/distinfo index bb2615b..e7ca031 100644 --- ports/java/classpath/distinfo +++ ports/java/classpath/distinfo @@ -1,3 +1,3 @@ -MD5 (classpath-0.93.tar.gz) = ffa9e9cac31c5acbf0ea9eff9efa923d -SHA256 (classpath-0.93.tar.gz) = df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945 -SIZE (classpath-0.93.tar.gz) = 9534222 +MD5 (classpath-0.97.2.tar.gz) = 6a35347901ace03c31cc49751b338f31 +SHA256 (classpath-0.97.2.tar.gz) = 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4 +SIZE (classpath-0.97.2.tar.gz) = 10318014 diff --git ports/java/classpath/files/patch-native_jni_native-lib_cpnet.h ports/java/classpath/files/patch-native_jni_native-lib_cpnet.h deleted file mode 100644 index efce85c..0000000 --- ports/java/classpath/files/patch-native_jni_native-lib_cpnet.h +++ /dev/null @@ -1,14 +0,0 @@ ---- native/jni/native-lib/cpnet.h.orig 2006-09-08 10:59:57.000000000 +0200 -+++ native/jni/native-lib/cpnet.h 2008-03-31 18:47:54.000000000 +0200 -@@ -41,9 +41,11 @@ - #include - #include - #include - -+#include - #include -+#include - #include - #include - - typedef struct { diff --git ports/java/classpath/pkg-plist ports/java/classpath/pkg-plist index c8e4fc0..8d6abf5 100644 --- ports/java/classpath/pkg-plist +++ ports/java/classpath/pkg-plist @@ -1,15 +1,19 @@ bin/gappletviewer +bin/gjavah bin/gjar bin/gjarsigner bin/gkeytool bin/gnative2ascii bin/gorbd +bin/grmic bin/grmid bin/grmiregistry bin/gserialver bin/gtnameserv include/jawt.h include/jawt_md.h +include/jni.h +include/jni_md.h %%GCONF%%lib/classpath/libgconfpeer.la %%GCONF%%lib/classpath/libgconfpeer.so %%GTK2%%lib/classpath/libgtkpeer.so @@ -20,6 +24,9 @@ lib/classpath/libjavaio.so.0 lib/classpath/libjavalang.la lib/classpath/libjavalang.so lib/classpath/libjavalang.so.0 +lib/classpath/libjavalangmanagement.la +lib/classpath/libjavalangmanagement.so +lib/classpath/libjavalangmanagement.so.0 lib/classpath/libjavalangreflect.la lib/classpath/libjavalangreflect.so lib/classpath/libjavalangreflect.so.0 @@ -85,13 +92,16 @@ lib/security/classpath.security %%DATADIR%%/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java %%DATADIR%%/examples/gnu/classpath/examples/awt/AnimationApplet.java %%DATADIR%%/examples/gnu/classpath/examples/awt/Demo.java +%%DATADIR%%/examples/gnu/classpath/examples/awt/HintingDemo.java %%DATADIR%%/examples/gnu/classpath/examples/datatransfer/Demo.java %%DATADIR%%/examples/gnu/classpath/examples/html/Demo.java +%%DATADIR%%/examples/gnu/classpath/examples/icons/aicas.png %%DATADIR%%/examples/gnu/classpath/examples/icons/back.png %%DATADIR%%/examples/gnu/classpath/examples/icons/badge.png %%DATADIR%%/examples/gnu/classpath/examples/icons/big-fullscreen.png %%DATADIR%%/examples/gnu/classpath/examples/icons/big-home.png %%DATADIR%%/examples/gnu/classpath/examples/icons/big-warning.png +%%DATADIR%%/examples/gnu/classpath/examples/icons/palme.gif %%DATADIR%%/examples/gnu/classpath/examples/icons/reload.png %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-copy.png %%DATADIR%%/examples/gnu/classpath/examples/icons/stock-cut.png @@ -125,6 +135,7 @@ lib/security/classpath.security %%DATADIR%%/examples/gnu/classpath/examples/management/TestThread.java %%DATADIR%%/examples/gnu/classpath/examples/midi/Demo.java %%DATADIR%%/examples/gnu/classpath/examples/print/Demo.java +%%DATADIR%%/examples/gnu/classpath/examples/sound/AudioPlayerSample.java %%DATADIR%%/examples/gnu/classpath/examples/swing/BrowserEditorKit.java %%DATADIR%%/examples/gnu/classpath/examples/swing/ButtonDemo.java %%DATADIR%%/examples/gnu/classpath/examples/swing/ComboBoxDemo.java @@ -159,6 +170,7 @@ lib/security/classpath.security %%DATADIR%%/glibj.zip %%DATADIR%%/tools.zip @dirrm %%DATADIR%%/examples/gnu/classpath/examples/swing +@dirrm %%DATADIR%%/examples/gnu/classpath/examples/sound @dirrm %%DATADIR%%/examples/gnu/classpath/examples/print @dirrm %%DATADIR%%/examples/gnu/classpath/examples/midi @dirrm %%DATADIR%%/examples/gnu/classpath/examples/management --- ports-java-classpath.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: