diff options
author | jlam <jlam> | 2007-07-29 05:18:36 +0000 |
---|---|---|
committer | jlam <jlam> | 2007-07-29 05:18:36 +0000 |
commit | 275d7ca4f86079521544b7e820383bc271742a03 (patch) | |
tree | 45cad36d8470a568b9136017b2dd79c9efcc65bc /lang/sun-jre14 | |
parent | 838c2b6ce6faa38ac52676e60b80d81504e7827c (diff) | |
download | pkgsrc-275d7ca4f86079521544b7e820383bc271742a03.tar.gz |
* Add new emulator framework in pkgsrc/mk/emulator that handles all
binary-only packages that require binary "emulation" on the native
operating system. Please see pkgsrc/mk/emulator/README for more
details.
* Teach the plist framework to automatically use any existing
PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition.
* Convert all of the binary-only packages in pkgsrc to use the
emulator framework. Most of them have been tested to install and
deinstall correctly. This involves the following cleanup actions:
* Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM}
more consistently.
* Simplify packages by using default INSTALL and DEINSTALL scripts
instead of custom INSTALL/DEINSTALL code.
* Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc.
Packages only need to state exactly which emulations they support,
and the framework handles any i386-on-x86_64 or sparc-on-sparc64
uses.
* Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will
automatically detect when the package is installing on Linux.
Specific changes to packages include:
* Bump the PKGREVISIONs for all of the suse100* and suse91* packages
due to changes in the +INSTALL/+DEINSTALL scripts used in all
of the packages.
* Remove pkgsrc/emulators/suse_linux, which is unused by any
packages.
* cad/lc -- remove custom code to create the distinfo file for
all supported platforms; just use "emul-fetch" and "emul-distinfo"
instead.
* lang/Cg-compiler -- install the shared libraries under ${EMULDIR}
instead of ${PREFIX}/lib so that compiled programs will find
the shared libraries.
* mail/thunderbird-bin-nightly -- update to latest binary
distributions for supported platforms.
* multimedia/ns-flash -- update Linux version to 9.0.48 as the
older version is no longer available for interactive fetch.
* security/uvscan -- set LD_LIBRARY_PATH explicitly so that
it's not necessary to install library symlinks into
${EMULDIR}/usr/local/lib.
* www/firefox-bin-flash -- update Linux version to 9.0.48 as the
older version is no longer available for interactive fetch.
Diffstat (limited to 'lang/sun-jre14')
-rw-r--r-- | lang/sun-jre14/Makefile | 25 | ||||
-rw-r--r-- | lang/sun-jre14/Makefile.common | 47 | ||||
-rw-r--r-- | lang/sun-jre14/PLIST | 6 |
3 files changed, 38 insertions, 40 deletions
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index 0ec87ead9ba..e1d3a9c58f6 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2007/06/22 11:21:23 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2007/07/29 05:19:29 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce -DISTNAME= j2re-1_4_2_14-linux-i586 +DISTNAME= j2re-1_4_2_14-linux-${DIST_ARCH} PKGNAME= sun-jre14-2.14 PKGREVISION= 1 MASTER_SITES= # empty @@ -14,6 +14,9 @@ SHORT= JRE WRKSRC= ${WRKDIR}/j2re1.4.2_14 JAVA_WRAPPERS= java keytool orbd policytool rmid rmiregistry \ servertool tnameserv + +.include "../../lang/sun-jre14/Makefile.common" + REQD_DIRS= ${JAVA_HOME} REQD_DIRS+= ${JAVA_HOME}/lib REQD_DIRS+= ${JAVA_HOME}/lib/applet @@ -42,10 +45,21 @@ PLIST_SRC= ${WRKDIR}/PLIST .if !empty(PKG_OPTIONS:Msun-jre-jce) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip +PLIST_SUBST+= SUN_JRE14_USE_JCE="" + +END_MESSAGE= \ + "" \ + "The file jce_policy-1_4_2.zip must be fetched into:" \ + " ${DISTDIR}/jce_policy-1_4_2.zip" \ + "" \ + "Under 'Other Downloads' / 'Java Cryptography Extension'" \ + "click 'Download' and choose the .zip file." +.else +PLIST_SUBST+= SUN_JRE14_USE_JCE="@comment " .endif post-extract: - cd ${WRKSRC} && chmod -R go-w . + cd ${WRKSRC} && ${CHMOD} -R go-w . do-configure: cd ${WRKSRC}/lib; for file in ${SFILES}; do \ @@ -55,9 +69,6 @@ do-configure: pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security - ${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} -.else - ${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC} .endif -.include "../../lang/sun-jre14/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index 8dbfd5a5125..db0d55b4c64 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2007/04/21 20:26:13 rillig Exp $ +# $NetBSD: Makefile.common,v 1.36 2007/07/29 05:19:29 jlam Exp $ CATEGORIES= lang java EXTRACT_SUFX= .bin @@ -15,31 +15,31 @@ NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -INTERACTIVE_STAGE= fetch +EMUL_PLATFORMS= linux-i386 .include "../../mk/bsd.prefs.mk" +EMUL_MODULES.linux= locale x11 +.if !empty(EMUL_DISTRO:Msuse-[0-9].*) +EMUL_MODULES.linux+= compat +.endif + +DIST_ARCH.i386= i586 +.if defined(DIST_ARCH.${EMUL_ARCH}) +DIST_ARCH= ${DIST_ARCH.${EMUL_ARCH}} +.else +DIST_ARCH= ${EMUL_ARCH} +.endif + +INTERACTIVE_STAGE= fetch +BUILD_DIRS= # empty + JAVA_HOME= ${LOCALBASE}/java/sun-1.4 JAVA_NAME= sun14 JAVA_UNLIMIT= datasize MESSAGE_SUBST+= JAVA_HOME="${JAVA_HOME}" -NO_MTREE= yes # since we change PREFIX -LDD= ${TRUE} - -ONLY_FOR_PLATFORM= *-*-i386 - -.include "../../emulators/suse_linux/Makefile.application" - -.if !defined(USE_NATIVE_LINUX) -. if ${SUSE_DIR_PREFIX} == "suse91" -DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale -. endif -DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif - FETCH_MESSAGE= \ "The file ${DISTNAME}${EXTRACT_SUFX} containing:" \ " ${COMMENT}" \ @@ -55,26 +55,13 @@ FETCH_MESSAGE= \ EXTRACT_ENV+= HOME=${WRKDIR}/fake_home -.if !empty(PKG_OPTIONS:Msun-jre-jce) -END_MESSAGE= \ - "" \ - "The file jce_policy-1_4_2.zip must be fetched into:" \ - " ${DISTDIR}/jce_policy-1_4_2.zip" \ - "" \ - "Under 'Other Downloads' / 'Java Cryptography Extension'" \ - "click 'Download' and choose the .zip file." -.endif - post-fetch: @if [ ! -x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ ${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \ fi -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/sun-jre14/PLIST b/lang/sun-jre14/PLIST index a132233a487..2eef0fc94b2 100644 --- a/lang/sun-jre14/PLIST +++ b/lang/sun-jre14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2007/04/21 20:40:52 rillig Exp $ +@comment $NetBSD: PLIST,v 1.21 2007/07/29 05:19:29 jlam Exp $ bin/sun14-java bin/sun14-keytool bin/sun14-orbd @@ -188,8 +188,8 @@ java/sun-1.4/lib/plugin.jar java/sun-1.4/lib/psfont.properties.ja.default java/sun-1.4/lib/psfontj2d.properties.default java/sun-1.4/lib/rt.jar -@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/COPYRIGHT.html -@SUN_JRE14_USE_JCE@java/sun-1.4/lib/security/README.txt +${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/COPYRIGHT.html +${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/README.txt java/sun-1.4/lib/security/US_export_policy.jar java/sun-1.4/lib/security/cacerts java/sun-1.4/lib/security/java.policy |