Update to 1.4.2

6 files changed, 18 insertions, 81 deletions

diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile
index 86659371a2a..8b869c9e319 100644
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2013/10/23 18:22:44 adam Exp $
+# $NetBSD: Makefile,v 1.7 2017/08/29 11:18:40 martin Exp $
 
-DISTNAME=	unshield-0.6
-CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=synce/}
+DISTNAME=       unshield-1.4.2
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=twogood/}
+GITHUB_TAG=     ${PKGVERSION_NOREV}
+EXTRACT_SUFX=   .zip
 
-MAINTAINER=	martin@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/synce/
+CATEGORIES=	archivers
 COMMENT=	Extract InstallShield .CAB files
 LICENSE=	mit
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-
-PKGCONFIG_OVERRIDE+=	libunshield.pc.in
+USE_CMAKE=		yes
+USE_LANGUAGES+=		c++ c
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unshield/PLIST b/archivers/unshield/PLIST
index 523b49763e3..6c474524101 100644
--- a/archivers/unshield/PLIST
+++ b/archivers/unshield/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2008/05/14 11:56:26 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/08/29 11:18:40 martin Exp $
 bin/unshield
 include/libunshield.h
-lib/libunshield.la
+lib/libunshield.so
+lib/libunshield.so.0
+lib/libunshield.so.0.0.0
 lib/pkgconfig/libunshield.pc
-man/man1/unshield.1
+share/man/man1/unshield.1
diff --git a/archivers/unshield/distinfo b/archivers/unshield/distinfo
index 60f18a8ae46..5816cc02067 100644
--- a/archivers/unshield/distinfo
+++ b/archivers/unshield/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 00:56:26 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/08/29 11:18:40 martin Exp $
 
-SHA1 (unshield-0.6.tar.gz) = 3e1197116145405f786709608a5a636a19f4f3e1
-RMD160 (unshield-0.6.tar.gz) = 1370621e38736f14dab1ec540b9233906b5eaa31
-SHA512 (unshield-0.6.tar.gz) = 2b34d6ad8433c7a272ae93abc5e1f426102fb737fcd39116398bb59ed325e776d81776e8d54a94e1e279a4a4448dde88e54bee2c79b493c23c4286b11d23106d
-Size (unshield-0.6.tar.gz) = 320192 bytes
-SHA1 (patch-aa) = 0e100b18c85f72bd7b7bf2fd7ef0eed6d0d20ad9
-SHA1 (patch-ab) = df1f927737fa4ab6fd66548bca87585c27a682e7
-SHA1 (patch-lib_file.c) = bdb1ce61bea29683f8def036ac829b5c3252933f
+SHA1 (unshield-1.4.2.zip) = 5246a79c1d94825818d035f7c0a66ab0d6648725
+RMD160 (unshield-1.4.2.zip) = c88591248b0e86a55e2ac19dafd6ee1aacd76277
+SHA512 (unshield-1.4.2.zip) = 28b31a634a77c674c7eaf85a18f16fe6c8f8ac4eb87f1464f08f894fd590ae6351a207e8dcc09b7cf9a7323aab312fb98835944f8a4c4f6a7764557b386031aa
+Size (unshield-1.4.2.zip) = 58815 bytes
diff --git a/archivers/unshield/patches/patch-aa b/archivers/unshield/patches/patch-aa
deleted file mode 100644
index 0d1655784b7..00000000000
--- a/archivers/unshield/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/08/01 14:22:02 martin Exp $
-
---- lib/libunshield.c.orig	2004-08-24 08:10:27.000000000 +0200
-+++ lib/libunshield.c	2005-08-01 15:28:22.000000000 +0200
-@@ -27,7 +27,7 @@
- 
-     for (; *p != '\0'; p++)
-     {
--      if ('.' == *p || isdigit(*p))
-+      if ('.' == *p || isdigit((unsigned char)*p))
-       {
-         *p = '\0';
-         break;
diff --git a/archivers/unshield/patches/patch-ab b/archivers/unshield/patches/patch-ab
deleted file mode 100644
index b1251503c3f..00000000000
--- a/archivers/unshield/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2013/10/23 18:22:44 adam Exp $
-
---- src/unshield.c.orig	2009-06-18 05:11:31.000000000 +0000
-+++ src/unshield.c
-@@ -2,5 +2,5 @@
- #ifdef __linux__
- #define _BSD_SOURCE 1
--#define _POSIX_C_SOURCE 2
-+/* #define _POSIX_C_SOURCE 2 */
- #endif
- #include <sys/types.h>
-@@ -299,8 +299,8 @@ static bool extract_file(Unshield* unshi
- 
-       default:
--        if (!isprint(*p))
-+        if (!isprint((unsigned char)*p))
-           *p = '_';
-         else if (make_lowercase)
--          *p = tolower(*p);
-+          *p = tolower((unsigned char)*p);
-         break;;
-     }
-@@ -319,8 +319,8 @@ static bool extract_file(Unshield* unshi
-   for (p = filename + strlen(dirname); *p != '\0'; p++)
-   {
--    if (!isprint(*p))
-+    if (!isprint((unsigned char)*p))
-       *p = '_';
-     else if (make_lowercase)
--      *p = tolower(*p);
-+      *p = tolower((unsigned char)*p);
-   }
- 
diff --git a/archivers/unshield/patches/patch-lib_file.c b/archivers/unshield/patches/patch-lib_file.c
deleted file mode 100644
index ba8e6d664d8..00000000000
--- a/archivers/unshield/patches/patch-lib_file.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_file.c,v 1.1 2012/01/11 14:29:36 hans Exp $
-
---- lib/file.c.orig	2008-05-06 03:38:11.000000000 +0200
-+++ lib/file.c	2011-12-29 13:41:30.765248351 +0100
-@@ -17,6 +17,10 @@
- #include <sys/param.h>    /* for MIN(a,b) */
- #include <zlib.h>
- 
-+#ifndef MIN
-+#define MIN(a, b) ((a) < (b) ? (a) : (b))
-+#endif
-+
- #define VERBOSE 3
- 
- #define ror8(x,n)   (((x) >> ((int)(n))) | ((x) << (8 - (int)(n))))