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

3 files changed, 48 insertions, 53 deletions

diff --git a/chat/aim/Makefile b/chat/aim/Makefile
index 68a449d6079..5b3a6c44b28 100644
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@@ -1,44 +1,47 @@
-# $NetBSD: Makefile,v 1.16 2007/07/14 04:39:17 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=	aim-1.5.286
+DISTNAME=	aim-1.5.286-1.i386
+PKGNAME=	aim-1.5.286
 PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://ftp.newaol.com/aimgen/380469/
-EXTRACT_SUFX=	-1.i386.rpm
-
-DIST_SUBDIR=	# empty
-RPMFILES=	${DISTFILES}
+EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.aim.com/
 COMMENT=	AOL Instant Messenger (SM)
 
-BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-do-install:
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${LOCALBASE}/sbin/rpm2pkg -d ${PREFIX} -f ${PLIST_SRC} \
-	        -p ${EMULSUBDIR} ${DISTDIR}/${DISTFILES}
-	${LN} -fs ../${EMULSUBDIR}/usr/bin/aim ${PREFIX}/bin/aim
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	base compat x11 gtk
 
-.include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.prefs.mk"
 
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=	suse_base>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_base
-DEPENDS+=	suse_compat>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_gtk>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_gtk
+# This package installs from an RPM directly into "/usr" on a Linux
+# system, which can't be managed by pkgsrc unless ${LOCALBASE} == "/usr".
+#
+.if (${OPSYS} == "Linux") && (${LOCALBASE} != "/usr")
+NOT_FOR_PLATFORMS=	Linux-*-*
 .endif
 
-ONLY_FOR_PLATFORM= *-*-i386
-
-WRKSRC=		${WRKDIR}
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EXTRACT_ONLY=	# nothing
-PLIST_SRC=	${WRKDIR}/PLIST.rpm
-PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+.if (${OPSYS} == "Linux") && (${LOCALBASE} == "/usr")
+RPM2PKG_STRIP=		1
+.else
+RPM2PKG_STRIP=		0
+.endif
+RPM2PKG_STAGE=		do-install
 
 INSTALLATION_DIRS=	bin
 
+.if ${OPSYS} != "Linux"
+post-install:
+	${LN} -fs ${EMULDIR}/usr/bin/aim ${PREFIX}/bin/aim
+	${ECHO} "bin/aim" >> ${RPM2PKG_PLIST}
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/aim/PLIST b/chat/aim/PLIST
deleted file mode 100644
index 8ee51b05d31..00000000000
--- a/chat/aim/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/22 18:40:00 fredb Exp $
-bin/aim
diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile
index f561b7ad445..7c06ed51724 100644
--- a/chat/ymessenger/Makefile
+++ b/chat/ymessenger/Makefile
@@ -1,30 +1,15 @@
-# $NetBSD: Makefile,v 1.17 2007/07/14 04:39:17 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/07/29 05:18:37 jlam Exp $
 
-DISTNAME=		ymessenger-1.0.4
+DISTNAME=		rh9.ymessenger-1.0.4-1.i386
+PKGNAME=		ymessenger-1.0.4
 CATEGORIES=		chat
 MASTER_SITES=		http://download.yahoo.com/dl/unix/
-DISTFILES=		rh9.${DISTNAME}-1.i386.rpm
+EXTRACT_SUFX=		.rpm
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://messenger.yahoo.com/
 COMMENT=		Yahoo! instant messaging client
 
-RPMFILES=		${DISTFILES}
-
-.include "../../emulators/suse_linux/Makefile.application"
-
-EMULSUBDIR=		emul/linux
-
-.if !defined(USE_NATIVE_LINUX)
-DEPENDS+=		suse_compat>=6.4:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=		suse_gtk>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gtk
-DEPENDS+=		suse_gdk-pixbuf>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gdk-pixbuf
-.endif
-
-ONLY_FOR_PLATFORM=	*-*-i386
-
-DIST_SUBDIR=		# empty
-
 LICENSE=		generic-nonlicense
 RESTRICTED=		Commercial software (no permission to copy is evident).
 NO_SRC_ON_FTP=		${RESTRICTED}
@@ -32,15 +17,24 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-EXTRACT_ONLY=		# empty
-NO_BUILD=		yes
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
+EMUL_PLATFORMS=		linux-i386
+EMUL_MODULES.linux=	compat gtk gdk-pixbuf
+
+WRKSRC=			${WRKDIR}
+BUILD_DIRS=		# empty
 
-EMUL_YMESSENGER=	${PREFIX}/${EMULSUBDIR}/opt/ymessenger/bin/ymessenger
+EMUL_PKG_FMT=		rpm
+RPM2PKG_PREFIX=		${PREFIX}
+RPM2PKG_SUBPREFIX=	${EMULSUBDIR}
+RPM2PKG_STAGE=		do-install
+RPMIGNOREFILES=		./usr
+
+EMUL_YMESSENGER=	${EMULDIR}/opt/ymessenger/bin/ymessenger
 YMESSENGER=		${PREFIX}/bin/ymessenger
+
 post-install:
-	${SED} '1 s,bin,${EMULSUBDIR}/bin,' < ${EMUL_YMESSENGER} > ${YMESSENGER}
+	${SED} '1 s,bin,${EMULSUBDIRSLASH}bin,'				\
+		${EMUL_YMESSENGER} > ${YMESSENGER}
 	${CHMOD} 755 ${YMESSENGER}
 
 .include "../../mk/bsd.pkg.mk"