-fix the patches to correctly handle other than i386 cases.

-PLIST rework to deal with sparc and alpha in addition to i386.

-add specific sparc versions which the required compat_svr4 code

-add md5 for the alpha binary.  Note that this is still disabled on alpha until
 someone can test it.

10 files changed, 180 insertions, 81 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index b5660fe17d1..3a7a3d9e23b 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/03/03 02:30:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/04/18 01:46:16 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $
 
 PKGNAME=	acroread-4.05
@@ -20,23 +20,27 @@ NO_BUILD=	YES
 .if (${MACHINE_ARCH} == "i386")
 DEPENDS=	suse_linux>=6.1:../../emulators/suse_linux
 DISTNAME=	linux-ar-405
-#.elif (${MACHINE_ARCH} == "alpha")
-#.if !exists(/emul/osf1/sbin/loader)
-#IGNORE=	requires Digital UNIX libraries - see compat_osf1(8)
-#.endif
-#DISTNAME=	dec-arws-40
-#.elif (${MACHINE_ARCH} == "sparc")
-#.if !exists(/emul/sunos/usr/lib/ld.so)
-#IGNORE=	requires SunOS libraries - see compat_sunos(8)
-#.endif
-#DISTNAME=	sunsparc-rs-405
+PLATFORM=	intellinux
+WRKSRC=		${WRKDIR}/ILINXR.install
+.elif (${MACHINE_ARCH} == "alpha")
+.if !exists(/emul/osf1/sbin/loader)
+IGNORE=	'requires Digital UNIX libraries - see compat_osf1(8)'
+.endif
+DISTNAME=	fdec-rs-405
+PLATFORM=       alphaosf
+WRKSRC=		${WRKDIR}/AOSFRS.install
+.elif (${MACHINE_ARCH} == "sparc")
+.if !exists(/emul/svr4/usr/lib/ld.so)
+IGNORE=		'requires Solaris libraries - see compat_svr4(8)'
+.endif
+DISTNAME=	sunsparc-rs-405
+WRKSRC=		${WRKDIR}/SSOLRS.install
+PLATFORM=	sparcsolaris
 .else
 DISTNAME=	${PKGNAME}
 .endif
-ONLY_FOR_PLATFORM=	*-*-i386
-PLATFORM=	intellinux
-# *-*-alpha *-*-sparc
-WRKSRC=		${WRKDIR}/ILINXR.install
+ONLY_FOR_PLATFORM=	*-*-i386 *-1.4[L-Z]-sparc *-1.[5-9]*-sparc *-[2-9]*-sparc
+# *-*-alpha 
 .elif ${OPSYS} == "SunOS"
 DISTNAME=	sunsparc-rs-405
 WRKSRC=		${WRKDIR}/SSOLRS.install
@@ -47,6 +51,10 @@ post-patch:
 
 PLIST_SUBST+=	PLATFORM=${PLATFORM}
 
+PLIST_SRC=	${PKGDIR}/PLIST.pre \
+		${PKGDIR}/PLIST.${MACHINE_ARCH} \
+		${PKGDIR}/PLIST.post
+
 NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
 do-install:
diff --git a/print/acroread/files/acroread.diff b/print/acroread/files/acroread.diff
index 665b8e6d98e..230dee0e2e0 100644
--- a/print/acroread/files/acroread.diff
+++ b/print/acroread/files/acroread.diff
@@ -1,22 +1,33 @@
-$NetBSD: acroread.diff,v 1.3 1999/09/26 12:53:51 tron Exp $
+$NetBSD: acroread.diff,v 1.4 2000/04/18 01:46:17 dmcmahill Exp $
 
---- acroread.orig	Fri Nov 20 17:44:30 1998
-+++ acroread	Fri Nov 20 17:45:11 1998
-@@ -205,7 +205,7 @@
-     ACRO_CONFIG=intelbsdi
+--- acroread.orig	Mon Apr 17 16:30:05 2000
++++ acroread	Mon Apr 17 16:33:30 2000
+@@ -210,4 +210,21 @@
      export ACRO_CONFIG
      ;;
--  Linux)
-+  *BSD|Linux)
-     ACRO_CONFIG=intellinux
-     export ACRO_CONFIG
-     ;;
-@@ -309,6 +309,8 @@
-   intellinux)
++  NetBSD)
++    machine_type=`uname -p`
++    case "$machine_type" in
++      alpha)
++        ACRO_CONFIG=alphaosf
++        export ACRO_CONFIG
++        ;;
++      i386)
++        ACRO_CONFIG=intellinux
++        export ACRO_CONFIG
++        ;;
++      sparc)
++        ACRO_CONFIG=sparcsolaris
++        export ACRO_CONFIG
++        ;;
++    esac
++    ;;
+ esac
+ 
+@@ -310,4 +327,6 @@
      LD_LIBRARY_PATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib" "$LD_LIBRARY_PATH"`"
      export LD_LIBRARY_PATH
 +    LC_CTYPE="C"
 +    export LC_CTYPE
      ;;
    intelbsdi)
-     ;;
diff --git a/print/acroread/files/md5 b/print/acroread/files/md5
index 4f7548d7d3c..abaa8baef25 100644
--- a/print/acroread/files/md5
+++ b/print/acroread/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.4 2000/02/20 19:26:11 soren Exp $
+$NetBSD: md5,v 1.5 2000/04/18 01:46:17 dmcmahill Exp $
 
+MD5 (fdec-rs-405.tar.gz) = 79cd8b15532243732ff6a3665533e0dd
 MD5 (linux-ar-405.tar.gz) = ad40572f1f9972d2b91d01217a2b0f23
 MD5 (sunsparc-rs-405.tar.gz) = 237df36f1f989a1173d941e96e6aa4c0
diff --git a/print/acroread/files/patch-sum b/print/acroread/files/patch-sum
index ef5ba17a87a..3a615ea858d 100644
--- a/print/acroread/files/patch-sum
+++ b/print/acroread/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 2000/02/05 03:49:23 wiz Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/18 01:46:17 dmcmahill Exp $
 
-MD5 (patch-aa) = 993721742e3d21ee44f7f9f120eefc21
+MD5 (patch-aa) = 4c54fadbfd59d8abd9c942c2c6ab1c98
diff --git a/print/acroread/patches/patch-aa b/print/acroread/patches/patch-aa
index 25d232798eb..92ca19d8b38 100644
--- a/print/acroread/patches/patch-aa
+++ b/print/acroread/patches/patch-aa
@@ -1,31 +1,49 @@
-$NetBSD: patch-aa,v 1.3 1999/06/17 01:04:29 sakamoto Exp $
+$NetBSD: patch-aa,v 1.4 2000/04/18 01:46:17 dmcmahill Exp $
 
---- INSTALL.orig	Thu Nov  7 00:04:53 1996
-+++ INSTALL	Wed Nov 20 17:37:14 1996
-@@ -117,6 +117,8 @@
-     if [ "$i" -a -f "$i" ] ; then
+--- INSTALL.orig	Wed Jan 26 19:40:25 2000
++++ INSTALL	Mon Apr 17 16:20:38 2000
+@@ -116,4 +116,6 @@
          if [ `uname -s` = "Linux" ] ; then
            size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
 +        elif [ `uname -s|sed -e 's|.*\(...\)|\\1|'` = "BSD" ] ; then
 +          size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
          else
            size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
-         fi
-@@ -559,7 +561,7 @@
-   *) ScriptDirectory="$CurrentDirectory"/"$ScriptDirectory" ;;
+@@ -564,5 +566,5 @@
  esac
  
 -if [ "`type uname`" != "uname not found" ] ; then
 +if [ "`uname`" != "uname not found" ] ; then
    OSname=`uname -s`
    if [ "$OSname" = "AIX" ] ; then
-     OSrelease=`uname -a | ( read name host minor major foo ; echo $major.$minor )`
-@@ -1044,7 +1046,7 @@
+@@ -1048,4 +1050,30 @@
      DistDefaultNum="$DistIntelBSDINum"
      DefaultName="Intel/BSDI"
++    ;;
++  NetBSD)
++    MachArch=`uname -p`
++    case "$MachArch" in
++      alpha) 
++        AcroDefaultNum="$AcroAlphaOSFNum"
++        ExchDefaultNum="$ExchAlphaOSFNum"
++        ReadDefaultNum="$ReadAlphaOSFNum"
++        DistDefaultNum="$DistAlphaOSFNum"
++        DefaultName="DEC Alpha/OSF1"
++        ;;  
++      i386)
++        AcroDefaultNum="$AcroIntelLinuxNum"
++        ExchDefaultNum="$ExchIntelLinuxNum"
++        ReadDefaultNum="$ReadIntelLinuxNum"
++        DistDefaultNum="$DistIntelLinuxNum"
++        DefaultName="Intel/Linux"
++        ;;
++      sparc)
++        AcroDefaultNum="$AcroSparcSolarisNum"
++        ExchDefaultNum="$ExchSparcSolarisNum"
++        ReadDefaultNum="$ReadSparcSolarisNum"
++        DistDefaultNum="$DistSparcSolarisNum"
++        DefaultName="SPARC/Solaris 2.x"
++        ;;
++    esac
      ;;
--  Linux)
-+  *BSD|Linux)
-     AcroDefaultNum="$AcroIntelLinuxNum"
-     ExchDefaultNum="$ExchIntelLinuxNum"
-     ReadDefaultNum="$ReadIntelLinuxNum"
+   Linux)
diff --git a/print/acroread/pkg/PLIST.alpha b/print/acroread/pkg/PLIST.alpha
new file mode 100644
index 00000000000..d0a83d21877
--- /dev/null
+++ b/print/acroread/pkg/PLIST.alpha
@@ -0,0 +1,26 @@
+@comment $NetBSD: PLIST.alpha,v 1.1 2000/04/18 01:46:18 dmcmahill Exp $
+Acrobat4/Reader/help/search.pdf
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
+Acrobat4/Reader/${PLATFORM}/lib/libICC.so
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
+Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
+Acrobat4/Reader/${PLATFORM}/plug_ins/autoIndx.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/acrosrch.uid
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.cmp
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.lic
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.std
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.syx
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/acro20.lng
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rsd
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rst
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.stc
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.stp
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.syd
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome
+
diff --git a/print/acroread/pkg/PLIST.i386 b/print/acroread/pkg/PLIST.i386
new file mode 100644
index 00000000000..11993e2223d
--- /dev/null
+++ b/print/acroread/pkg/PLIST.i386
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2000/04/18 01:46:18 dmcmahill Exp $
+lib/netscape/plugins/nppdf.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+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
diff --git a/print/acroread/pkg/PLIST.post b/print/acroread/pkg/PLIST.post
new file mode 100644
index 00000000000..a937ba4f9f0
--- /dev/null
+++ b/print/acroread/pkg/PLIST.post
@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST.post,v 1.1 2000/04/18 01:46:18 dmcmahill Exp $
+@exec mkdir -p %D/lib/netscape/plugins
+@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
+@unexec rmdir %D/lib/netscape 2>/dev/null || true
+@exec ln -sf ../../Resource/Font/ %D/Acrobat4/Reader/${PLATFORM}/fonts
+@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/fonts
+@exec ln -sf ../../res %D/Acrobat4/Reader/${PLATFORM}/res
+@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/res
+@dirrm Acrobat4/Browsers/${PLATFORM}
+@dirrm Acrobat4/Browsers
+@dirrm Acrobat4/Reader/res
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins
+@dirrm Acrobat4/Reader/${PLATFORM}/lib
+@dirrm Acrobat4/Reader/${PLATFORM}/bin
+@dirrm Acrobat4/Reader/${PLATFORM}/app-defaults
+@dirrm Acrobat4/Reader/${PLATFORM}
+@dirrm Acrobat4/Reader/help
+@dirrm Acrobat4/Reader
+@dirrm Acrobat4/Resource/Font
+@dirrm Acrobat4/Resource
+@dirrm Acrobat4/bin
+@dirrm Acrobat4
diff --git a/print/acroread/pkg/PLIST b/print/acroread/pkg/PLIST.pre
index 460e7170925..348eeaa9074 100644
--- a/print/acroread/pkg/PLIST
+++ b/print/acroread/pkg/PLIST.pre
@@ -1,33 +1,25 @@
-@comment $NetBSD: PLIST,v 1.6 2000/03/03 02:30:46 jlam Exp $
-Acrobat4/ReadMe
-Acrobat4/Browsers/${PLATFORM}/nppdf.so
+@comment $NetBSD: PLIST.pre,v 1.1 2000/04/18 01:46:18 dmcmahill Exp $
 Acrobat4/Browsers/netscape
+Acrobat4/Browsers/${PLATFORM}/nppdf.so
+Acrobat4/ReadMe
 Acrobat4/Reader/AcroVersion
 Acrobat4/Reader/Acrobat.pdf
 Acrobat4/Reader/License.pdf
 Acrobat4/Reader/MapTypes.pdf
 Acrobat4/Reader/help/reader.pdf
+Acrobat4/Reader/res/splashScreen11R.xbm
+Acrobat4/Reader/res/splashScreen18R.xpm
+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}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-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}/plug_ins/AcroForm.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/Highlight.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AFStrENU.js
 Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AForm.js
 Acrobat4/Reader/${PLATFORM}/plug_ins/ewh.api
 Acrobat4/Reader/${PLATFORM}/plug_ins/wwwlink.api
-Acrobat4/Reader/res/splashScreen11R.xbm
-Acrobat4/Reader/res/splashScreen18R.xpm
-Acrobat4/Reader/res/splashScreen21.xbm
-Acrobat4/Reader/res/splashScreen28.xpm
 Acrobat4/Resource/Font/AdobeSansMM
 Acrobat4/Resource/Font/AdobeSansMM.MMM
 Acrobat4/Resource/Font/AdobeSerifMM
@@ -50,23 +42,3 @@ Acrobat4/Resource/Font/ZapfDingbats
 Acrobat4/bin/acroread
 bin/acroread
 bin/acroread4
-lib/netscape/plugins/nppdf.so
-@exec ln -sf ../../Resource/Font/ %D/Acrobat4/Reader/${PLATFORM}/fonts
-@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/fonts
-@exec ln -sf ../../res %D/Acrobat4/Reader/${PLATFORM}/res
-@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/res
-@dirrm Acrobat4/bin
-@dirrm Acrobat4/Resource/Font
-@dirrm Acrobat4/Resource
-@dirrm Acrobat4/Reader/res
-@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts
-@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins
-@dirrm Acrobat4/Reader/${PLATFORM}/lib
-@dirrm Acrobat4/Reader/${PLATFORM}/bin
-@dirrm Acrobat4/Reader/${PLATFORM}/app-defaults
-@dirrm Acrobat4/Reader/${PLATFORM}
-@dirrm Acrobat4/Reader/help
-@dirrm Acrobat4/Reader
-@dirrm Acrobat4/Browsers/${PLATFORM}
-@dirrm Acrobat4/Browsers
-@dirrm Acrobat4
diff --git a/print/acroread/pkg/PLIST.sparc b/print/acroread/pkg/PLIST.sparc
new file mode 100644
index 00000000000..33008af5c37
--- /dev/null
+++ b/print/acroread/pkg/PLIST.sparc
@@ -0,0 +1,30 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2000/04/18 01:46:18 dmcmahill 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/libAGM.so
+Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
+Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
+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}/plug_ins/autoIndx.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
+Acrobat4/Reader/${PLATFORM}/plug_ins/acrosrch.uid
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.cmp
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.lic
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.std
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.syx
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.lng
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rsd
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rst
+Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.syd
+@dirrm Acrobat4/Reader/desktop/olwm
+@dirrm Acrobat4/Reader/desktop
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language
+@dirrm Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome