[pkgsrc/trunk]: pkgsrc/lang * Convert to use the pkgsrc emulator framework. ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang * Convert to use the pkgsrc emulator framework. ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:15:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4617e7ba721
branches:  trunk
changeset: 532782:f4617e7ba721
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 30 17:52:48 2007 +0000

description:
* 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.

diffstat:

 lang/scsl-jdk15/Makefile        |   6 +++-
 lang/scsl-jre15/DEINSTALL       |   7 +++++
 lang/scsl-jre15/DEINSTALL.tmpl  |   6 ----
 lang/scsl-jre15/INSTALL         |   6 ++++
 lang/scsl-jre15/INSTALL.tmpl    |   6 ----
 lang/scsl-jre15/Makefile        |  50 +++++++++++++++++++++++++++++-----------
 lang/scsl-jre15/Makefile.common |  16 +++++-------
 lang/scsl-jre15/PLIST           |   3 +-
 8 files changed, 62 insertions(+), 38 deletions(-)

diffs (228 lines):

diff -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jdk15/Makefile
--- a/lang/scsl-jdk15/Makefile  Thu Aug 30 17:20:06 2007 +0000
+++ b/lang/scsl-jdk15/Makefile  Thu Aug 30 17:52:48 2007 +0000
@@ -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 @@
 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 @@
        ${RM} -f ${WRKSRC}/jre
        ${LN} -s . ${WRKSRC}/jre
 
-.include "../../lang/scsl-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/DEINSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scsl-jre15/DEINSTALL Thu Aug 30 17:52:48 2007 +0000
@@ -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 -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/DEINSTALL.tmpl
--- a/lang/scsl-jre15/DEINSTALL.tmpl    Thu Aug 30 17:20:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/scsl-jre15/INSTALL   Thu Aug 30 17:52:48 2007 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: INSTALL,v 1.1 2007/08/30 17:52:49 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+       ${PREFIX}/bin/scsl15-java -Xshare:dump;;
+esac
diff -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/INSTALL.tmpl
--- a/lang/scsl-jre15/INSTALL.tmpl      Thu Aug 30 17:20:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: INSTALL.tmpl,v 1.1 2006/05/15 19:44:07 tv Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-       ${PREFIX}/bin/scsl15-java -Xshare:dump;;
-esac
diff -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/Makefile
--- a/lang/scsl-jre15/Makefile  Thu Aug 30 17:20:06 2007 +0000
+++ b/lang/scsl-jre15/Makefile  Thu Aug 30 17:52:48 2007 +0000
@@ -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/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="@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 @@
                -name \*.cfg -o -name \*.security |                     \
        ${SED} 's/^/SFILES+=    /' >>${PKGDIR}/sfiles.mk
 
-.include "../../lang/scsl-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/Makefile.common
--- a/lang/scsl-jre15/Makefile.common   Thu Aug 30 17:20:06 2007 +0000
+++ b/lang/scsl-jre15/Makefile.common   Thu Aug 30 17:52:48 2007 +0000
@@ -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_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 @@
 # 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+=        "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 -r ab2cfc68acca -r f4617e7ba721 lang/scsl-jre15/PLIST
--- a/lang/scsl-jre15/PLIST     Thu Aug 30 17:20:06 2007 +0000
+++ b/lang/scsl-jre15/PLIST     Thu Aug 30 17:52:48 2007 +0000
@@ -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/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
Prev by Date: [pkgsrc/trunk]: pkgsrc/chat bl3 on gettext-lib, PKGREVISION++
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/mkcmd Fix path to self. Bump revision.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/chat bl3 on gettext-lib, PKGREVISION++
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/mkcmd Fix path to self. Bump revision.
Indexes:
Home | Main Index | Thread Index | Old Index