Fix compiler option and disable optimizations from configure

3 files changed, 24 insertions, 10 deletions

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 6d905e5a7c2..42882fa9bda 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2012/03/09 10:58:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.61 2012/09/07 12:57:14 adam Exp $
 
 DISTNAME=	zip30
 PKGNAME=	zip-3.0
@@ -19,7 +19,7 @@ MAKE_FILE=	unix/Makefile
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_FLAGS+=	LOCAL_ZIP=${CFLAGS:M*:Q}
+MAKE_FLAGS+=	LOCAL_ZIP=${CFLAGS:Q}
 MAKE_FLAGS+=	LFLAGS1=${_STRIPFLAG_CC:Q}
 MAKE_FLAGS+=	-DUNICODE_SUPPORT
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
@@ -28,7 +28,7 @@ CFLAGS+=	-O0
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc*)
+.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
 BUILD_TARGET=	generic_gcc
 .else
 BUILD_TARGET=	generic
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 575a7ac057c..1b71697c046 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2009/09/18 14:01:32 sketch Exp $
+$NetBSD: distinfo,v 1.13 2012/09/07 12:57:14 adam Exp $
 
 SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
 RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
 Size (zip30.tgz) = 1118845 bytes
 SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
-SHA1 (patch-ab) = 0c38e3ea547a12fdec232acde863a55fbbff5f3e
+SHA1 (patch-ab) = 9fe46894b9098800d02b964c5d5817d1531e9909
diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab
index 3301623d71a..1ba2591422c 100644
--- a/archivers/zip/patches/patch-ab
+++ b/archivers/zip/patches/patch-ab
@@ -1,8 +1,22 @@
-$NetBSD: patch-ab,v 1.4 2009/09/18 14:01:32 sketch Exp $
+$NetBSD: patch-ab,v 1.5 2012/09/07 12:57:14 adam Exp $
 
---- unix/configure.orig	Fri Sep 18 14:57:23 2009
-+++ unix/configure	Fri Sep 18 14:58:24 2009
-@@ -235,6 +235,7 @@
+Don't force compiler optimization flags.
+Introduce DISABLE_ASM
+
+--- unix/configure.orig	2008-06-20 03:32:20.000000000 +0000
++++ unix/configure
+@@ -118,10 +118,6 @@ _EOF_
+ fi
+ 
+ # optimization flags
+-if test -n "${CFLAGS_OPT}"; then
+-  CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
+-  CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
+-fi
+ 
+ 
+ # bzip2
+@@ -235,6 +233,7 @@ $CPP conftest.c >/dev/null 2>/dev/null |
  echo Check if we can use asm code
  OBJA=""
  OCRCU8=""
@@ -10,7 +24,7 @@ $NetBSD: patch-ab,v 1.4 2009/09/18 14:01:32 sketch Exp $
  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 @@
+@@ -257,6 +256,7 @@ if eval "$CPP match.S > _match.s 2>/dev/
    fi
  fi
  rm -f _match.s _match.o _crc_i386.s _crc_i386.o