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

3 files changed, 34 insertions, 79 deletions

diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile
index 454634006c7..d9d74c50a36 100644
--- a/cad/eagle/Makefile
+++ b/cad/eagle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/22 22:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:36 jlam Exp $
 #
 
 DISTNAME=		eagle-lin-eng-4.14
@@ -12,14 +12,6 @@ MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.cadsoft.de/
 COMMENT=		Easy to use printed circuit board editor
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
 RESTRICTED=		Redistribution not permitted
 LICENSE=		fee-based-commercial-use
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -27,7 +19,10 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-NO_BUILD=		YES
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	x11
+
+BUILD_DIRS=		# empty
 INSTALLATION_DIRS=	bin
 
 do-configure:
diff --git a/cad/lc/Makefile b/cad/lc/Makefile
index a21881a3fd9..07b9bd461c9 100644
--- a/cad/lc/Makefile
+++ b/cad/lc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2007/02/24 03:43:49 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=	lc	# Overridden below
+DISTNAME=	lc	# overridden below
 PKGNAME=	lc-2.10
 PKGREVISION=	2
 CATEGORIES=	cad
@@ -12,75 +12,44 @@ COMMENT=	Finite Difference Time Domain (FDTD) Electromagnetic Simulator
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-RESTRICTED=	Original installer required to redistribute.
+RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		lc-license
-CHECK_SHLIBS_SUPPORTED=	no
 
-WRKSRC=		${WRKDIR}/lc2.10
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}/lc2.10
+BUILD_DIRS=		# empty
+
+EMUL_PLATFORMS=		irix-mipsel irix-mipsel64
+EMUL_PLATFORMS+=	linux-i386 linux-x86_64
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	motif x11
+SUSE_VERSION_REQD=	9.1
 
 .include "../../mk/bsd.prefs.mk"
 
-# With this, we can run
-#  make makesum MAINTAINER_MODE=yes
-# and process all the possible distfiles without regard to what platform we're on
-.if defined(MAINTAINER_MODE)
-DISTFILES=	lc_doc.tar.gz
-DISTFILES+=	lc_amd64_lx24.tar.gz
-DISTFILES+=	lc_irix.tar.gz
-DISTFILES+=	lc_irix64.tar.gz
-DISTFILES+=	lc_linux_motif1.tar.gz
-DISTFILES+=	lc_linux_motif3.tar.gz
-DISTFILES+=	lc_solaris.tar.gz
+DISTFILES=		lc_doc.tar.gz
+.if ${EMUL_PLATFORM} == "linux-i386"
+DISTFILES+=		lc_linux_motif3.tar.gz
+.elif ${EMUL_PLATFORM} == "linux-x86_64"
+DISTFILES+=		lc_amd64_lx24.tar.gz
+.elif ${EMUL_PLATFORM} == "irix-mipsel"
+DISTFILES+=		lc_irix.tar.gz
+.elif ${EMUL_PLATFORM} == "irix-mipsel64"
+DISTFILES+=		lc_irix64.tar.gz
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+DISTFILES+=		lc_solaris.tar.gz
+.endif
 
+.if ${EMUL_PLATFORM} == "linux-x86_64"
+WRKSRC=			${WRKDIR}/lc
+PLIST_SUBST+=		HAVE_LCSPICE="@comment "
 .else
-
-
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-mipsel *-*-mipsel64
-ONLY_FOR_PLATFORM+=	*-*-sparc *-*-sparc64 *-*-x86_64
-
-.if (${MACHINE_ARCH} == "x86_64")
-DISTNAME=	lc_amd64_lx24
-. if (${OPSYS} == "NetBSD")
-DEPENDS+=	suse_openmotif>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=	suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-. endif
-WRKSRC=		${WRKDIR}/lc
-HAVE_LCSPICE=	"@comment "
-
-.elif ${MACHINE_ARCH} == "mipsel"
-DISTNAME=	lc_irix
-
-.elif ${MACHINE_ARCH} == "mipsel64"
-DISTNAME=	lc_irix64
-
-.elif (${MACHINE_ARCH} == "i386")
-#DISTNAME=	lc_linux_motif1
-DISTNAME=	lc_linux_motif3
-. if (${OPSYS} == "NetBSD")
-DEPENDS+=	suse_openmotif>=9.1:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=	suse_x11>=9.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-. endif
-
-.elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	lc_solaris
-. if (${OPSYS} == "NetBSD")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-. endif
+PLIST_SUBST+=		HAVE_LCSPICE=""
 .endif
 
-HAVE_LCSPICE?=	""
-
-PLIST_SUBST+=	HAVE_LCSPICE=${HAVE_LCSPICE}
-
-DISTFILES=	lc_doc.tar.gz ${DISTNAME}${EXTRACT_SUFX}
-
 INSTALLATION_DIRS=	bin share
 
 do-install:
@@ -88,14 +57,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/lcplot ${PREFIX}/bin/lcplot
 	if test -f ${WRKSRC}/bin/spice ; then ${INSTALL_PROGRAM} ${WRKSRC}/bin/spice ${PREFIX}/bin/lcspice ; fi
 	cd ${PREFIX}/share && ${TAR} -zxf ${DISTDIR}/${DIST_SUBDIR}/lc_doc.tar.gz
-	${CHMOD} -R 644 ${PREFIX}/share/lc2.10
+	${CHMOD} -R ugo+rX ${PREFIX}/share/lc2.10
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/lc2.10
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/lc2.10
 
-.endif # !MAINTAINER
-
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/lc/distinfo b/cad/lc/distinfo
index 2e69043a3dc..04d30ba06a6 100644
--- a/cad/lc/distinfo
+++ b/cad/lc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2007/02/24 00:17:58 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2007/07/29 05:18:37 jlam Exp $
 
 SHA1 (lc-2.10/lc_amd64_lx24.tar.gz) = c750c470ca43047fa0ccb1029bdfc08874214491
 RMD160 (lc-2.10/lc_amd64_lx24.tar.gz) = a03c53018827e13167a26f27926ebe2b3bbf5846
@@ -12,9 +12,6 @@ Size (lc-2.10/lc_irix.tar.gz) = 2658949 bytes
 SHA1 (lc-2.10/lc_irix64.tar.gz) = cc616e039fe33e39b75680029f34730efda47494
 RMD160 (lc-2.10/lc_irix64.tar.gz) = 1b72abfae4da8ec8f3e22ee6b9e027d8cc0c60d0
 Size (lc-2.10/lc_irix64.tar.gz) = 2864612 bytes
-SHA1 (lc-2.10/lc_linux_motif1.tar.gz) = 7f46aa7846466649a57addde5ce30d6989353664
-RMD160 (lc-2.10/lc_linux_motif1.tar.gz) = ed2e7caad443dfaebc3df37765b5a563843e6653
-Size (lc-2.10/lc_linux_motif1.tar.gz) = 3020285 bytes
 SHA1 (lc-2.10/lc_linux_motif3.tar.gz) = e750aa83d3bd681abd96934fa8dcea2cf9050643
 RMD160 (lc-2.10/lc_linux_motif3.tar.gz) = 9a552a217bc743bd872ac475e26207bdb1708851
 Size (lc-2.10/lc_linux_motif3.tar.gz) = 8773141 bytes