* Convert to use the pkgsrc emulator framework. This allows NetBSD/amd64

  to install and use this NetBSD/i386 JRE/JDK distribution.

* Make the scsl-* packages look more like the sun-* JRE and JDK packages.

* The scsl-jre15 package was built on NetBSD-2.0.x and needs libstdc++.5.0,
  so require netbsd>=2.0.  Bump the PKGREVISION of scsl-jre15 to 1 to
  reflect the potential new dependencies on the compat20 and compat30
  packages.  This addresses part of PR pkg/36797.

7 files changed, 57 insertions, 33 deletions

diff --git a/lang/scsl-jdk15/Makefile b/lang/scsl-jdk15/Makefile
index 75c0019ff01..446b880bceb 100644
--- a/lang/scsl-jdk15/Makefile
+++ b/lang/scsl-jdk15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/06/18 08:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/30 17:52:48 jlam Exp $
 
 DISTNAME=	jdk-${DIST_VER}-${DIST_ARCH}
 PKGNAME=	scsl-jdk15-${PKG_VER}
@@ -12,6 +12,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/_/./g:C/-.*$//}
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/scsl-jre15/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -28,4 +30,4 @@ post-extract:
 	${RM} -f ${WRKSRC}/jre
 	${LN} -s . ${WRKSRC}/jre
 
-.include "../../lang/scsl-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/scsl-jre15/DEINSTALL b/lang/scsl-jre15/DEINSTALL
new file mode 100644
index 00000000000..7fa8901058a
--- /dev/null
+++ b/lang/scsl-jre15/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/08/30 17:52:48 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@EMUL_ARCH@/client/classes.jsa
+	;;
+esac
diff --git a/lang/scsl-jre15/DEINSTALL.tmpl b/lang/scsl-jre15/DEINSTALL.tmpl
deleted file mode 100644
index a8e90fa27f7..00000000000
--- a/lang/scsl-jre15/DEINSTALL.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: DEINSTALL.tmpl,v 1.1 2006/05/15 19:44:07 tv Exp $
-
-case ${STAGE} in
-DEINSTALL)
-	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
-esac
diff --git a/lang/scsl-jre15/INSTALL.tmpl b/lang/scsl-jre15/INSTALL
index 49dc6e34723..4f49d26711d 100644
--- a/lang/scsl-jre15/INSTALL.tmpl
+++ b/lang/scsl-jre15/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2006/05/15 19:44:07 tv Exp $
+# $NetBSD: INSTALL,v 1.1 2007/08/30 17:52:49 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
diff --git a/lang/scsl-jre15/Makefile b/lang/scsl-jre15/Makefile
index b9408372198..42d2e89ae15 100644
--- a/lang/scsl-jre15/Makefile
+++ b/lang/scsl-jre15/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2006/06/18 08:45:56 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2007/08/30 17:52:50 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	jre-${DIST_VER}-${DIST_ARCH}
 PKGNAME=	scsl-jre15-${PKG_VER}
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 SHORT_NAME=	JRE
@@ -18,24 +19,22 @@ REQD_DIRS+=	${JAVA_HOME}/lib/images
 REQD_DIRS+=	${JAVA_HOME}/lib/images/cursors
 REQD_DIRS+=	${JAVA_HOME}/lib/security
 CONF_FILES=	# empty
+
+.include "../../lang/scsl-jre15/Makefile.common"
+
 .sinclude "sfiles.mk"
-.for f in ${SFILES}
-CONF_FILES+=	${JAVA_HOME}/lib/${f}.default ${JAVA_HOME}/lib/${f}
+
+.for FILE in ${SFILES}
+CONF_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
+CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scsl-jre15
 PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
-HEADER_TEMPLATES+=	${WRKDIR}/HEADER.tmpl
-INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL.tmpl
-DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL.tmpl
-FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-
-CHECK_FILES_SKIP+=	${JAVA_HOME}/lib/${MACHINE_ARCH}/client/classes.jsa
-
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
 PLIST_SUBST+=	SCSL_JRE15_USE_JCE=""
@@ -43,17 +42,40 @@ PLIST_SUBST+=	SCSL_JRE15_USE_JCE=""
 PLIST_SUBST+=	SCSL_JRE15_USE_JCE="@comment "
 .endif
 
+# Some of the binaries require libX11, so ensure that requirement is
+# satisfied when the package is installed on the native OS.
+#
+.if defined(EMUL_IS_NATIVE)
+.  if ${X11_TYPE} == "native"
+LIBX11=		${X11PREFIX}/lib/libX11.so.6
+.    if !exists(${LIBX11})
+PKG_FAIL_REASON+=	"${LIBX11} does not exist.  Please install the" \
+			"X11 library packages for your system."
+.    endif
+.  else
+.    include "../../x11/libX11/buildlink3.mk"
+LIBX11=		${X11PREFIX}/lib/libX11.so.6
+.  endif
+
+PLIST_SUBST+=		LIBX11=
+
+.PHONY: create-library-symlinks
+post-install: create-library-symlinks
+create-library-symlinks:
+	${RUN}${LN} -fs ${LIBX11} ${JAVA_HOME}/lib/${EMUL_ARCH}
+.else
+PLIST_SUBST+=		LIBX11="@comment "
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}/.systemPrefs
 	${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock
 	${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile
 
 do-configure:
-	set -e;								\
 	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
 		${MV} -f "$$file" "$$file".default;			\
 	done
-	@${ECHO} "CONF_FILES="${CONF_FILES:Q:Q} >${WRKDIR}/HEADER.tmpl
 
 pre-install:
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
@@ -75,4 +97,4 @@ makesfiles:
 		-name \*.cfg -o -name \*.security |			\
 	${SED} 's/^/SFILES+=	/' >>${PKGDIR}/sfiles.mk
 
-.include "../../lang/scsl-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/scsl-jre15/Makefile.common b/lang/scsl-jre15/Makefile.common
index c8e8fcac20c..187d56c60d2 100644
--- a/lang/scsl-jre15/Makefile.common
+++ b/lang/scsl-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2007/04/26 20:14:29 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2007/08/30 17:52:50 jlam Exp $
 
 DIST_VER=	1_5_0-p3-bin-duh1
 PKG_VER=	${DIST_VER:S/_/./g:S/-p/p/:S/-bin-duh/./}
@@ -19,12 +19,15 @@ NO_SRC_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-INTERACTIVE_STAGE=	fetch
-
-ONLY_FOR_PLATFORM=	NetBSD-[2-9].*-i386
+EMUL_PLATFORMS=		netbsd-i386
+EMUL_REQD=		netbsd>=2.0
+EMUL_MODULES.netbsd=	base
 
 .include "../../mk/bsd.prefs.mk"
 
+INTERACTIVE_STAGE=	fetch
+BUILD_DIRS=		# empty
+
 JAVA_HOME=	${LOCALBASE}/java/scsl-1.5
 JAVA_NAME=	scsl15
 JAVA_UNLIMIT=	datasize
@@ -36,8 +39,6 @@ MESSAGE_SUBST+=	JAVA_HOME=${JAVA_HOME:Q}
 # new class sharing in J2SE 5.0... -tvierling
 EXTRACT_ENV+=	UNPACK200_FLAGS=-Htrue
 
-NO_MTREE=	yes	# since we change PREFIX
-
 FETCH_MESSAGE=	"The file ${DISTNAME}${EXTRACT_SUFX} containing"
 FETCH_MESSAGE+=	"${DOWNLOAD_NAME} must be fetched into:"
 FETCH_MESSAGE+=	"	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"
@@ -47,11 +48,8 @@ FETCH_MESSAGE+=	""
 FETCH_MESSAGE+=	"Click ${SHORT_NAME} in the ${OPSYS}/${MACHINE_ARCH} row for version ${DIST_VER:S/_/./g:S/-bin-/-/},"
 FETCH_MESSAGE+=	"then read and accept the license to start the download."
 
-do-build:	# nothing
-
 do-install:
 	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
 	cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME}
 
 .include "../../mk/java-env.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/scsl-jre15/PLIST b/lang/scsl-jre15/PLIST
index 24a612d0f1d..d231ce06c17 100644
--- a/lang/scsl-jre15/PLIST
+++ b/lang/scsl-jre15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2006/05/15 19:44:07 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/08/30 17:52:50 jlam Exp $
 bin/scsl15-java
 bin/scsl15-keytool
 bin/scsl15-orbd
@@ -59,6 +59,7 @@ java/scsl-1.5/lib/i386/gtkhelper
 java/scsl-1.5/lib/i386/headless/libmawt.so
 java/scsl-1.5/lib/i386/jvm.cfg.default
 java/scsl-1.5/lib/i386/libJdbcOdbc.so
+${LIBX11}java/scsl-1.5/lib/i386/libX11.so.6
 java/scsl-1.5/lib/i386/libawt.so
 java/scsl-1.5/lib/i386/libcmm.so
 java/scsl-1.5/lib/i386/libdcpr.so