Fri Sep 7 12:57:14 2012 UTC ()
Fix compiler option and disable optimizations from configure


(adam)
diff -r1.60 -r1.61 pkgsrc/archivers/zip/Makefile
diff -r1.12 -r1.13 pkgsrc/archivers/zip/distinfo
diff -r1.4 -r1.5 pkgsrc/archivers/zip/patches/patch-ab
cvs diff -r1.60 -r1.61 pkgsrc/archivers/zip/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/zip/Makefile 2012/03/09 10:58:30 1.60
+++ pkgsrc/archivers/zip/Makefile 2012/09/07 12:57:14 1.61
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.60 2012/03/09 10:58:30 fhajny Exp $ 1# $NetBSD: Makefile,v 1.61 2012/09/07 12:57:14 adam Exp $
2 2
3DISTNAME= zip30 3DISTNAME= zip30
4PKGNAME= zip-3.0 4PKGNAME= zip-3.0
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/ 7MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.info-zip.org/Zip.html 11HOMEPAGE= http://www.info-zip.org/Zip.html
12COMMENT= Create/update ZIP files compatible with pkzip 12COMMENT= Create/update ZIP files compatible with pkzip
13LICENSE= info-zip 13LICENSE= info-zip
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18MAKE_FILE= unix/Makefile 18MAKE_FILE= unix/Makefile
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22MAKE_FLAGS+= LOCAL_ZIP=${CFLAGS:M*:Q} 22MAKE_FLAGS+= LOCAL_ZIP=${CFLAGS:Q}
23MAKE_FLAGS+= LFLAGS1=${_STRIPFLAG_CC:Q} 23MAKE_FLAGS+= LFLAGS1=${_STRIPFLAG_CC:Q}
24MAKE_FLAGS+= -DUNICODE_SUPPORT 24MAKE_FLAGS+= -DUNICODE_SUPPORT
25.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc" 25.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
26CFLAGS+= -O0 26CFLAGS+= -O0
27.endif 27.endif
28 28
29.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
30 30
31.if !empty(CC_VERSION:Mgcc*) 31.if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
32BUILD_TARGET= generic_gcc 32BUILD_TARGET= generic_gcc
33.else 33.else
34BUILD_TARGET= generic 34BUILD_TARGET= generic
35CFLAGS+= -O 35CFLAGS+= -O
36.endif 36.endif
37 37
38.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS" 38.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS"
39MAKE_FLAGS+= DISABLE_ASM=YES 39MAKE_FLAGS+= DISABLE_ASM=YES
40.endif 40.endif
41 41
42.if ${OPSYS} == "Linux" 42.if ${OPSYS} == "Linux"
43CFLAGS+= -DHAVE_DIRENT_H 43CFLAGS+= -DHAVE_DIRENT_H
44.endif 44.endif
cvs diff -r1.12 -r1.13 pkgsrc/archivers/zip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/zip/distinfo 2009/09/18 14:01:32 1.12
+++ pkgsrc/archivers/zip/distinfo 2012/09/07 12:57:14 1.13
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.12 2009/09/18 14:01:32 sketch Exp $ 1$NetBSD: distinfo,v 1.13 2012/09/07 12:57:14 adam Exp $
2 2
3SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182 3SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
4RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232 4RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
5Size (zip30.tgz) = 1118845 bytes 5Size (zip30.tgz) = 1118845 bytes
6SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3 6SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
7SHA1 (patch-ab) = 0c38e3ea547a12fdec232acde863a55fbbff5f3e 7SHA1 (patch-ab) = 9fe46894b9098800d02b964c5d5817d1531e9909
cvs diff -r1.4 -r1.5 pkgsrc/archivers/zip/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/archivers/zip/patches/patch-ab 2009/09/18 14:01:32 1.4
+++ pkgsrc/archivers/zip/patches/patch-ab 2012/09/07 12:57:14 1.5
@@ -1,20 +1,34 @@ @@ -1,20 +1,34 @@
1$NetBSD: patch-ab,v 1.4 2009/09/18 14:01:32 sketch Exp $ 1$NetBSD: patch-ab,v 1.5 2012/09/07 12:57:14 adam Exp $
2 2
3--- unix/configure.orig Fri Sep 18 14:57:23 2009 3Don't force compiler optimization flags.
4+++ unix/configure Fri Sep 18 14:58:24 2009 4Introduce DISABLE_ASM
5@@ -235,6 +235,7 @@ 5
 6--- unix/configure.orig 2008-06-20 03:32:20.000000000 +0000
 7+++ unix/configure
 8@@ -118,10 +118,6 @@ _EOF_
 9 fi
 10
 11 # optimization flags
 12-if test -n "${CFLAGS_OPT}"; then
 13- CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
 14- CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
 15-fi
 16
 17
 18 # bzip2
 19@@ -235,6 +233,7 @@ $CPP conftest.c >/dev/null 2>/dev/null |
6 echo Check if we can use asm code 20 echo Check if we can use asm code
7 OBJA="" 21 OBJA=""
8 OCRCU8="" 22 OCRCU8=""
9+if [ -z "$DISABLE_ASM" ]; then 23+if [ -z "$DISABLE_ASM" ]; then
10 if eval "$CPP match.S > _match.s 2>/dev/null"; then 24 if eval "$CPP match.S > _match.s 2>/dev/null"; then
11 if test ! -s _match.s || grep error < _match.s > /dev/null; then 25 if test ! -s _match.s || grep error < _match.s > /dev/null; then
12 : 26 :
13@@ -257,6 +258,7 @@ 27@@ -257,6 +256,7 @@ if eval "$CPP match.S > _match.s 2>/dev/
14 fi 28 fi
15 fi 29 fi
16 rm -f _match.s _match.o _crc_i386.s _crc_i386.o 30 rm -f _match.s _match.o _crc_i386.s _crc_i386.o
17+fi 31+fi
18  32
19  33
20 # ANSI options for compilers that don't have __STDC__ defined by default 34 # ANSI options for compilers that don't have __STDC__ defined by default