Changes 0.6: fix use of -L (lowercase) option with -ddiff -r1.5 -r1.6 pkgsrc/archivers/unshield/Makefile
(adam)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2012/09/11 19:47:02 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2013/10/23 18:22:44 adam Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= unshield-0.5.1 | 3 | DISTNAME= unshield-0.6 | |
5 | CATEGORIES= archivers | 4 | CATEGORIES= archivers | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synce/} | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synce/} | |
7 | 6 | |||
8 | MAINTAINER= martin@NetBSD.org | 7 | MAINTAINER= martin@NetBSD.org | |
9 | HOMEPAGE= http://sourceforge.net/projects/synce/ | 8 | HOMEPAGE= http://sourceforge.net/projects/synce/ | |
10 | COMMENT= Extract InstallShield .CAB files | 9 | COMMENT= Extract InstallShield .CAB files | |
10 | LICENSE= mit | |||
11 | 11 | |||
12 | GNU_CONFIGURE= yes | |||
13 | USE_LIBTOOL= yes | 12 | USE_LIBTOOL= yes | |
14 | USE_TOOLS+= pkg-config | 13 | USE_TOOLS+= pkg-config | |
14 | GNU_CONFIGURE= yes | |||
15 | 15 | |||
16 | PKGCONFIG_OVERRIDE+= libunshield.pc.in | 16 | PKGCONFIG_OVERRIDE+= libunshield.pc.in | |
17 | 17 | |||
18 | .include "../../devel/zlib/buildlink3.mk" | 18 | .include "../../devel/zlib/buildlink3.mk" | |
19 | .include "../../mk/bsd.pkg.mk" | 19 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2012/01/11 14:29:36 hans Exp $ | 1 | $NetBSD: distinfo,v 1.5 2013/10/23 18:22:44 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (unshield-0.5.1.tar.gz) = 13211a32100947969a8ece6393345332d6ff667b | 3 | SHA1 (unshield-0.6.tar.gz) = 3e1197116145405f786709608a5a636a19f4f3e1 | |
4 | RMD160 (unshield-0.5.1.tar.gz) = 5ef4db939437dc5e620cac4d46b03c1d59beb771 | 4 | RMD160 (unshield-0.6.tar.gz) = 1370621e38736f14dab1ec540b9233906b5eaa31 | |
5 | Size (unshield-0.5.1.tar.gz) = 362466 bytes | 5 | Size (unshield-0.6.tar.gz) = 320192 bytes | |
6 | SHA1 (patch-aa) = 0e100b18c85f72bd7b7bf2fd7ef0eed6d0d20ad9 | 6 | SHA1 (patch-aa) = 0e100b18c85f72bd7b7bf2fd7ef0eed6d0d20ad9 | |
7 | SHA1 (patch-ab) = 19db0c305dcd627075c152a48e99d69ab28d39ee | 7 | SHA1 (patch-ab) = df1f927737fa4ab6fd66548bca87585c27a682e7 | |
8 | SHA1 (patch-lib_file.c) = bdb1ce61bea29683f8def036ac829b5c3252933f | 8 | SHA1 (patch-lib_file.c) = bdb1ce61bea29683f8def036ac829b5c3252933f |
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | $NetBSD: patch-ab,v 1.3 2008/05/14 11:56:26 jmcneill Exp $ | 1 | $NetBSD: patch-ab,v 1.4 2013/10/23 18:22:44 adam Exp $ | |
2 | 2 | |||
3 | --- src/unshield.c.orig 2008-05-05 21:38:10.000000000 -0400 | 3 | --- src/unshield.c.orig 2009-06-18 05:11:31.000000000 +0000 | |
4 | +++ src/unshield.c | 4 | +++ src/unshield.c | |
5 | @@ -2,5 +2,5 @@ | 5 | @@ -2,5 +2,5 @@ | |
6 | #ifdef __linux__ | 6 | #ifdef __linux__ | |
7 | #define _BSD_SOURCE 1 | 7 | #define _BSD_SOURCE 1 | |
8 | -#define _POSIX_C_SOURCE 2 | 8 | -#define _POSIX_C_SOURCE 2 | |
9 | +/* #define _POSIX_C_SOURCE 2 */ | 9 | +/* #define _POSIX_C_SOURCE 2 */ | |
10 | #endif | 10 | #endif | |
11 | #include <sys/types.h> | 11 | #include <sys/types.h> | |
12 | @@ -299,8 +299,8 @@ static bool extract_file(Unshield* unshi | 12 | @@ -299,8 +299,8 @@ static bool extract_file(Unshield* unshi | |
13 | 13 | |||
14 | default: | 14 | default: | |
15 | - if (!isprint(*p)) | 15 | - if (!isprint(*p)) | |
16 | + if (!isprint((unsigned char)*p)) | 16 | + if (!isprint((unsigned char)*p)) | |
17 | *p = '_'; | 17 | *p = '_'; | |
18 | else if (make_lowercase) | 18 | else if (make_lowercase) | |
19 | - *p = tolower(*p); | 19 | - *p = tolower(*p); | |
20 | + *p = tolower((unsigned char)*p); | 20 | + *p = tolower((unsigned char)*p); | |
21 | break;; | 21 | break;; | |
22 | } | 22 | } | |
23 | @@ -319,8 +319,8 @@ static bool extract_file(Unshield* unshi | 23 | @@ -319,8 +319,8 @@ static bool extract_file(Unshield* unshi | |
24 | for (p = filename; *p != '\0'; p++) | 24 | for (p = filename + strlen(dirname); *p != '\0'; p++) | |
25 | { | 25 | { | |
26 | - if (!isprint(*p)) | 26 | - if (!isprint(*p)) | |
27 | + if (!isprint((unsigned char)*p)) | 27 | + if (!isprint((unsigned char)*p)) | |
28 | *p = '_'; | 28 | *p = '_'; | |
29 | else if (make_lowercase) | 29 | else if (make_lowercase) | |
30 | - *p = tolower(*p); | 30 | - *p = tolower(*p); | |
31 | + *p = tolower((unsigned char)*p); | 31 | + *p = tolower((unsigned char)*p); | |
32 | } | 32 | } | |
33 | 33 |