1 files changed, 19 insertions, 62 deletions
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 14c48e05..efb41b6 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -6,84 +6,41 @@
 #
 
 PORTNAME=	jc
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		${MASTER_SITE_GNU:S/$/:CLASSPATH/g}
-MASTER_SITE_SUBDIR=jcvm/ classpath/:CLASSPATH
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		classpath-${CLASSPATHVERSION}${EXTRACT_SUFX}:CLASSPATH
-DIST_SUBDIR=	jcvm
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=jcvm/
 
 MAINTAINER=	archie@freebsd.org
 COMMENT=	JVM that converts class files to C source and compiles them with GCC
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		ffi.2:${PORTSDIR}/devel/libffi
 
 MAN1=		jc.1
 
-USE_GNOME=	gtk20 libartlgpl2 pkgconfig
-USE_JAVA=	yes
-USE_JIKES=	yes
 USE_LIBTOOL_VER=15
-LIBTOOLFILES=	${CLASSPATHDIR}/configure
+USE_JAVA=	yes
 USE_GMAKE=	yes
+JAVA_BUILD=	yes
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" \
-		LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
-PATCH_WRKSRC=	${WRKDIR}
+CONFIGURE_ARGS=	--with-classpath=${LOCALBASE}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 INFO=		jc
 ONLY_FOR_ARCHS=	i386
 
-# Directories for the two source components
-JCDIR=		${PORTNAME}-${PORTVERSION}
-CLASSPATHDIR=	classpath-${CLASSPATHVERSION}
-
-# Classpath version
-CLASSPATHVERSION=0.12
-
-# Jikes version expected
-JIKESVERSION=	1.22
-
-# Configure args
-CLASSPATH_CONF=	--prefix=${PREFIX}/jc --enable-jni --with-jikes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-pre-configure:
-		@${ECHO} "===>    Configuring ${CLASSPATHDIR}"
-		@( cd ${.CURDIR} && ${MAKE} do-configure \
-		    CONFIGURE_WRKSRC=${WRKDIR}/${CLASSPATHDIR} \
-		    CONFIGURE_ARGS="${CLASSPATH_CONF}" )
-		@${ECHO} "===>    Configuring ${JCDIR}"
-
-pre-build:
-		@JIKESVER=`jikes -version 2>&1 | ${GREP} -wi version | ${SED} -E 's/^.*[Vv]ersion[[:space:]]+([0-9.]+).*$$/\1/g'`; \
-		if [ "$${JIKESVER}" != "" -a "$${JIKESVER}" != "${JIKESVERSION}" ]; then \
-		    ${ECHO} ''; \
-		    ${ECHO} '***' '                    ' WARNING; \
-		    ${ECHO} '***'; \
-		    ${ECHO} '***' You have jikes version $${JIKESVER} installed instead of version ${JIKESVERSION}.; \
-		    ${ECHO} '***' This will cause JC to have to bootstrap re-generate all JC and; \
-		    ${ECHO} '***' Classpath source files when it first runs, which requires that; \
-		    ${ECHO} '***' the JDK \(or some other JVM\) be installed. To avoid this, hit; \
-		    ${ECHO} '***' CTRL-C now and install jikes version ${JIKESVERSION}.; \
-		    ${ECHO} '***' ; \
-		    ${ECHO} ''; \
-		    sleep 10; \
-		fi
-		@${ECHO} "===>    Building ${CLASSPATHDIR}"
-		@( cd ${.CURDIR} && ${MAKE} do-build \
-		    BUILD_WRKSRC=${WRKDIR}/${CLASSPATHDIR} )
-		@${ECHO} "===>    Building ${JCDIR}"
+.include <bsd.port.pre.mk>
 
-pre-install:
-		@${ECHO} "===>    Installing ${CLASSPATHDIR}"
-		@( cd ${.CURDIR} && ${MAKE} do-install \
-		    INSTALL_WRKSRC=${WRKDIR}/${CLASSPATHDIR} )
-		@${ECHO} "===>    Installing ${JCDIR}"
+post-install:
+.for dir in ${PREFIX}/etc/jc ${PREFIX}/include/jc ${PREFIX}/lib/jc ${PREFIX}/share/jc
+	@${FIND} ${dir} ! -type d | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${dir} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>