7 files changed, 23 insertions, 46 deletions

diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 0e6a2ffb801b..40b9fc5b81a9 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -6,30 +6,15 @@
 #
 
 PORTNAME=	jikes
-PORTVERSION=	1.11
+PORTVERSION=	1.12
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	archie
+MASTER_SITES=	http://oss.software.ibm.com/developerworks/opensource/jikes/project/download/v112/
 
-MAINTAINER=	archie@whistle.com
+MAINTAINER=	archie@freebsd.org
 
-WRKSRC=		${WRKDIR}/jikes/src
 MAN1=		jikes.1
-MAKE_ENV=	WRKDIR=${WRKDIR}
-PATCH_STRIP=	-p2
 
-# 	(sufficiently handled by pkg/MESSAGE, but if IBM has an issue then
-#	uncomment this section)
-#
-#fetch-depends:
-#
-#.if !defined(READ_IBM_LICENSE)
-#	@echo ""
-#	@echo "You must read the IBM license prior to using this software,"
-#	@echo "then set READ_IBM_LICENSE=YES in /etc/make.conf.local"
-#	@echo ""
-#	@echo "The license is available at http://www.ibm.com/research/jikes"
-#	@${FALSE}
-#.endif
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/java/jikes/distinfo b/java/jikes/distinfo
index 36d1469cfdc4..1ac8476a52b5 100644
--- a/java/jikes/distinfo
+++ b/java/jikes/distinfo
@@ -1 +1 @@
-MD5 (jikes-1.11.tar.gz) = 3de59dc77e59161b889badc456d75aa3
+MD5 (jikes-1.12.tar.gz) = 0e9bc9f69a420bdcb4b625e722e2ed15
diff --git a/java/jikes/files/patch-aa b/java/jikes/files/patch-aa
index 0059e4ed3861..78ec8a8189d9 100644
--- a/java/jikes/files/patch-aa
+++ b/java/jikes/files/patch-aa
@@ -1,23 +1,11 @@
-diff -ur --unidirectional-new-file jikes.orig/src/Makefile.in work/jikes/src/Makefile.in
---- jikes.orig/src/Makefile.in	Tue Sep 14 11:32:51 1999
-+++ work/jikes/src/Makefile.in	Wed Sep 15 10:33:19 1999
-@@ -35,12 +35,13 @@
- 	$(ERASE) config.cache config.log config.status
- 	$(ERASE) Makefile
+--- doc/Makefile.in.orig	Mon Jul 31 15:54:07 2000
++++ doc/Makefile.in	Mon Jul 31 15:54:21 2000
+@@ -80,7 +80,7 @@
  
--install: all
--	mkdir -p $(prefix)/bin
--	strip $(EXECUTABLE)
--	cp $(EXECUTABLE) $(prefix)/bin
--	mkdir -p $(prefix)/man/man1
--	cp ../jikes.1 $(prefix)/man/man1
-+install:
-+	${INSTALL} -c ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-+	  ${EXECUTABLE} ${PREFIX}/bin/jikes
-+	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-+	  ${WRKDIR}/jikes/jikes.1 ${PREFIX}/man/man1
-+
-+.include <bsd.own.mk>
+ man_MANS = jikes.1
  
- OBJECTS=jikes.@O@ scanner.@O@ code.@O@ zip.@O@ unzip.@O@ \
-         ast.@O@ diagnose.@O@ parser.@O@ lpginput.@O@ javaact.@O@ \
+-docdir = $(prefix)/doc/${PACKAGE}-${VERSION}
++docdir = $(prefix)/share/doc/${PACKAGE}-${VERSION}
+ 
+ doc_DATA = \
+ contrib.html \
diff --git a/java/jikes/pkg-comment b/java/jikes/pkg-comment
index 9dccfeeac82c..51e64086b1b3 100644
--- a/java/jikes/pkg-comment
+++ b/java/jikes/pkg-comment
@@ -1 +1 @@
-A Java source to byte-code compiler made available by IBM
+A very fast Java source to byte-code compiler made available by IBM
diff --git a/java/jikes/pkg-descr b/java/jikes/pkg-descr
index 442c2084470c..90d8441ffffe 100644
--- a/java/jikes/pkg-descr
+++ b/java/jikes/pkg-descr
@@ -1,7 +1,7 @@
 This is jikes, a java source to byte-code compiler.  The compiler has been
 made available by IBM under their open-source license, please see:
 
-WWW: http://www.ibm.com/research/jikes
+WWW: http://oss.software.ibm.com/developerworks/opensource/jikes/project/
 
 for details.  To operate, the CLASSPATH environment variable must typically
 be set to a colon-delimited list of source directories, class directories,
diff --git a/java/jikes/pkg-message b/java/jikes/pkg-message
index 7b032b38e155..76079c17a144 100644
--- a/java/jikes/pkg-message
+++ b/java/jikes/pkg-message
@@ -1,8 +1,6 @@
-
 This software is subject to the terms of the IBM Jikes Compiler Open"
 Source License Agreement available at the following URL:"
 http://www.ibm.com/research/jikes."
 Copyright (C) 1996, 1998, International Business Machines Corporation"
 and others.  All Rights Reserved."
 You must accept the terms of that agreement to use this software."
-
diff --git a/java/jikes/pkg-plist b/java/jikes/pkg-plist
index 654b2b1d4d23..81256be73536 100644
--- a/java/jikes/pkg-plist
+++ b/java/jikes/pkg-plist
@@ -1 +1,7 @@
 bin/jikes
+share/doc/jikes-1.12/contrib.html
+share/doc/jikes-1.12/jikes.gif
+share/doc/jikes-1.12/jikes.html
+share/doc/jikes-1.12/license.htm
+share/doc/jikes-1.12/news.html
+@dirrm share/doc/jikes-1.12