7 files changed, 124 insertions, 40 deletions

diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index bfea9bcad79d..8c272ad47fba 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	shujit
-PORTVERSION=	0.7.12
+PORTVERSION=	0.7.14
 CATEGORIES=	java
 MASTER_SITES=	http://www.shudo.net/jit/dist/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${JAVADIR}/bin/javac:${PORTSDIR}/java/jdk11
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
@@ -26,23 +25,20 @@ MAKEFILE=	GNUmakefile
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 
-JAVADIR?=	${LOCALBASE}/jdk1.1.8
-JAVALIBDIR=	${PREFIX}/lib/${PORTNAME}
-CONFIGURE_ARGS+=	--with-jdk="${JAVADIR}"
-MAKE_ENV=	JAVADIR="${JAVADIR}"
+USE_JAVA=	1.1+
+CONFIGURE_ARGS=	--with-jdk="${JAVA_HOME}"
+MAKE_ENV=	JAVADIR="${JAVA_HOME}"
 
 post-configure:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
 
 do-install:
-	@${MKDIR} ${JAVALIBDIR}
-	@${INSTALL_PROGRAM} ${WRKSRC}/libshujit.so ${JAVALIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/libshujit.so ${PREFIX}/lib
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/shujit
-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/shujit
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "See ${PREFIX}/share/shujit/README for usage instructions."
-	@${ECHO_MSG} ""
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${ENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/java/shujit/distinfo b/java/shujit/distinfo
index a911fb53e2a5..2ca08910fdf8 100644
--- a/java/shujit/distinfo
+++ b/java/shujit/distinfo
@@ -1 +1 @@
-MD5 (shujit-0.7.12.tar.gz) = ed40428c442770dc33d5d23218d1505c
+MD5 (shujit-0.7.14.tar.gz) = 4590faef61fe93d013b56d47794c0da8
diff --git a/java/shujit/files/patch-compiler.h b/java/shujit/files/patch-compiler.h
index 44e98641db0c..d023be143ac0 100644
--- a/java/shujit/files/patch-compiler.h
+++ b/java/shujit/files/patch-compiler.h
@@ -1,21 +1,14 @@
 
 $FreeBSD$
 
---- compiler.h	2002/04/26 17:13:45	1.1
-+++ compiler.h	2002/04/26 17:17:19
-@@ -61,13 +61,13 @@
+--- compiler.h	2003/02/16 00:04:39	1.1
++++ compiler.h	2003/02/16 00:05:09
+@@ -60,7 +60,7 @@
+ 
  // Additional type definition
  
- #if !(defined(_ILP32) || defined(_LP64))
--#  ifndef _UINT16_T
-+#  if !defined(_UINT16_T) && !defined(_UINT16_T_DECLARED)
+-#if !(defined(_ILP32) || defined(_LP64) || defined(_SYS_INTTYPES_H_) /* for FreeBSD */)
++#if !(defined(_ILP32) || defined(_LP64) || !defined(_SYS_INTTYPES_H_) /* for FreeBSD */)
+ #  ifndef _UINT16_T
  #    define _UINT16_T
  typedef unsigned short uint16_t;
- #    endif	// _UINT16_T
- 
- #  ifndef __BIT_TYPES_DEFINED__
--#    ifndef _INT16_T
-+#    if !defined(_INT16_T) && !defined(_INT16_T_DECLARED)
- #      define _INT16_T
- typedef short int16_t;
- #    endif	// _INT16_T
diff --git a/java/shujit/pkg-deinstall b/java/shujit/pkg-deinstall
new file mode 100644
index 000000000000..38e915864de0
--- /dev/null
+++ b/java/shujit/pkg-deinstall
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+linkfile="${PKG_PREFIX}/etc/shujit-links"
+if [ -f "${linkfile}" ]
+then
+    cat "${linkfile}" | while read link
+    do
+        rm -f "${link}"
+    done
+    rm -f "${linkfile}"
+fi
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+linkfile="${PKG_PREFIX}/etc/shujit-links"
+if [ -f "${linkfile}" ]
+then
+    cat "${linkfile}" | while read link
+    do
+        rm -f "${link}"
+    done
+    rm -f "${linkfile}"
+fi
diff --git a/java/shujit/pkg-install b/java/shujit/pkg-install
new file mode 100644
index 000000000000..98c2ef2063e3
--- /dev/null
+++ b/java/shujit/pkg-install
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+[ "$2" = "POST-INSTALL" ] || exit 0
+
+linkfile="${PKG_PREFIX}/etc/shujit-links"
+:>"${linkfile}"
+
+sed 's/[[:space:]]*#.*//' ${PKG_PREFIX}/etc/javavms | while read vm
+do
+    case "$vm" in
+    *linux*)
+	# Linux JDKs are not supported
+	;;
+    *)
+	java_home="${vm%%/bin/*}"
+	case "$java_home" in
+	*jdk1.1.8*)
+	    libdir="${java_home}/lib/i386/green_threads"
+	    ;;
+	*)
+	    libdir="${java_home}/jre/lib/i386"
+	    ;;
+	esac
+	echo "Installing link in ${libdir}"
+	ln -fs "${PKG_PREFIX}/lib/libshujit.so" "${libdir}/libshujit.so"
+        echo "${libdir}/libshujit.so" >>"${linkfile}"
+	;;
+    esac
+done
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+[ "$2" = "POST-INSTALL" ] || exit 0
+
+linkfile="${PKG_PREFIX}/etc/shujit-links"
+:>"${linkfile}"
+
+sed 's/[[:space:]]*#.*//' ${PKG_PREFIX}/etc/javavms | while read vm
+do
+    case "$vm" in
+    *linux*)
+	# Linux JDKs are not supported
+	;;
+    *)
+	java_home="${vm%%/bin/*}"
+	case "$java_home" in
+	*jdk1.1.8*)
+	    libdir="${java_home}/lib/i386/green_threads"
+	    ;;
+	*)
+	    libdir="${java_home}/jre/lib/i386"
+	    ;;
+	esac
+	echo "Installing link in ${libdir}"
+	ln -fs "${PKG_PREFIX}/lib/libshujit.so" "${libdir}/libshujit.so"
+        echo "${libdir}/libshujit.so" >>"${linkfile}"
+	;;
+    esac
+done
diff --git a/java/shujit/pkg-message b/java/shujit/pkg-message
index 922438d71d54..faf7dc81b29d 100644
--- a/java/shujit/pkg-message
+++ b/java/shujit/pkg-message
@@ -1,7 +1,11 @@
-*************************************************************************
-*
-*	This port requires the elf jdk.
-*	A binary aout release is available at
-*	http://www.shudo.net/jit/dist/
-* 
-*************************************************************************
+To use shujit, set JAVA_COMPILER to 'shujit':
+
+ - if you are using csh or tcsh, add the following line to ~/.cshrc:
+
+setenv JAVA_COMPILER shujit
+
+ - if you are using sh, bash, zsh or some other Bourne or Korn shell
+   derivative, add the following line to ~/.profile:
+
+JAVA_COMPILER=shujit; export JAVA_COMPILER
+
diff --git a/java/shujit/pkg-plist b/java/shujit/pkg-plist
index d4a4de6652f6..ac653764325b 100644
--- a/java/shujit/pkg-plist
+++ b/java/shujit/pkg-plist
@@ -1,4 +1,3 @@
-lib/shujit/libshujit.so
-share/shujit/README
-@dirrm share/shujit
-@dirrm lib/shujit
+lib/libshujit.so

+share/doc/shujit/README

+@dirrm share/doc/shujit