From 3dc6d47ba5c3da484a358278e0735d456afc1d21 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <archie@FreeBSD.org>
Date: Mon, 26 Jul 2004 14:28:11 +0000
Subject: Update to version 1.2.2.
---
java/jc/Makefile | 30 ++++--------------------------
java/jc/distinfo | 4 ++--
2 files changed, 6 insertions(+), 28 deletions(-)
(limited to 'java/jc')
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 196f95bf8d73..539fb58e79a9 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= jc
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.2
CATEGORIES= java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://ftp.gnu.org/gnu/classpath/:CLASSPATH
@@ -23,8 +23,8 @@ BUILD_DEPENDS= jikes:${PORTSDIR}/java/jikes \
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
ffi.2:${PORTSDIR}/devel/libffi
-#USE_LIBTOOL= yes
-#LIBTOOLFILES= ${JCDIR}/aclocal.m4 ${CLASSPATHDIR}/aclocal.m4
+USE_LIBTOOL_VER=15
+LIBTOOLFILES= ${CLASSPATHDIR}/configure
USE_GMAKE= yes
INSTALLS_SHLIB= yes
PLIST_SUB= PORTVERSION=${PORTVERSION}
@@ -35,12 +35,7 @@ PATCH_WRKSRC= ${WRKDIR}
INFO= jc
ONLY_FOR_ARCHS= i386
-.if defined(WITH_GNOMELIBS) || exists(${X11BASE}/include/gnome-1.0/libart_lgpl/art_misc.h)
-USE_GNOME= gnomelibs
-PLIST_SUB+= GNOME:=""
-.else
PLIST_SUB+= GNOME:="@comment "
-.endif
# Directories for the two source components
JCDIR= ${PORTNAME}-${PORTVERSION}
@@ -53,26 +48,9 @@ CLASSPATHVERSION=0.10
JIKESVERSION= 1.21
# Configure args
-CLASSPATH_CONF= --prefix=${PREFIX}/jc --enable-jni --with-jikes
+CLASSPATH_CONF= --prefix=${PREFIX}/jc --enable-jni --with-jikes --disable-gtk-peer
CONFIGURE_ARGS= --prefix=${PREFIX}
-# Conditionally compile the gnome-dependent stuff
-.if !defined(WITH_GNOMELIBS) && !exists(${X11BASE}/include/gnome-1.0/libart_lgpl/art_misc.h)
-CLASSPATH_CONF+=--disable-gtk-peer
-pre-fetch:
- @${ECHO} ''
- @${ECHO} '***' ' ' NOTICE
- @${ECHO} '***'
- @${ECHO} '***' You do not seem to have the Gnome libraries installed.
- @${ECHO} '***' Therefore, Classpath will be built without graphics
- @${ECHO} '***' support. If you would like to install the Classpath
- @${ECHO} '***' libraries to include graphics support, hit Control-C
- @${ECHO} '***' now and type \'make WITH_GNOMELIBS=yes\'.
- @${ECHO} '***'
- @${ECHO} ''
- @sleep 3
-.endif
-
pre-configure:
@${ECHO} "===> Configuring ${CLASSPATHDIR}"
@( cd ${.CURDIR} && ${MAKE} do-configure \
diff --git a/java/jc/distinfo b/java/jc/distinfo
index ea8bfb5698b4..d5c8bf972912 100644
--- a/java/jc/distinfo
+++ b/java/jc/distinfo
@@ -1,4 +1,4 @@
-MD5 (jcvm/jc-1.2.1.tar.gz) = 922b062ab18a5c8a4ebbfefa31679ee0
-SIZE (jcvm/jc-1.2.1.tar.gz) = 27446015
+MD5 (jcvm/jc-1.2.2.tar.gz) = 80925426806ecd5e03259fa6f06e14ab
+SIZE (jcvm/jc-1.2.2.tar.gz) = 27461440
MD5 (jcvm/classpath-0.10.tar.gz) = a59a5040f9c1237dbf27bfc668919943
SIZE (jcvm/classpath-0.10.tar.gz) = 6801054
--
cgit v1.2.3