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

10 files changed, 48 insertions, 137 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index ac8b0dfc732..f5566dc1dad 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2007/02/22 19:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/07/29 05:19:47 jlam Exp $
 
-DISTNAME=	acroread	# Overridden below
+DISTNAME=	acroread	# overridden below
 PKGNAME=	acroread-4.05
 PKGREVISION=	5
 CATEGORIES=	print
@@ -11,63 +11,45 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/products/acrobat/readstep2.html
 COMMENT=	View, distribute and print PDF documents
 
-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=	adobe-acrobat-license
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+LICENSE=		adobe-acrobat-license
 
-CHECK_SHLIBS_SUPPORTED=	no
-NO_BUILD=		yes
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-# Default (should be overridden below)
-PLATFORM=	unknown
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	osf1-alpha
+EMUL_PLATFORMS+=	solaris-i386 solaris-sparc
+EMUL_MODULES.linux=	x11
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-1.4[L-Z]-sparc \
-			NetBSD-1.[5-9]*-sparc NetBSD-[2-9]*-sparc \
-			SunOS-*-* DragonFly-*-i386
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	linux-ar-405
 PLATFORM=	intellinux
 WRKSRC=		${WRKDIR}/ILINXR.install
-. elif (${MACHINE_ARCH} == "alpha")
-.  if !exists(/emul/osf1/sbin/loader)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
-.  endif
+.elif ${EMUL_PLATFORM} == "osf1-alpha"
 DISTNAME=	fdec-rs-405
 PLATFORM=	alphaosf
 WRKSRC=		${WRKDIR}/AOSFRS.install
-. elif (${MACHINE_ARCH} == "sparc")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-DISTNAME=	sunsparc-rs-405
-WRKSRC=		${WRKDIR}/SSOLRS.install
-PLATFORM=	sparcsolaris
-. endif
-.include "../../emulators/suse_linux/Makefile.application"
-.elif ${OPSYS} == "SunOS"
-. if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
+.elif ${EMUL_PLATFORM} == "solaris-i386"
 DISTNAME=	sunx86-ar-405
 WRKSRC=		${WRKDIR}/SS86RS.install
 PLATFORM=	intelsolaris
-. else
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	sunsparc-rs-405
 WRKSRC=		${WRKDIR}/SSOLRS.install
 PLATFORM=	sparcsolaris
-. endif # i86pc
-
-# Solaris sparc + x86:
 PREPEND_PATH+=	/bin		# for "ed"
+
 post-patch:
 	${CHMOD} -R o+rwx ${WRKSRC}
-.endif # SunOS
+.else
+PLATFORM=	unknown
+.endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
 
@@ -101,8 +83,3 @@ post-install:
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-bla:
-	@echo OPSYS=${OPSYS}
-	@echo MACHINE_ARCH=${MACHINE_ARCH}
-	@echo PLATFORM=${PLATFORM}
diff --git a/print/acroread/PLIST.DragonFly-i386 b/print/acroread/PLIST.DragonFly-i386
deleted file mode 100644
index 08ec31c2e93..00000000000
--- a/print/acroread/PLIST.DragonFly-i386
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly-i386,v 1.1 2006/03/13 19:29:45 joerg Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
diff --git a/print/acroread/PLIST.SunOS-x86_64 b/print/acroread/PLIST.SunOS-x86_64
deleted file mode 100644
index 7d3eb53a2ee..00000000000
--- a/print/acroread/PLIST.SunOS-x86_64
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST.SunOS-x86_64,v 1.1 2006/11/27 13:18:10 obache Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/desktop/olwm/acroread.cetable
-Acrobat4/Reader/desktop/olwm/acroread.deskinstall
-Acrobat4/Reader/desktop/olwm/acroread.prog.icon
-Acrobat4/Reader/desktop/olwm/pdf.icon
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-@dirrm Acrobat4/Reader/desktop/olwm
-@dirrm Acrobat4/Reader/desktop
diff --git a/print/acroread/PLIST.NetBSD-i386 b/print/acroread/PLIST.linux-i386
index 86dfd8e11c9..bcb03c80c89 100644
--- a/print/acroread/PLIST.NetBSD-i386
+++ b/print/acroread/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
diff --git a/print/acroread/PLIST.alpha b/print/acroread/PLIST.osf1-alpha
index f0c63a300b0..94359229c4b 100644
--- a/print/acroread/PLIST.alpha
+++ b/print/acroread/PLIST.osf1-alpha
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.alpha,v 1.2 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.osf1-alpha,v 1.1 2007/07/29 05:19:49 jlam Exp $
 Acrobat4/Reader/help/search.pdf
 Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
diff --git a/print/acroread/PLIST.SunOS-i386 b/print/acroread/PLIST.solaris-i386
index c6fc459b4dc..213d7917eac 100644
--- a/print/acroread/PLIST.SunOS-i386
+++ b/print/acroread/PLIST.solaris-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.solaris-i386,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
diff --git a/print/acroread/PLIST.sparc b/print/acroread/PLIST.solaris-sparc
index e67cafa9de0..d3566992eb7 100644
--- a/print/acroread/PLIST.sparc
+++ b/print/acroread/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.2 2005/06/30 13:22:19 hubertf Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:49 jlam Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 64d33082d60..0e62832e953 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/10/14 08:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/07/29 05:19:50 jlam Exp $
 
-DISTNAME=	acroread5	# Overridden below
+DISTNAME=	acroread5	# overridden below
 PKGNAME=	acroread5-5.10
 PKGREVISION=	4
 CATEGORIES=	print
@@ -23,40 +23,22 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
 WRKSRC=			${WRKDIR}/installers
-CHECK_SHLIBS_SUPPORTED=	no
-NO_BUILD=		yes
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc*
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	x11
 
-# Default (overridden below)
-PLATFORM=	unknown
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-DISTNAME=	linux-5010
-PLATFORM=	intellinux
-. elif (${MACHINE_ARCH} == "sparc")
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.  endif
-DISTNAME=	solaris-5010
-PLATFORM=	sparcsolaris
-. elif (${MACHINE_ARCH} == "sparc64")
-.  if !exists(/emul/svr4_32/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4_32(8)'
-.  endif
-DISTNAME=	solaris-5010
-PLATFORM=	sparcsolaris
-. endif
-.elif ${OPSYS} == "Linux"
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	linux-5010
 PLATFORM=	intellinux
-.elif ${OPSYS} == "SunOS"
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	solaris-5010
 PLATFORM=	sparcsolaris
+.else
+PLATFORM=	unknown
 .endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
@@ -79,8 +61,4 @@ post-install:
 	@${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt"
 	${LN} -sf ${PREFIX}/bin/acroread5 ${PREFIX}/bin/acroread
 
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread5/PLIST.sparc b/print/acroread5/PLIST.solaris-sparc
index 0f24d25fcd8..ac27656034e 100644
--- a/print/acroread5/PLIST.sparc
+++ b/print/acroread5/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.2 2003/05/04 18:04:22 jmmv Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:50 jlam Exp $
 Acrobat5/Reader/help/search.pdf
 Acrobat5/Reader/${PLATFORM}/plug_ins/search.api
 Acrobat5/Reader/${PLATFORM}/plug_ins/acrosrch.uid
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 4ddaeb814e6..56c9442d248 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2007/01/11 11:52:17 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:19:50 jlam Exp $
 
-DISTNAME=	acroread7	# Overridden below
+DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
@@ -22,28 +22,19 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
 WRKSRC=			${WRKDIR}/AdobeReader
-CHECK_SHLIBS_SUPPORTED=	NO
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
 
-.include "../../mk/bsd.prefs.mk"
-
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat cups gtk2 locale
+SUSE_VERSION_REQD=	10.0
 
-# Default (overridden below)
-PLATFORM=	unknown
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-. if (${MACHINE_ARCH} == "i386")
-DEPENDS+=	suse_gtk2>=10.0:../../emulators/${SUSE_DIR_PREFIX}_gtk2
-DEPENDS+=	suse_libcups>=10.0:../../emulators/${SUSE_DIR_PREFIX}_libcups
-DEPENDS+=	suse_locale>=10.0:../../emulators/${SUSE_DIR_PREFIX}_locale
-DEPENDS+=	suse_compat>=10.0:../../emulators/${SUSE_DIR_PREFIX}_compat
-DISTNAME=	AdobeReader_enu-7.0.9-1.i386
-PLATFORM=	intellinux
-.endif
-.elif ${OPSYS} == "Linux"
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	AdobeReader_enu-7.0.9-1.i386
 PLATFORM=	intellinux
+.else
+PLATFORM=	unknown
 .endif
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
@@ -51,8 +42,8 @@ PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
 BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
 # Additional directories to search for fonts
-BUILD_DEFS+=	ACROREAD_FONTPATH
-ACROREAD_FONTPATH?= ${PREFIX}/lib/X11/fonts/TTF
+BUILD_DEFS+=		ACROREAD_FONTPATH
+ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
 
 INSTALLATION_DIRS=	bin
 
@@ -75,8 +66,4 @@ post-install:
 	${LN} -sf ${PREFIX}/bin/acroread7 ${PREFIX}/bin/acroread
 	${RM} ${PREFIX}/Acrobat7/Reader/${PLATFORM}/plug_ins/PPKLite.api
 
-# do not include the linux stuff if we are, for example, on a Solaris box
-. if (${MACHINE_ARCH} == "i386")
-.include "../../emulators/suse_linux/Makefile.application"
-.endif
 .include "../../mk/bsd.pkg.mk"