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

2 files changed, 23 insertions, 36 deletions

diff --git a/meta-pkgs/suse9/DESCR b/meta-pkgs/suse9/DESCR
index ba36805f7a6..6f592400d55 100644
--- a/meta-pkgs/suse9/DESCR
+++ b/meta-pkgs/suse9/DESCR
@@ -1,9 +1,8 @@
-The SuSE 9.1 meta-package provides a number of components for an
-SuSE-based Linux binary emulation environment, using other components
-of the NetBSD packages collection.
+The SUSE 9.1 meta-package provides a number of components for a
+SUSE-based Linux binary emulation environment.
 
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on other packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the other packages pulled in by the port/package dependency
+This package does not contain anything by itself -- it is a "meta-package"
+that depends on other packages.  Its sole purpose is to require
+dependencies so users can install this package only and have all the
+other packages pulled in automatically by the pkgsrc dependency
 mechanism.
diff --git a/meta-pkgs/suse9/Makefile b/meta-pkgs/suse9/Makefile
index a7abed14055..14cafaa65a8 100644
--- a/meta-pkgs/suse9/Makefile
+++ b/meta-pkgs/suse9/Makefile
@@ -1,42 +1,30 @@
-# $NetBSD: Makefile,v 1.6 2006/06/30 15:38:00 salo Exp $
-#
+# $NetBSD: Makefile,v 1.7 2007/07/29 05:19:35 jlam Exp $
 
-DISTNAME=	suse-9.1
-PKGREVISION=	3
+DISTNAME=	suse-${SUSE_VERSION}
+PKGREVISION=	4
 CATEGORIES=	meta-pkgs emulators
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	jdolecek@NetBSD.org
-COMMENT=	Provides a SuSE-based Linux binary emulation environment
-
-# This list should contain all suse91_* packages.
-#
-DEPENDS+=	suse_base-9.1{,nb*}:../../emulators/suse91_base
-DEPENDS+=	suse_aspell-9.1{,nb*}:../../emulators/suse91_aspell
-DEPENDS+=	suse_compat-9.1{,nb*}:../../emulators/suse91_compat
-DEPENDS+=	suse_expat-9.1{,nb*}:../../emulators/suse91_expat
-DEPENDS+=	suse_fontconfig-9.1{,nb*}:../../emulators/suse91_fontconfig
-DEPENDS+=	suse_freetype2-9.1{,nb*}:../../emulators/suse91_freetype2
-DEPENDS+=	suse_gdk-pixbuf-9.1{,nb*}:../../emulators/suse91_gdk-pixbuf
-DEPENDS+=	suse_glx-9.1{,nb*}:../../emulators/suse91_glx
-DEPENDS+=	suse_gtk-9.1{,nb*}:../../emulators/suse91_gtk
-DEPENDS+=	suse_gtk2-9.1{,nb*}:../../emulators/suse91_gtk2
-DEPENDS+=	suse_libjpeg-9.1{,nb*}:../../emulators/suse91_libjpeg
-DEPENDS+=	suse_libpng-9.1{,nb*}:../../emulators/suse91_libpng
-DEPENDS+=	suse_libtiff-9.1{,nb*}:../../emulators/suse91_libtiff
-DEPENDS+=	suse_locale-9.1{,nb*}:../../emulators/suse91_locale
-DEPENDS+=	suse_openmotif-9.1{,nb*}:../../emulators/suse91_openmotif
-DEPENDS+=	suse_slang-9.1{,nb*}:../../emulators/suse91_slang
-DEPENDS+=	suse_vmware-9.1{,nb*}:../../emulators/suse91_vmware
-DEPENDS+=	suse_x11-9.1{,nb*}:../../emulators/suse91_x11
-
-EXTRACT_ONLY=	# empty
+COMMENT=	SUSE-based Linux binary emulation environment
+
+.include "../../emulators/suse91_linux/Makefile.common"
+
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
 
 do-install:	# empty
 
+EMUL_MODULES.linux=	aspell base compat expat fontconfig freetype2	\
+			gdk-pixbuf glx gtk gtk2 jpeg locale motif png	\
+			slang tiff x11
+
+.if ${EMUL_PLATFORM} == "linux-i386"
+EMUL_MODULES.linux+=	vmware
+.endif
+
+EMUL_PKG_FMT=		plain
+
 .include "../../mk/bsd.pkg.mk"