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

8 files changed, 62 insertions, 129 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 1dd2485b04c..51a6af45e3d 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,66 +1,43 @@
-# $NetBSD: Makefile,v 1.35 2007/07/03 13:31:31 sborrill Exp $
-#
+# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:46 jlam Exp $
 
-# A default so lintpkgsrc is happy, overridden below
-DISTNAME=	citrix
-PKGNAME=	citrix_ica-10.6.115659
+DISTNAME=	citrix_ica-10.6.115659
 CATEGORIES=	net
-MASTER_SITES=	http://download2.citrix.com/FILES/en/products/Linux10/
+MASTER_SITES=	# empty
 
 MAINTAINER=	sborrill@NetBSD.org
 HOMEPAGE=	http://www.citrix.com/English/SS/downloads/downloads.asp?dID=2755
 COMMENT=	Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
 
-.include "../../mk/bsd.prefs.mk"
+LICENSE=		citrix_ica-license
+RESTRICTED=		License prohibits redistribution
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc
-ONLY_FOR_PLATFORM+=	DragonFly-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS+=	solaris-sparc
+EMUL_MODULES.linux=	locale motif x11
 
-.if ${OPSYS} == "NetBSD"
-.  if ${MACHINE_ARCH} == "i386"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=	en.linuxx86
 PKGNAME=	citrix_ica-10.6.115659
-.  elif ${MACHINE_ARCH} == "sparc"
-DISTNAME=	en.solaris
-PKGNAME=	citrix_ica-8.46.110465
-MASTER_SITES=	http://www.citrix.com/site/resources/dynamic/software/
-EXTRACT_SUFX=	.tar.Z
-.  endif
-.elif ${OPSYS} == "SunOS"
+MASTER_SITES=	http://download2.citrix.com/FILES/en/products/Linux10/
+.elif ${EMUL_PLATFORM} == "solaris-sparc"
 DISTNAME=	en.solaris
 PKGNAME=	citrix_ica-8.46.110465
 MASTER_SITES=	http://www.citrix.com/site/resources/dynamic/software/
 EXTRACT_SUFX=	.tar.Z
-.elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
-DISTNAME=	en.linuxx86
-PKGNAME=	citrix_ica-10.0.110003
 .endif
 
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
-DEPENDS+=        suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=        suse_openmotif>=6.4:../../emulators/${SUSE_DIR_PREFIX}_openmotif
-DEPENDS+=        suse_locale>=6.4:../../emulators/${SUSE_DIR_PREFIX}_locale
-.endif
-
-LICENSE=		citrix_ica-license
-RESTRICTED=		License prohibits redistribution
-NO_SRC_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 CDIR=		${PREFIX}/lib/ICAClient
 USE_TOOLS+=	patch
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc"
-.  if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	"${PKGNAME} requires SVR4 compability - see compat_svr4(8)"
-.  endif
-.endif
-
 INSTALLATION_DIRS=	bin
 
 do-patch:
@@ -78,7 +55,14 @@ do-build:
 		> ${WRKSRC}/wfica.x
 
 pre-install:
-	if [ -d "${CDIR}" ]; then                                      \
+	${RUN} if [ `${ID} -u` != 0 ]; then				\
+		${ECHO} "";                                             \
+		${ECHO} "*** ${PKGNAME} must be installed with"		\
+			"superuser privileges ***";			\
+		${ECHO} "";                                             \
+		${FALSE};						\
+	fi
+	${RUN} if [ -d "${CDIR}" ]; then				\
 		${ECHO} "";                                             \
 		${ECHO} "*** Please remove ${CDIR} and try again ***";  \
 		${ECHO} "";                                             \
@@ -93,8 +77,4 @@ do-install:
 		< ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed
 	${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh
 
-.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386"
-.  include "../../emulators/suse_linux/Makefile.application"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/citrix_ica/PLIST.i386 b/net/citrix_ica/PLIST.linux-i386
index b16762a06ef..a01e0db3ca0 100644
--- a/net/citrix_ica/PLIST.i386
+++ b/net/citrix_ica/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.5 2007/03/05 18:01:03 sborrill Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:46 jlam Exp $
 lib/ICAClient/CHARICONV.DLL
 lib/ICAClient/pkginf/F.core.linuxx86
 lib/ICAClient/pkginf/Ver.core.linuxx86
diff --git a/net/citrix_ica/PLIST.sparc b/net/citrix_ica/PLIST.solaris-sparc
index 42dca2d4097..abf94b5ad4d 100644
--- a/net/citrix_ica/PLIST.sparc
+++ b/net/citrix_ica/PLIST.solaris-sparc
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.sparc,v 1.4 2007/03/05 18:01:03 sborrill Exp $
+@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:46 jlam Exp $
 lib/ICAClient/.config/appsrv.ini
 lib/ICAClient/.config/keyboard.ini
 lib/ICAClient/.config/module.ini
diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile
index f1c4ced006f..4d92e579b25 100644
--- a/net/edonkey2k/Makefile
+++ b/net/edonkey2k/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=	donkey
@@ -12,23 +12,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.edonkey2000.com/
 COMMENT=	Yet another P2P file sharing tool
 
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-WRKSRC=		${WRKDIR}
-NO_BUILD=	YES
-NO_CONFIGURE=	YES
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
 INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/overnet/Makefile b/net/overnet/Makefile
index 132ff73a754..d09421aef81 100644
--- a/net/overnet/Makefile
+++ b/net/overnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=	overnetclc-1.0.1
@@ -12,29 +12,19 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.overnet.com/
 COMMENT=	Peer-to-peer file sharing client (binary pkg)
 
-BUILD_DEPENDS+=	rpm2pkg-[0-9]*:../../pkgtools/rpm2pkg
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat
 
-WRKSRC=		${WRKDIR}
-EXTRACT_ONLY=	# empty
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EVAL_PREFIX=	RPM2PKGDIR=rpm2pkg
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PLIST=		# empty
+RPM2PKG_STRIP=		0
+RUN_LDCONFIG=		no
 
 INSTALLATION_DIRS=	bin
 
-do-extract:
-	${RPM2PKGDIR}/sbin/rpm2pkg -d ${WRKDIR}				\
-		${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/overnetclc
diff --git a/net/skype/Makefile b/net/skype/Makefile
index fa3db268811..26f7aeba152 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/28 07:54:05 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2007/07/29 05:19:47 jlam Exp $
 #
 
 DISTNAME=		skype_staticQT-1.2.0.18
@@ -12,30 +12,18 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.skype.com/
 COMMENT=		P2P VoIP software
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_glx-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_glx
-DEPENDS+=	suse_fontconfig-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_fontconfig
-DEPENDS+=	suse_freetype2-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_freetype2
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-.else
-.include "../../mk/x11.buildlink3.mk"
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-NO_CONFIGURE=		yes
-USE_DIRS+=		xdg-1.1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
 RESTRICTED=		Redistribution not allowed yet.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=		skype-license
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base fontconfig freetype2 glx x11
+
+USE_DIRS+=		xdg-1.1
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
 DATADIR=		${PREFIX}/share/skype
 DOCDIR=			${PREFIX}/share/doc/skype
 
diff --git a/net/teamspeak-client/Makefile b/net/teamspeak-client/Makefile
index 683f34ce6cc..0dd8270d5d3 100644
--- a/net/teamspeak-client/Makefile
+++ b/net/teamspeak-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/05/01 11:34:05 abs Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:47 jlam Exp $
 
 PKGNAME=		teamspeak-client-2.0.32.60
 DISTNAME=		ts2_client_rc2_2032
@@ -11,27 +11,17 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.goteamspeak.com/
 COMMENT=		Teamspeak group VoIP client
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_libjpeg-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_libjpeg
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-NO_CONFIGURE=		yes
-USE_LANGUAGES=
-
-PLIST_SRC=		${WRKDIR}/PLIST
-
 RESTRICTED=		Redistribution to third parties is expressly prohibited
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 LICENSE=		teamspeak-license-200700213
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base jpeg x11
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/setup.data/image
 LIB_DIR=	${PREFIX}/lib/teamspeak-client
 DOC_DIR=	${PREFIX}/share/doc/teamspeak-client
diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile
index a2211a9c0c8..02a6438e5b8 100644
--- a/net/teamspeak-server/Makefile
+++ b/net/teamspeak-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/04 20:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/07/29 05:19:47 jlam Exp $
 
 PKGNAME=		teamspeak-server-2.0.23.15
 DISTNAME=		ts2_server_rc2_20201
@@ -14,26 +14,19 @@ MAINTAINER=		abs@NetBSD.org
 HOMEPAGE=		http://www.goteamspeak.com/
 COMMENT=		Teamspeak group VoIP server
 
-.include "../../emulators/suse_linux/Makefile.application"
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_base
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-RCD_SCRIPTS=		teamspeak
-NO_CONFIGURE=		yes
-USE_LANGUAGES=
-
-PLIST_SRC=		${WRKDIR}/PLIST
-
 RESTRICTED=             Redistribution to third parties is expressly prohibited
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 NO_BIN_ON_FTP=          ${RESTRICTED}
 NO_BIN_ON_CDROM=        ${RESTRICTED}
 LICENSE=		teamspeak-license-200700213
 
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base
+
+RCD_SCRIPTS=		teamspeak
+
+PLIST_SRC=		${WRKDIR}/PLIST
+
 WRKSRC=		${WRKDIR}/tss2_rc2
 EGDIR=		${PREFIX}/share/examples
 LIB_DIR=	${PREFIX}/lib/teamspeak-server