From 1b99ee6454ae35eca0cdf999373da8d39ba2ec21 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Wed, 14 May 2008 11:56:26 +0000
Subject: Update to unshield 0.5.1.

---
 archivers/unshield/Makefile         |  7 +++++--
 archivers/unshield/PLIST            |  5 +++--
 archivers/unshield/distinfo         | 10 +++++-----
 archivers/unshield/patches/patch-ab | 18 ++++++++++++------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index b1a1c4b9cac..2dcf386353e 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/09/21 00:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/14 11:56:26 jmcneill Exp $
 #
 
-DISTNAME=		unshield-0.5
+DISTNAME=		unshield-0.5.1
 CATEGORIES=		archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=synce/}
 
@@ -11,6 +11,9 @@ COMMENT=		Extract InstallShield .CAB files
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+
+PKGCONFIG_OVERRIDE+=	libunshield.pc.in
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unshield/PLIST b/archivers/unshield/PLIST
index 2220fceb310..523b49763e3 100644
--- a/archivers/unshield/PLIST
+++ b/archivers/unshield/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/01 14:22:02 martin Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/05/14 11:56:26 jmcneill Exp $
 bin/unshield
 include/libunshield.h
 lib/libunshield.la
-share/aclocal/unshield.m4
+lib/pkgconfig/libunshield.pc
+man/man1/unshield.1
diff --git a/archivers/unshield/distinfo b/archivers/unshield/distinfo
index 2d240b942ee..fa0441fb17f 100644
--- a/archivers/unshield/distinfo
+++ b/archivers/unshield/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/10/31 05:41:41 minskim Exp $
+$NetBSD: distinfo,v 1.3 2008/05/14 11:56:26 jmcneill Exp $
 
-SHA1 (unshield-0.5.tar.gz) = 317990841cceea95d51638bd4f29456e2cfaf5af
-RMD160 (unshield-0.5.tar.gz) = cf56cb3be917b8c20f131a0e82469c11b585b142
-Size (unshield-0.5.tar.gz) = 325744 bytes
+SHA1 (unshield-0.5.1.tar.gz) = 13211a32100947969a8ece6393345332d6ff667b
+RMD160 (unshield-0.5.1.tar.gz) = 5ef4db939437dc5e620cac4d46b03c1d59beb771
+Size (unshield-0.5.1.tar.gz) = 362466 bytes
 SHA1 (patch-aa) = 0e100b18c85f72bd7b7bf2fd7ef0eed6d0d20ad9
-SHA1 (patch-ab) = ead5065939f42beb92d039461470b894be3f0705
+SHA1 (patch-ab) = 19db0c305dcd627075c152a48e99d69ab28d39ee
diff --git a/archivers/unshield/patches/patch-ab b/archivers/unshield/patches/patch-ab
index 5aff7b7dd2c..fd35356a3b4 100644
--- a/archivers/unshield/patches/patch-ab
+++ b/archivers/unshield/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2005/10/31 05:41:41 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2008/05/14 11:56:26 jmcneill Exp $
 
---- src/unshield.c.orig	2005-07-08 07:08:37.000000000 -0700
+--- src/unshield.c.orig	2008-05-05 21:38:10.000000000 -0400
 +++ src/unshield.c
-@@ -2,3 +2,3 @@
+@@ -2,5 +2,5 @@
+ #ifdef __linux__
  #define _BSD_SOURCE 1
 -#define _POSIX_C_SOURCE 2
 +/* #define _POSIX_C_SOURCE 2 */
- #include "../lib/libunshield.h"
-@@ -280,6 +280,6 @@ static bool extract_file(Unshield* unshi
+ #endif
+ #include <sys/types.h>
+@@ -299,8 +299,8 @@ static bool extract_file(Unshield* unshi
+ 
        default:
 -        if (!isprint(*p))
 +        if (!isprint((unsigned char)*p))
@@ -16,7 +19,9 @@ $NetBSD: patch-ab,v 1.2 2005/10/31 05:41:41 minskim Exp $
 -          *p = tolower(*p);
 +          *p = tolower((unsigned char)*p);
          break;;
-@@ -300,6 +300,6 @@ static bool extract_file(Unshield* unshi
+     }
+@@ -319,8 +319,8 @@ static bool extract_file(Unshield* unshi
+   for (p = filename; *p != '\0'; p++)
    {
 -    if (!isprint(*p))
 +    if (!isprint((unsigned char)*p))
@@ -25,3 +30,4 @@ $NetBSD: patch-ab,v 1.2 2005/10/31 05:41:41 minskim Exp $
 -      *p = tolower(*p);
 +      *p = tolower((unsigned char)*p);
    }
+ 
-- 
cgit v1.2.3