Update to 1.5:

innoextract 1.5 (2015-09-24)
 - Added support for Inno Setup 5.5.6 installers
 - Added support for a modified Inno Setup 5.5.0 variant
 - Added support for building without iconv (Windows-1252 and UTF-16LE only)
 - Added warnings for .bin files that are not part of the installer
 - Added a simple --include (-I) option to filter files thanks to Alexandre Detiste
 - Added a --list-languages option to list available languages
 - Added a --exclude-temp (-m) option to not extract temporary files
 - Added a --language-only option to skip language-independent files
 - Added a --collisions option to abort or rename files on collision
 - Added a --default-language option to prefer a language in case of file collisions
 - Added a --gog-game-id option to print the GOG.com game ID for Galaxy-ready installers
 - Added a --gog (-g) option to extract additional .bin files using unrar or unar
 - Fixed handling of spaces in the --data-dir option
 - Fixed an infinite loop with truncated LZMA streams
 - Fixed handling of forward slashes in stored file paths
 - Fixed size display for powers of 1024
 - Fixed loading headers if there are encrypted chunks
 - Fixed file collisions not being handled case-insensitively
 - Files will now be extracted into the same directory even if the stored case differs
 - Empty directories are now created correctly when extracting
 - Skipped files in encrypted chunks are now listed individually
 - Temporary files are now marked in file listings
 - Error summary is now written to stderr when using --quiet
 - Colors are now only enabled automatically if $TERM is set to something other than "dumb"
 - Improved error and warning messages
 - Build system improvements
 - Debug output can now be enabled separately from debug builds
 - Windows: Added support for using the Win32 API for string encoding conversion
 - Windows: Fixed unicode console output

innoextract 1.4-windows-r2 (2014-04-17)
 - This is a Windows-specific hotfix release, no other platforms are affected
 - Fixed running innoextract under Windows XP

innoextract 1.4-windows-r1 (2013-05-14)
 - This is a Windows-specific hotfix release, no other platforms are affected
 - Fixed a crash on startup under Windows
 - Reduced progress bar flickering under Windows
 - Fixed original console text color not being restored under Windows

4 files changed, 6 insertions, 50 deletions

diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index b9d53f11edf..8b49df050dd 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/04/17 15:52:58 adam Exp $
+# $NetBSD: Makefile,v 1.3 2015/09/30 20:05:07 wiz Exp $
 
-DISTNAME=	innoextract-1.4
-PKGREVISION=	1
+DISTNAME=	innoextract-1.5
 CATEGORIES=	archivers
 MASTER_SITES=	http://constexpr.org/innoextract/files/
 
diff --git a/archivers/innoextract/distinfo b/archivers/innoextract/distinfo
index 87d4c97f860..281aca85f4b 100644
--- a/archivers/innoextract/distinfo
+++ b/archivers/innoextract/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1 2015/04/03 09:40:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2015/09/30 20:05:07 wiz Exp $
 
-SHA1 (innoextract-1.4.tar.gz) = 3fd3ac98c802c72a1f4ae5f6e6a5dca35747ff98
-RMD160 (innoextract-1.4.tar.gz) = 5f9cd26d508ee8f28cedaa619df4108f5f761a9c
-Size (innoextract-1.4.tar.gz) = 151230 bytes
-SHA1 (patch-CMakeLists.txt) = ebc9db4211bf01ebab6881ea23e3e5c32321a7aa
-SHA1 (patch-cmake_VersionString.cmake) = db368ea50042a73b78770c0b43d3480398fdff1c
+SHA1 (innoextract-1.5.tar.gz) = cd3e3f68213c2730e9db4665b2997f5052f12af7
+RMD160 (innoextract-1.5.tar.gz) = 95ca36a54ff074272e11f680d1dbc2f83fdc9d13
+Size (innoextract-1.5.tar.gz) = 179582 bytes
diff --git a/archivers/innoextract/patches/patch-CMakeLists.txt b/archivers/innoextract/patches/patch-CMakeLists.txt
deleted file mode 100644
index d20b4ed1927..00000000000
--- a/archivers/innoextract/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/04/03 09:40:54 wiz Exp $
-
-Fix use of CMAKE_MODULE_PATH
-
---- CMakeLists.txt.orig	2013-05-22 21:50:31.000000000 +0200
-+++ CMakeLists.txt	2013-05-22 21:52:02.000000000 +0200
-@@ -45,7 +45,9 @@
- 
- include(CheckSymbolExists)
- 
--set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") # For custom cmake modules
-+# For custom cmake modules
-+set(CMAKE_CUSTOM_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-+set(CMAKE_MODULE_PATH "${CMAKE_CUSTOM_MODULE_PATH}")
- include(BuildType)
- include(CompileCheck)
- include(CXX11Check)
diff --git a/archivers/innoextract/patches/patch-cmake_VersionString.cmake b/archivers/innoextract/patches/patch-cmake_VersionString.cmake
deleted file mode 100644
index 3c34237aba8..00000000000
--- a/archivers/innoextract/patches/patch-cmake_VersionString.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cmake_VersionString.cmake,v 1.1 2015/04/03 09:40:54 wiz Exp $
-
-Fix use of CMAKE_MODULE_PATH
-
---- cmake/VersionString.cmake.orig	2013-05-22 21:52:30.000000000 +0200
-+++ cmake/VersionString.cmake	2013-05-22 21:53:26.000000000 +0200
-@@ -47,7 +47,7 @@
- 	set(mode "variable")
- 	
- 	set(args)
--	set(dependencies "${CMAKE_MODULE_PATH}/VersionScript.cmake")
-+	set(dependencies "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake")
- 	
- 	foreach(arg IN LISTS VERSION_SOURCES)
- 		
-@@ -90,7 +90,7 @@
- 			"-DVERSION_SOURCES=${args}"
- 			"-DGIT_DIR=${abs_git_dir}"
- 			${defines}
--			-P "${CMAKE_MODULE_PATH}/VersionScript.cmake"
-+			-P "${CMAKE_CUSTOM_MODULE_PATH}/VersionScript.cmake"
- 		MAIN_DEPENDENCY
- 			"${abs_src}"
- 		DEPENDS