3 files changed, 27 insertions, 2 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 0f19e055cd8..763cc669815 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2009/08/30 22:52:58 dsainty Exp $
+# $NetBSD: Makefile,v 1.56 2009/09/18 14:01:32 sketch Exp $
 
 DISTNAME=	zip30
 PKGNAME=	zip-3.0
@@ -33,6 +33,10 @@ BUILD_TARGET=	generic
 CFLAGS+=	-O
 .endif
 
+.if !empty(PKGSRC_COMPILER:Msunpro)
+MAKE_FLAGS+=	DISABLE_ASM=YES
+.endif
+
 .if ${OPSYS} == "Linux"
 CFLAGS+=	-DHAVE_DIRENT_H
 .endif
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 3d6f0bfa9b9..575a7ac057c 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2009/08/30 22:52:58 dsainty Exp $
+$NetBSD: distinfo,v 1.12 2009/09/18 14:01:32 sketch Exp $
 
 SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
 RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
 Size (zip30.tgz) = 1118845 bytes
 SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
+SHA1 (patch-ab) = 0c38e3ea547a12fdec232acde863a55fbbff5f3e
diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab
new file mode 100644
index 00000000000..3301623d71a
--- /dev/null
+++ b/archivers/zip/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.4 2009/09/18 14:01:32 sketch Exp $
+
+--- unix/configure.orig	Fri Sep 18 14:57:23 2009
++++ unix/configure	Fri Sep 18 14:58:24 2009
+@@ -235,6 +235,7 @@
+ echo Check if we can use asm code
+ OBJA=""
+ OCRCU8=""
++if [ -z "$DISABLE_ASM" ]; then
+ if eval "$CPP match.S > _match.s 2>/dev/null"; then
+   if test ! -s _match.s || grep error < _match.s > /dev/null; then
+     :
+@@ -257,6 +258,7 @@
+   fi
+ fi
+ rm -f _match.s _match.o _crc_i386.s _crc_i386.o
++fi
+ 
+ 
+ # ANSI options for compilers that don't have __STDC__ defined by default