Wed Apr 25 19:35:02 2012 UTC ()
Reduce pkglint warnings by commenting patches.


(wiz)
diff -r1.19 -r1.20 pkgsrc/archivers/unzip/distinfo
diff -r1.4 -r1.5 pkgsrc/archivers/unzip/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/archivers/unzip/patches/patch-ab
cvs diff -r1.19 -r1.20 pkgsrc/archivers/unzip/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/unzip/distinfo 2010/03/03 16:27:57 1.19
+++ pkgsrc/archivers/unzip/distinfo 2012/04/25 19:35:02 1.20
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.19 2010/03/03 16:27:57 wiz Exp $ 1$NetBSD: distinfo,v 1.20 2012/04/25 19:35:02 wiz Exp $
2 2
3SHA1 (unzip60.tgz) = abf7de8a4018a983590ed6f5cbd990d4740f8a22 3SHA1 (unzip60.tgz) = abf7de8a4018a983590ed6f5cbd990d4740f8a22
4RMD160 (unzip60.tgz) = 48af66606e9472e45fbb94bc4e285da23d1b89ba 4RMD160 (unzip60.tgz) = 48af66606e9472e45fbb94bc4e285da23d1b89ba
5Size (unzip60.tgz) = 1376845 bytes 5Size (unzip60.tgz) = 1376845 bytes
6SHA1 (patch-aa) = de66b7b5c45904167e8596ce5235d957c2df4d2a 6SHA1 (patch-aa) = d0bbfd14cae937f5c4170780dfcd1d46cc10d790
7SHA1 (patch-ab) = 3b15e24ac04af371b2b424251582b5434e14a91f 7SHA1 (patch-ab) = 672635c469e0a53ac9808f8155ee38643a8acf69
8SHA1 (patch-ac) = 7891fad33d07746d1067e373bf955086489e0fee 8SHA1 (patch-ac) = 7891fad33d07746d1067e373bf955086489e0fee
cvs diff -r1.4 -r1.5 pkgsrc/archivers/unzip/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/unzip/patches/Attic/patch-aa 2004/06/01 04:31:42 1.4
+++ pkgsrc/archivers/unzip/patches/Attic/patch-aa 2012/04/25 19:35:02 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.4 2004/06/01 04:31:42 minskim Exp $ 1$NetBSD: patch-aa,v 1.5 2012/04/25 19:35:02 wiz Exp $
 2
 3More compatible to different versions of zlib.h files.
2 4
3--- unzip.h.orig 2004-05-22 20:04:23.000000000 -0500 5--- unzip.h.orig 2004-05-22 20:04:23.000000000 -0500
4+++ unzip.h 6+++ unzip.h
5@@ -258,11 +258,16 @@ freely, subject to the following restric 7@@ -258,11 +258,16 @@ freely, subject to the following restric
6 #endif 8 #endif
7  9
8 /* used to remove arguments in function prototypes for non-ANSI C */ 10 /* used to remove arguments in function prototypes for non-ANSI C */
9+#ifdef USE_ZLIB 11+#ifdef USE_ZLIB
10+#include <zconf.h> 12+#include <zconf.h>
11+#endif 13+#endif
12+#ifndef OF 14+#ifndef OF
13 #ifdef PROTO 15 #ifdef PROTO
14 # define OF(a) a 16 # define OF(a) a
cvs diff -r1.6 -r1.7 pkgsrc/archivers/unzip/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/archivers/unzip/patches/patch-ab 2010/03/03 16:27:57 1.6
+++ pkgsrc/archivers/unzip/patches/patch-ab 2012/04/25 19:35:02 1.7
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.6 2010/03/03 16:27:57 wiz Exp $ 1$NetBSD: patch-ab,v 1.7 2012/04/25 19:35:02 wiz Exp $
 2
 3pkgsrc adaptation.
2 4
3--- unix/Makefile.orig 2009-01-18 22:41:18.000000000 +0000 5--- unix/Makefile.orig 2009-01-18 22:41:18.000000000 +0000
4+++ unix/Makefile 6+++ unix/Makefile
5@@ -42,7 +42,7 @@ 7@@ -42,7 +42,7 @@
6 # such as -DDOSWILD). 8 # such as -DDOSWILD).
7  9
8 # UnZip flags 10 # UnZip flags
9-CC = cc# try using "gcc" target rather than changing this (CC and LD 11-CC = cc# try using "gcc" target rather than changing this (CC and LD
10+#CC = cc# try using "gcc" target rather than changing this (CC and LD 12+#CC = cc# try using "gcc" target rather than changing this (CC and LD
11 LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) 13 LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
12 AS = as 14 AS = as
13 LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) 15 LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
14@@ -580,7 +580,7 @@ generic_bz2: unix_make 16@@ -580,7 +580,7 @@ generic_bz2: unix_make