Convert to emulator framework. Bump the PKGREVISIONs of the

firefox-bin-acroread* packages due to differences in how the
installed symlinks are managed.

6 files changed, 34 insertions, 31 deletions

diff --git a/www/firefox-bin-acroread/Makefile b/www/firefox-bin-acroread/Makefile
index cae7199934c..013a2de60e9 100644
--- a/www/firefox-bin-acroread/Makefile
+++ b/www/firefox-bin-acroread/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/30 16:12:56 jlam Exp $
 
-DISTNAME=	MozillaFirebird-bin-acroread-1.0
-PKGREVISION=		1
+DISTNAME=		MozillaFirebird-bin-acroread-1.0
+PKGREVISION=		2
 
 MAINTAINER=		kei@NetBSD.org
 COMMENT=		Acrobat Reader 4 plugin for firefox-bin
@@ -11,5 +11,7 @@ CONFLICTS+=		firefox-bin-acroread3-[0-9]*
 CONFLICTS+=		firefox-bin-acroread5-[0-9]*
 
 ACROREAD=		Acrobat4
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/firefox-bin-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-acroread/Makefile.common b/www/firefox-bin-acroread/Makefile.common
index 0892de6181b..78b618eefce 100644
--- a/www/firefox-bin-acroread/Makefile.common
+++ b/www/firefox-bin-acroread/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:12 rillig Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/07/30 16:12:56 jlam Exp $
 
 PKGNAME=		${DISTNAME:C|MozillaFirebird|firefox|}
 CATEGORIES=		www print
@@ -7,24 +7,24 @@ DISTFILES=		# empty
 
 DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
 
-ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
-PLATFORM=		intellinux
+EMUL_PLATFORMS=		linux-i386
+
+ACRO_PLATFORM=		intellinux
 
 WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		YES
 NO_CONFIGURE=		YES
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
+
+PLIST_SRC=		${PKGSRCDIR}/www/firefox-bin-acroread/PLIST
 
-PLIST_SRC=		../../www/firefox-bin-acroread/PLIST
-PLIST_SUBST+=		ACROREAD=${ACROREAD:Q}
-PLIST_SUBST+=		PLATFORM=${PLATFORM:Q}
-NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-linux/plugins
+FILES_SUBST+=		ACROREAD=${ACROREAD:Q}
+FILES_SUBST+=		ACRO_SUBDIR=${ACRO_SUBDIR:Q}
+FILES_SUBST+=		ACRO_PLATFORM=${ACRO_PLATFORM:Q}
 
-BROWSER?=		Browsers
+DEINSTALL_TEMPLATES+=	${PKGSRCDIR}/www/firefox-bin-acroread/DEINSTALL
+INSTALL_TEMPLATES+=	${PKGSRCDIR}/www/firefox-bin-acroread/INSTALL
 
-do-install:
-	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
-	${LN} -s ${PREFIX}/${ACROREAD}/${BROWSER}/${PLATFORM}/nppdf.so \
-		${NS_PLUGINS_DIR}/nppdf.so
+INSTALLATION_DIRS+=	${PREFIX}/lib/firefox-linux/plugins
 
-.include "../../mk/bsd.pkg.mk"
+do-install:	# nothing
diff --git a/www/firefox-bin-acroread/PLIST b/www/firefox-bin-acroread/PLIST
index 71fda87e409..41ce761748c 100644
--- a/www/firefox-bin-acroread/PLIST
+++ b/www/firefox-bin-acroread/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2004/02/10 12:26:24 grant Exp $
-@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/firefox-linux/plugins/nppdf.so
-lib/firefox-linux/plugins/nppdf.so
+@comment $NetBSD: PLIST,v 1.2 2007/07/30 16:12:56 jlam Exp $
+@comment this plist intentionally left empty
diff --git a/www/firefox-bin-acroread5/Makefile b/www/firefox-bin-acroread5/Makefile
index 42e95d0bb16..16157952515 100644
--- a/www/firefox-bin-acroread5/Makefile
+++ b/www/firefox-bin-acroread5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/07/30 16:12:57 jlam Exp $
 
-DISTNAME=	MozillaFirebird-bin-acroread5-1.0
-PKGREVISION=		1
+DISTNAME=		MozillaFirebird-bin-acroread5-1.0
+PKGREVISION=		2
 
 MAINTAINER=		kei@NetBSD.org
 COMMENT=		Acrobat Reader 5 plugin for firefox-bin
@@ -11,5 +11,7 @@ CONFLICTS+=		firefox-bin-acroread3-[0-9]*
 CONFLICTS+=		firefox-bin-acroread-[0-9]*
 
 ACROREAD=		Acrobat5
+ACRO_SUBDIR=		Browsers
 
 .include "../../www/firefox-bin-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-acroread7/Makefile b/www/firefox-bin-acroread7/Makefile
index a8407c5a1a9..98eb03fead7 100644
--- a/www/firefox-bin-acroread7/Makefile
+++ b/www/firefox-bin-acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/07/30 16:12:57 jlam Exp $
 
-DISTNAME=	MozillaFirebird-bin-acroread7-1.0
+DISTNAME=		MozillaFirebird-bin-acroread7-1.0
 PKGREVISION=		1
 
 MAINTAINER=		kei@NetBSD.org
@@ -12,6 +12,7 @@ CONFLICTS+=		firefox-bin-acroread3-[0-9]*
 CONFLICTS+=		firefox-bin-acroread-[0-9]*
 
 ACROREAD=		Acrobat7
-BROWSER=		Browser
+ACRO_SUBDIR=		Browser
 
 .include "../../www/firefox-bin-acroread/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-realplayer/Makefile b/www/firefox-bin-realplayer/Makefile
index 96fef6c5b1f..484fe6263bd 100644
--- a/www/firefox-bin-realplayer/Makefile
+++ b/www/firefox-bin-realplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/01/31 17:05:31 sketch Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/30 16:12:57 jlam Exp $
 
 DISTNAME= 		firefox-bin-realplayer-1.0
 PKGREVISION=		4
@@ -12,12 +12,11 @@ COMMENT=		RealAudio and RealVideo player plugin for firefox-bin
 DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
 DEPENDS+=		RealPlayerGold-[0-9]*:../../multimedia/RealPlayerGold
 
-ONLY_FOR_PLATFORM=	*-*-i386
+EMUL_PLATFORMS=		linux-i386
 
+NO_CHECKSUM=		yes
 WRKSRC=			${WRKDIR}
-NO_CHECKSUM=		YES
-NO_CONFIGURE=		YES
-NO_BUILD=		YES
+BUILD_DIRS=		# empty
 
 NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-linux/plugins
 PLUGIN_SOURCE=		${PREFIX}/lib/RealPlayer/mozilla/nphelix.so