Make this work on Solaris/x86: split PLIST.i386 in NetBSD- and Solaris-

specific versions. Tested on Solaris 9/x86 and NetBSD 2.0/i386.
Bump revision to nb2.

7 files changed, 51 insertions, 12 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 6882a5ce48a..ddd882078bb 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.41 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/06/30 13:22:19 hubertf Exp $
 
 DISTNAME=	acroread	# Overridden below
 PKGNAME=	acroread-4.05
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
+MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/ \
+		http://download.adobe.com/pub/adobe/acrobatreader/unix/4.x/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.adobe.com/prodindex/acrobat/readstep.html
@@ -49,14 +50,23 @@ PLATFORM=	sparcsolaris
 . endif
 ONLY_FOR_PLATFORM=	*-*-i386 *-1.4[L-Z]-sparc *-1.[5-9]*-sparc *-[2-9]*-sparc
 # *-*-alpha
+.include "../../emulators/suse_linux/Makefile.application"
 .elif ${OPSYS} == "SunOS"
+. if (${MACHINE_ARCH} == "i386")
+DISTNAME=	sunx86-ar-405
+WRKSRC=		${WRKDIR}/SS86RS.install
+PLATFORM=	intelsolaris
+. else
 DISTNAME=	sunsparc-rs-405
 WRKSRC=		${WRKDIR}/SSOLRS.install
 PLATFORM=	sparcsolaris
+. endif # i86pc
 
+ # Solaris sparc + x86:
+PREPEND_PATH=	/bin		# for "ed"
 post-patch:
 	${CHMOD} -R o+rwx ${WRKSRC}
-.endif
+.endif # SunOS
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM}
 
@@ -81,7 +91,7 @@ post-install:
 		${NS_PLUGINS_DIR}
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${PREFIX}/Acrobat4/Reader/License.pdf"
-.if (${PLATFORM} == "sparcsolaris")
+.if ((${PLATFORM} == "sparcsolaris") || (${PLATFORM} == "intelsolaris"))
 	@cd ${PREFIX}/Acrobat4/Reader/${PLATFORM}/lib && \
 	for LIB in AGM.so.3 CoolType.so.1 ICC.so.1 readcore.so.4; do \
 	  ${RM} -f lib$${LIB} && \
@@ -89,5 +99,9 @@ post-install:
 	done
 .endif
 
-.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
+
+bla:
+	@echo OPSYS=${OPSYS}
+	@echo MACHINE_ARCH=${MACHINE_ARCH}
+	@echo PLATFORM=${PLATFORM}
diff --git a/print/acroread/PLIST.i386 b/print/acroread/PLIST.NetBSD-i386
index 8d464c6ea40..86dfd8e11c9 100644
--- a/print/acroread/PLIST.i386
+++ b/print/acroread/PLIST.NetBSD-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2001/10/31 23:31:21 zuntum Exp $
+@comment $NetBSD: PLIST.NetBSD-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
@@ -8,3 +8,4 @@ Acrobat4/Reader/${PLATFORM}/lib/libICC.so
 Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
 Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
 Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
+Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
diff --git a/print/acroread/PLIST.SunOS-i386 b/print/acroread/PLIST.SunOS-i386
new file mode 100644
index 00000000000..c6fc459b4dc
--- /dev/null
+++ b/print/acroread/PLIST.SunOS-i386
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST.SunOS-i386,v 1.1 2005/06/30 13:22:19 hubertf Exp $
+lib/netscape/plugins/nppdf.so
+Acrobat4/Reader/desktop/olwm/acroread.cetable
+Acrobat4/Reader/desktop/olwm/acroread.deskinstall
+Acrobat4/Reader/desktop/olwm/acroread.prog.icon
+Acrobat4/Reader/desktop/olwm/pdf.icon
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
+@dirrm Acrobat4/Reader/desktop/olwm
+@dirrm Acrobat4/Reader/desktop
diff --git a/print/acroread/PLIST.alpha b/print/acroread/PLIST.alpha
index 955b01c5291..f0c63a300b0 100644
--- a/print/acroread/PLIST.alpha
+++ b/print/acroread/PLIST.alpha
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.alpha,v 1.1 2001/10/31 23:31:21 zuntum Exp $
+@comment $NetBSD: PLIST.alpha,v 1.2 2005/06/30 13:22:19 hubertf Exp $
 Acrobat4/Reader/help/search.pdf
+Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
diff --git a/print/acroread/PLIST.common b/print/acroread/PLIST.common
index ad334ea6196..58731316fa0 100644
--- a/print/acroread/PLIST.common
+++ b/print/acroread/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/02/21 21:24:06 veego Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2005/06/30 13:22:19 hubertf Exp $
 Acrobat4/Browsers/netscape
 Acrobat4/Browsers/${PLATFORM}/nppdf.so
 Acrobat4/ReadMe
@@ -13,7 +13,6 @@ Acrobat4/Reader/res/splashScreen21.xbm
 Acrobat4/Reader/res/splashScreen28.xpm
 Acrobat4/Reader/${PLATFORM}/app-defaults/AcroRead
 Acrobat4/Reader/${PLATFORM}/bin/acroread
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
 Acrobat4/Reader/${PLATFORM}/plug_ins/AcroForm.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/Highlight.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AFStrENU.js
diff --git a/print/acroread/PLIST.sparc b/print/acroread/PLIST.sparc
index e1bb5e9b979..e67cafa9de0 100644
--- a/print/acroread/PLIST.sparc
+++ b/print/acroread/PLIST.sparc
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST.sparc,v 1.1 2001/10/31 23:31:21 zuntum Exp $
+@comment $NetBSD: PLIST.sparc,v 1.2 2005/06/30 13:22:19 hubertf Exp $
 lib/netscape/plugins/nppdf.so
 Acrobat4/Reader/desktop/olwm/acroread.cetable
 Acrobat4/Reader/desktop/olwm/acroread.deskinstall
 Acrobat4/Reader/desktop/olwm/acroread.prog.icon
 Acrobat4/Reader/desktop/olwm/pdf.icon
 Acrobat4/Reader/help/search.pdf
+Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
 Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
diff --git a/print/acroread/distinfo b/print/acroread/distinfo
index efcd4591810..fb95b8203e0 100644
--- a/print/acroread/distinfo
+++ b/print/acroread/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:51:41 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/06/30 13:22:19 hubertf Exp $
 
 SHA1 (fdec-rs-405.tar.gz) = cf38c862af69b0bd1c76e5b182f6026bfe552250
 Size (fdec-rs-405.tar.gz) = 8437452 bytes
@@ -7,4 +7,7 @@ RMD160 (linux-ar-405.tar.gz) = 80d0bb4d5360ed25ee5d6a98be924b8ea43058bd
 Size (linux-ar-405.tar.gz) = 6144813 bytes
 SHA1 (sunsparc-rs-405.tar.gz) = 764d1257ec3e91bb1b169aae722e9665ae2805f9
 Size (sunsparc-rs-405.tar.gz) = 6557221 bytes
+SHA1 (sunx86-ar-405.tar.gz) = 87392070fb6fb9f64a90beecdd072362c6b8232c
+RMD160 (sunx86-ar-405.tar.gz) = 3c47abd00aae9bcf56adb846b9128585dcffbb77
+Size (sunx86-ar-405.tar.gz) = 5661973 bytes
 SHA1 (patch-aa) = 0c7aa984ad67674d78497acd850fa3b7e404cc7b