The fake JRE package for Darwin is not needed any more, because the builtin

framework can detect a native JRE implementation.

1 files changed, 6 insertions, 26 deletions

diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index 01c48f66ac1..665c1cad220 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile.common,v 1.29 2006/07/07 03:18:18 minskim Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -20,35 +20,22 @@ INTERACTIVE_STAGE=	fetch
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-JAVA_HOME=	/usr
-.else
 JAVA_HOME=	${LOCALBASE}/java/sun-1.3.1
 JAVA_NAME=	sun13
-.endif
-
-.if ${OPSYS} == "Darwin"
-DISTFILES=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	${PKGDIR}/PLIST.Darwin
-.endif
 
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
-ONLY_FOR_PLATFORM=	*-*-i386 Darwin-*-*
+ONLY_FOR_PLATFORM=	*-*-i386
 
-.if ${OPSYS} != "Darwin"
-.  include "../../emulators/suse_linux/Makefile.application"
+.include "../../emulators/suse_linux/Makefile.application"
 
-.  if !defined(USE_NATIVE_LINUX)
-.    if ${SUSE_DIR_PREFIX} == "suse91"
+.if !defined(USE_NATIVE_LINUX)
+.  if ${SUSE_DIR_PREFIX} == "suse91"
 DEPENDS+=	suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale
-.    endif
+.  endif
 DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.  endif
 .endif
 
 _FETCH_MESSAGE= 							\
@@ -69,26 +56,19 @@ _FETCH_MESSAGE= 							\
 	${ECHO} "======================================================================"
 
 
-.if ${OPSYS} != "Darwin"
 post-fetch:
 	@if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then	\
 		${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX};	\
 	fi
-.endif
 
 do-build:	# nothing
 
 post-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
-.if ${OPSYS} == "Darwin"
-do-install:
-	@${ECHO_MSG} "Darwin ships with a JRE/JDK based on Sun's 1.3.1 release."
-.else
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
-.endif
 
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"