Update to _SU1 (Security Update 1) version from Adobe

3 files changed, 31 insertions, 30 deletions

diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index d684472bcc2..9d3d9dd4b55 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/07/29 15:42:20 smb Exp $
 
 DISTNAME=	acroread8	# overridden below
 PKGNAME=	acroread8-8.1.2
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.2/enu/
 
@@ -34,7 +35,7 @@ EMUL_REQD=		suse>=10.0
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME=	AdobeReader_enu-8.1.2-1.i486
+DISTNAME=	AdobeReader_enu-8.1.2_SU1-1.i486
 PLATFORM=	intellinux
 .else
 PLATFORM=	unknown
diff --git a/print/acroread8/distinfo b/print/acroread8/distinfo
index 918255bd031..f1a9d552b80 100644
--- a/print/acroread8/distinfo
+++ b/print/acroread8/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/04/06 01:43:32 toshii Exp $
+$NetBSD: distinfo,v 1.2 2008/07/29 15:42:20 smb Exp $
 
-SHA1 (AdobeReader_enu-8.1.2-1.i486.tar.gz) = 83475fbefd263641547e385fd8679570e5057101
-RMD160 (AdobeReader_enu-8.1.2-1.i486.tar.gz) = db0e2e7597dea34b081c356cb1a64fe8372235fe
-Size (AdobeReader_enu-8.1.2-1.i486.tar.gz) = 49724478 bytes
-SHA1 (patch-aa) = b2c65d052e85360404603af6277c18bde4c82ccd
+SHA1 (AdobeReader_enu-8.1.2_SU1-1.i486.tar.gz) = 14a03eab5671e4f3f0ce9c2150334060fb2cc72e
+RMD160 (AdobeReader_enu-8.1.2_SU1-1.i486.tar.gz) = 01df184fd15bb5a5bf0214bc37351f1f17506c24
+Size (AdobeReader_enu-8.1.2_SU1-1.i486.tar.gz) = 49723652 bytes
+SHA1 (patch-aa) = 0fea43814bc9059ad02ed96792d544a1d4e20b69
diff --git a/print/acroread8/patches/patch-aa b/print/acroread8/patches/patch-aa
index f232f156541..e3c9eae5f5b 100644
--- a/print/acroread8/patches/patch-aa
+++ b/print/acroread8/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/04/06 01:43:32 toshii Exp $
+$NetBSD: patch-aa,v 1.2 2008/07/29 15:42:20 smb Exp $
 
---- INSTALL.orig	2008-01-16 08:47:52.000000000 +0900
-+++ INSTALL
-@@ -53,7 +53,7 @@ MkTemp()
+--- INSTALL.orig	2008-06-25 12:16:52.000000000 -0400
++++ INSTALL	2008-07-29 11:25:17.000000000 -0400
+@@ -53,7 +53,7 @@
  
      mktemp_file="/tmp/acrobat.$$.${mktemp_count}"
  
@@ -10,17 +10,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/04/06 01:43:32 toshii Exp $
 +    while test -e "$mktemp_file"
      do
          mktemp_count="`expr $mktemp_count + 1`"
-         mktemp_file="/tmp/adobe.$$.${mktemp_count}"
-@@ -112,6 +112,8 @@ PrintRequiredFree()
+         mktemp_file="/tmp/acrobat.$$.${mktemp_count}"
+@@ -125,6 +125,8 @@
  
          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" -o `uname -s` = "DragonFly" ] ; then
-+          size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
++	elif [ `uname -s|sed -e 's|.*\(...\)|\\1|'` = "BSD" -o `uname -s` = "DragonFly" ] ; 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
-@@ -562,6 +564,8 @@ InstallReader()
+@@ -575,6 +577,8 @@
      MakeLibGnomeSpeechLinks "$ReadInstallDir" "$ReadConfig"
    fi
  
@@ -29,23 +29,23 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/04/06 01:43:32 toshii Exp $
    rm -f /usr/bin/acroread 2>/dev/null && \
    ln -s "$ReadInstallDir/Adobe/Reader8/bin/acroread" /usr/bin/acroread 2>/dev/null && \
    record_config remove /usr/bin/acroread
-@@ -804,6 +808,20 @@ case "$OSname" in
+@@ -817,6 +821,20 @@
      ReadDefaultNum="$ReadIntelLinuxNum"
      DefaultName="Intel/Linux"
      ;;
-+  NetBSD | DragonFly)
-+    MachArch=`uname -p`
-+    case "$MachArch" in
-+      i386|x86_64)
-+        ReadDefaultNum="$ReadIntelLinuxNum"
-+        DefaultName="Intel/Linux"
-+        ;;
-+      sparc*)
-+        ReadDefaultNum="$ReadSparcSolarisNum"
-+        DefaultName="SPARC/Solaris 2.x"
-+        ;;
-+    esac
-+    ;;
++    NetBSD | DragonFly)
++      MachArch=`uname -p`
++      case "$MachArch" in
++	i386|x86_64)
++	  ReadDefaultNum="$ReadIntelLinuxNum"
++	  DefaultName="Intel/Linux"
++	  ;;
++	sparc*)
++	  ReadDefaultNum="$ReadSparcSolarisNum"
++	  DefaultName="SPARC/Solaris 2.x"
++	  ;;
++      esac
++      ;;
 +
  esac