* 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, 60 insertions, 84 deletions

diff --git a/www/opera/Makefile b/www/opera/Makefile
index 3f257c2a91d..365171ff54c 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2007/07/19 19:09:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.70 2007/07/29 05:20:00 jlam Exp $
 
 DISTNAME=		opera-${OPERA_PKG_VERSION:S/u/pl/}
 CATEGORIES=		www
@@ -14,57 +14,76 @@ MAINTAINER=		jdolecek@NetBSD.org
 HOMEPAGE=		http://www.opera.com/
 COMMENT=		Small, fast and customizable WWW client
 
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-sparc FreeBSD-*-i386 DragonFly-*-i386
-
 LICENSE=		opera-850-license
 
-#PKG_INSTALLATION_TYPES=	overwrite pkgviews
+EMUL_PLATFORMS=		freebsd-i386
+EMUL_PLATFORMS+=	linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
 
-NO_CONFIGURE=		YES
-USE_LANGUAGES=		# empty
+EMUL_MODULES.linux=	x11
+SUSE_VERSION_REQD=	7.3
 
-.include "../../mk/bsd.prefs.mk"
+USE_LANGUAGES=		# empty
+BUILD_DIRS=		# empty
+EMUL_PKG_FMT=		plain
 
 OPERA_LANG=		en
 OPERA_VER_DATE=		20070716
 OPERA_PKG_VERSION=	9.22
 OPERA_PKG_VERSION_DIR=	922
 
-_OPERA_OPSYS?=		${OPSYS}
-_OPERA_MACHINE_ARCH?=	${MACHINE_ARCH}
-
-.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly)
-DEPENDS+=		suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
+.include "../../mk/bsd.prefs.mk"
 
-# we need to define DIST_SUBDIR because of the inclusion of suse's Makefile.common
-DIST_SUBDIR=		# empty
-EXTRACT_ONLY=		# empty
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+# This package installs from an RPM directly into "/usr" on a Linux
+# system, which can't be managed by pkgsrc.
+#
+NOT_FOR_PLATFORMS=      Linux-*-*
 
+.if ${EMUL_PLATFORM} == "linux-i386"
 EXTRACT_SUFX=		.rpm
 OPERA_ARCH=		.i386
 OPERA_DIR=		linux/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${OPERA_ARCH:S/.//}/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/beta.*//:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-RPMFILES=		${DISTFILES}
-RPM2PKGSTRIP=		1
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
+
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+
+do-build:
+	${SED} -e 's#@EMULDIR@#${EMULDIR}#g'				\
+		${FILESDIR}/opera.sh > ${WRKDIR}/opera
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
+	${LN} -fs ${EMULDIR}/usr/share/man/man1/opera.1			\
+		${PREFIX}/${PKGMANDIR}/man1
+	${ECHO} "bin/opera" >> ${RPM2PKG_PLIST}
+	${ECHO} "${PKGMANDIR}/man1/opera.1" >> ${RPM2PKG_PLIST}
 
-.elif (${_OPERA_OPSYS} == FreeBSD)
+.elif ${EMUL_PLATFORM} == "freebsd-i386"
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386
+EXTRACT_SUFX=		.tar.bz2
 OPERA_ARCH=		.i386.freebsd
 OPERA_DIR=		unix/freebsd/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
 
 OWN_DIRS=		${PREFIX}/share/opera/plugins
 
-.elif (${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
+ONLY_FOR_PLATFORM+=	SunOS-*-sparc*
 EXTRACT_SUFX=		.tar.bz2
+SOLARIS_VERSION_REQD=	8
 OPERA_ARCH=		-sol8-sparc
-OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/${_OPERA_MACHINE_ARCH}/static
+OPERA_DIR=		unix/solaris/${OPERA_PKG_VERSION_DIR}/final/${OPERA_LANG}/sparc/static
 OPERA_DIST_VERSION=	${OPERA_PKG_VERSION:C/u.*//}-${OPERA_VER_DATE}.1-static-qt
 
-WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-641
+WRKSRC=			${WRKDIR}/opera-${OPERA_DIST_VERSION}${OPERA_ARCH}-${OPERA_LANG}-655
 
 BUILD_DEFS+=		INSTALL_ETC_OPERARC
 INSTALL_ETC_OPERARC?=	no
@@ -76,55 +95,23 @@ CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc \
 CONF_FILES+=		${PREFIX}/share/opera/config/opera6rc.fixed \
 			/etc/opera6rc.fixed
 .  endif
+.endif
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 PLIST_SUBST+=		OPERA_VER_DATE=${OPERA_VER_DATE:Q}
 PLIST_SUBST+=		OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//}
 
-.endif
-
-.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
-NO_BUILD=		YES
-
+.if ${EMUL_PKG_FMT} == "plain"
 SUBST_CLASSES+=		opera
 SUBST_STAGE.opera=	post-build
 SUBST_FILES.opera=	man/opera.1
 SUBST_SED.opera=	-e 's,/usr/,${PREFIX}/,g'
 
-.endif
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-build:
-.if (${_OPERA_OPSYS} == NetBSD) || (${_OPERA_OPSYS} == DragonFly)
-	@ ${SED} -e 's#@EMULDIR@#${EMULDIR}#g' ${FILESDIR}/opera.sh > \
-		${WRKDIR}/opera
-
-post-install: post-install-manpage
-	${INSTALL_SCRIPT} ${WRKDIR}/opera ${PREFIX}/bin
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(MANCOMPRESSED)
-USE_TOOLS+=		gzip
-.endif
-
-.PHONY: post-install-manpage
-post-install-manpage:
-# The SuSE common makefile defines "MANCOMPRESSED=yes".
-.  if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
-	${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \
-		${PREFIX}/${PKGMANDIR}/man1
-.  else
-	${GUNZIP_CMD} -c ${EMULDIR}/usr/share/man/man1/opera.1.gz >
-		${PREFIX}/${PKGMANDIR}/man1/opera.1
-.  endif
-.endif
-
-.if (((${_OPERA_OPSYS} == SunOS) && (${_OPERA_MACHINE_ARCH} == sparc)) || (${_OPERA_OPSYS} == FreeBSD))
 do-install:
-	@${ECHO} "n" > ${WRKSRC}/inst.cmd
-	@${ECHO} "n" >> ${WRKSRC}/inst.cmd
-	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd | ./install.sh --prefix=${PREFIX:Q}
+	@(${ECHO} "n"; ${ECHO} "n") > ${WRKSRC}/inst.cmd
+	@cd ${WRKSRC} && ${CAT} ${WRKSRC}/inst.cmd |			\
+		./install.sh --prefix=${PREFIX:Q}
 	@${ECHO} "=> You can ignore any previous lines about opera6rc"
 	@${ECHO}
 
@@ -132,18 +119,4 @@ post-install:
 	@${INSTALL_MAN} ${WRKSRC}/man/opera.1 ${PREFIX}/${PKGMANDIR}/man1
 .endif
 
-# regenerate distinfo for all ports supported by this package
-.PHONY: opera-distinfo
-opera-distinfo:
-	( ${ECHO} '$$'NetBSD'$$'; \
-	  ${ECHO} ''; \
-	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	_OPERA_OPSYS=SunOS _OPERA_MACHINE_ARCH=sparc make distinfo 1>&2; \
-		${GREP} opera distinfo; \
-	) > distinfo.new
-	${MV} -f distinfo.new distinfo
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/opera/PLIST b/www/opera/PLIST
deleted file mode 100644
index 9e5e7ce9021..00000000000
--- a/www/opera/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/04/30 22:25:15 tron Exp $
-bin/opera
-man/man1/opera.1
diff --git a/www/opera/PLIST.FreeBSD b/www/opera/PLIST.freebsd-i386
index 5cad4879e98..178e18ec027 100644
--- a/www/opera/PLIST.FreeBSD
+++ b/www/opera/PLIST.freebsd-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2005/04/30 22:25:15 tron Exp $
+@comment $NetBSD: PLIST.freebsd-i386,v 1.1 2007/07/29 05:20:01 jlam Exp $
 bin/opera
 man/man1/opera.1
 share/doc/opera/LICENSE
diff --git a/www/opera/PLIST.SunOS b/www/opera/PLIST.solaris-sparc
index 009cad1e6e4..194ad44825d 100644
--- a/www/opera/PLIST.SunOS
+++ b/www/opera/PLIST.solaris-sparc
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.SunOS,v 1.6 2007/06/25 21:35:48 dmcmahill Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:20:01 jlam Exp $
+bin/opera
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/missingsyms.so
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/opera
 lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/spellcheck.so
@@ -6,8 +7,8 @@ lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1/works
 lib/opera/plugins/libnpp.so
 lib/opera/plugins/operaplugincleaner
 lib/opera/plugins/operapluginwrapper
+man/man1/opera.1
 share/doc/opera/LICENSE
-share/man/man1/opera.1
 share/opera/chartables-be.bin
 share/opera/config/opera6rc
 share/opera/config/opera6rc.fixed
@@ -95,7 +96,6 @@ share/opera/svg-se.dat
 @dirrm share/opera/images
 @dirrm share/opera/config
 @dirrm share/opera
-@dirrm share/man/man1
 @dirrm share/doc/opera
 @dirrm lib/opera/plugins
 @dirrm lib/opera/${OPERA_PKG_VERSION}-${OPERA_VER_DATE}.1
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 09f02c56d29..461b15239b6 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.23 2007/07/19 19:09:44 xtraeme Exp $
+$NetBSD: distinfo,v 1.24 2007/07/29 05:20:02 jlam Exp $
 
+SHA1 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 98f0f101eb2c8b85f00faffe67790dd881dc9c2e
+RMD160 (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 925a9d010b1630426a2e4de429ec1583ea3cb099
+Size (opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2) = 6546833 bytes
 SHA1 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = bbbaf86776497dea8d25573f8cdb666e831e2881
 RMD160 (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 0ef0ae252497cc5c43835f590bc8dabd8ae8fa02
 Size (opera-9.22-20070716.1-static-qt.i386-en.rpm) = 7282798 bytes
+SHA1 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = e1dc46c7d113de4716ceaab5da4594bdb43139ed
+RMD160 (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = b9b48b4a7280f41177b274a55b0288e19a95f4f7
+Size (opera-9.22-20070716.1-static-qt-sol8-sparc-en.tar.bz2) = 8377666 bytes