# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1380245108 14400
# Node ID 869f160d71b67c784fccca7464b951706d7a96d0
# Parent  7fb479d0241c149e95dbbc76a391f0140998d2f4# Parent  a3df5e820bcd46d0f44fc85a496174bac190998b
Merge away extra head

diff -r 7fb479d0241c -r 869f160d71b6 Makefile.in
--- a/Makefile.in	Thu Sep 26 21:18:39 2013 -0400
+++ b/Makefile.in	Thu Sep 26 21:25:08 2013 -0400
@@ -267,10 +267,15 @@
 
 ifeq ($(MXE_SYSTEM),mingw)
   ifneq ($(MXE_NATIVE_BUILD),yes)
-    MSYS_BASE_URL := http://sourceforge.net/projects/mingw/files/MSYS/Base
+    MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS
+    MSYS_BASE_URL := $(MSYS_URL)/Base
+    MSYS_EXTENSION_URL := $(MSYS_URL)/Extension
     MSYS_BASE_VER := 1.0.13
+    MSYS_EXTENSION_VER := 1.0.13
     MSYS_BASE_DIR := $(TOP_DIR)/msys-base
+    MSYS_EXTENSION_DIR := $(TOP_DIR)/msys-extension
     MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap)
+    MSYS_EXTENTION_PACKAGES := $(addprefix msys-, unzip)
 
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
diff -r 7fb479d0241c -r 869f160d71b6 dist-files.mk
--- a/dist-files.mk	Thu Sep 26 21:18:39 2013 -0400
+++ b/dist-files.mk	Thu Sep 26 21:25:08 2013 -0400
@@ -354,6 +354,7 @@
   msys-regex.mk \
   msys-sed.mk \
   msys-tar.mk \
+  msys-unzip.mk \
   msys-termcap.mk \
   msys-texinfo.mk \
   msys-xz.mk \
diff -r 7fb479d0241c -r 869f160d71b6 index.html
--- a/index.html	Thu Sep 26 21:18:39 2013 -0400
+++ b/index.html	Thu Sep 26 21:25:08 2013 -0400
@@ -1847,6 +1847,11 @@
         <td id="msys-tar-website"><a href="http://www.mingw.org/">MinGW tar</a></td>
     </tr>
     <tr>
+        <td id="msys-unzip-package">msys-unzip</td>
+        <td id="msys-unzip-version">6.0-1</td>
+        <td id="msys-unzip-website"><a href="http://www.mingw.org/">MinGW unzip</a></td>
+    </tr>
+    <tr>
         <td id="msys-termcap-package">msys-termcap</td>
         <td id="msys-termcap-version">0.20050421_1-2</td>
         <td id="msys-termcap-website"><a href="http://www.mingw.org/">MinGW termcap</a></td>
diff -r 7fb479d0241c -r 869f160d71b6 src/msys-unzip.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msys-unzip.mk	Thu Sep 26 21:25:08 2013 -0400
@@ -0,0 +1,23 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := msys-unzip
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 38efa45dd20dde43a2911782e796e906a4e9a1cb
+$(PKG)_REMOTE_SUBDIR := unzip/unzip-$($(PKG)_VERSION)
+$(PKG)_SUBDIR   := 
+$(PKG)_FILE     := unzip-$($(PKG)_VERSION)-msys-1.0.13-bin.tar.lzma
+$(PKG)_URL      := $(MSYS_EXTENSION_URL)/$($(PKG)_REMOTE_SUBDIR)/$($(PKG)_FILE)/download
+$(PKG)_DEPS     := 
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+    echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+    mkdir -p '$(MSYS_EXTENSION_DIR)'
+    cd '$(1)' && tar cf - . | ( cd '$(MSYS_EXTENSION_DIR)'; tar xpf - )
+    mkdir -p '$(MSYS_INFO_DIR)'
+    cd '$(1)' && find . > '$(MSYS_INFO_DIR)'/$(PKG).list
+endef