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

5 files changed, 40 insertions, 22 deletions

diff --git a/www/opera-acroread/DEINSTALL b/www/opera-acroread/DEINSTALL
new file mode 100644
index 00000000000..dd9b50ced1b
--- /dev/null
+++ b/www/opera-acroread/DEINSTALL
@@ -0,0 +1,8 @@
+# $NetBSD: DEINSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $
+
+case "${STAGE}" in
+DEINSTALL)
+	dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so"
+	${RM} -f "$dest"
+	;;
+esac
diff --git a/www/opera-acroread/INSTALL b/www/opera-acroread/INSTALL
new file mode 100644
index 00000000000..a7a3ea8c50a
--- /dev/null
+++ b/www/opera-acroread/INSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:59 jlam Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+	src="${PKG_PREFIX}/@ACROREAD@/@ACRO_SUBDIR@/@ACRO_PLATFORM@/nppdf.so"
+	dest="${EMULDIR}/usr/lib/opera/plugins/nppdf.so"
+	${TEST} -f "$dest" || ${LN} -s "$src" "$dest"
+	;;
+esac
diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile
index 897672404ac..41ba6b5158c 100644
--- a/www/opera-acroread/Makefile
+++ b/www/opera-acroread/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/07/29 05:20:00 jlam Exp $
 
-DISTNAME=	opera-acroread-1.0
-PKGREVISION=		3
+DISTNAME=		opera-acroread-1.0
+PKGREVISION=		4
 
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 4 plugin for opera
@@ -15,3 +15,4 @@ ACROREAD=		Acrobat4
 ACRO_SUBDIR=		Browsers
 
 .include "../../www/opera-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common
index b7460344456..fb1db9f715f 100644
--- a/www/opera-acroread/Makefile.common
+++ b/www/opera-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/07/01 20:34:11 salo Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/07/29 05:20:00 jlam Exp $
 
 PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
@@ -6,26 +6,27 @@ MASTER_SITES=		# empty
 DISTFILES=		# empty
 
 DEPENDS+=		opera>=7.0:../../www/opera
-DEPENDS+=		suse_openmotif>=7.3:../../emulators/${SUSE_DIR_PREFIX}_openmotif
 
-ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
-PLATFORM=		intellinux
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	motif
+SUSE_VERSION_REQD=	7.3
+
+ACRO_PLATFORM=		intellinux
 
 WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		YES
 NO_CONFIGURE=		YES
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
+
+PLIST_SRC=		${PKGSRCDIR}/www/opera-acroread/PLIST
+
+FILES_SUBST+=		ACROREAD=${ACROREAD:Q}
+FILES_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR:Q}
+FILES_SUBST+=		ACRO_PLATFORM=${ACRO_PLATFORM:Q}
 
-PLIST_SRC=		../../www/opera-acroread/PLIST
-PLIST_SUBST+=		ACROREAD=${ACROREAD:Q}
-PLIST_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR:Q}
-PLIST_SUBST+=		PLATFORM=${PLATFORM:Q}
-NS_PLUGINS_DIR=		${PREFIX}/emul/linux/usr/lib/opera/plugins
+DEINSTALL_TEMPLATES+=	${PKGSRCDIR}/www/opera-acroread/DEINSTALL
+INSTALL_TEMPLATES+=	${PKGSRCDIR}/www/opera-acroread/INSTALL
 
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${LN} -s ${PREFIX}/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so \
-		${NS_PLUGINS_DIR}/nppdf.so
+INSTALLATION_DIRS+=	${EMULDIR}/usr/lib/opera/plugins
 
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
+do-install:	# nothing
diff --git a/www/opera-acroread/PLIST b/www/opera-acroread/PLIST
index 1b88d0e9452..fe58a735097 100644
--- a/www/opera-acroread/PLIST
+++ b/www/opera-acroread/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 16:20:25 jschauma Exp $
-@exec ${LN} -s %D/${ACROREAD}/${ACRO_SUBDIR}/${PLATFORM}/nppdf.so %D/emul/linux/usr/lib/opera/plugins/nppdf.so
-emul/linux/usr/lib/opera/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.3 2007/07/29 05:20:00 jlam Exp $
+@comment this plist intentionally left empty