From 275d7ca4f86079521544b7e820383bc271742a03 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 29 Jul 2007 05:18:36 +0000
Subject: * 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.
---
 lang/sun-jdk15/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lang/sun-jdk15')

diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 9bdf9988cd6..91211c3c270 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2007/02/07 13:07:50 abs Exp $
+# $NetBSD: Makefile,v 1.25 2007/07/29 05:19:28 jlam Exp $
 
-DISTNAME=	jdk-1_5_0_11-linux-i586
+DISTNAME=	jdk-1_5_0_11-linux-${DIST_ARCH}
 PKGNAME=	sun-jdk15-5.0.11
 MASTER_SITES=	# empty
 
@@ -8,11 +8,12 @@ SHORT_NAME=	JDK
 
 DEPENDS+=	${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15
 
-CHECK_SHLIBS=	no	# One of the demos is broken.
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//}
 JAVA_WRAPPERS=	appletviewer apt extcheck idlj jar jarsigner \
 		javac javadoc javah javap jdb rmic serialver
 
+.include "../../lang/sun-jre15/Makefile.common"
+
 # Remove parts that are in common with the JRE
 #
 post-extract:
@@ -26,4 +27,4 @@ post-extract:
 	done
 	${LN} -sf . ${WRKSRC}/jre
 
-.include "../../lang/sun-jre15/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3