From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 17 23:21:36 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70FD363D;
 Tue, 17 Feb 2015 23:21:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5BF5B400;
 Tue, 17 Feb 2015 23:21:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1HNLa43004718;
 Tue, 17 Feb 2015 23:21:36 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1HNLaqi004717;
 Tue, 17 Feb 2015 23:21:36 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201502172321.t1HNLaqi004717@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 17 Feb 2015 23:21:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379195 - head/archivers/unzip/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2015 23:21:36 -0000

Author: delphij
Date: Tue Feb 17 23:21:35 2015
New Revision: 379195
URL: https://svnweb.freebsd.org/changeset/ports/379195
QAT: https://qat.redports.org/buildarchive/r379195/

Log:
  Fix build.  The merge should have been tested against an ICONV build.
  
  Submitted by:	jbeich
  Pointy hat to:	delphij
  MFH:		2015Q1

Modified:
  head/archivers/unzip/files/extra-iconv-patch-unix_unix.c

Modified: head/archivers/unzip/files/extra-iconv-patch-unix_unix.c
==============================================================================
--- head/archivers/unzip/files/extra-iconv-patch-unix_unix.c	Tue Feb 17 22:04:26 2015	(r379194)
+++ head/archivers/unzip/files/extra-iconv-patch-unix_unix.c	Tue Feb 17 23:21:35 2015	(r379195)
@@ -1,5 +1,5 @@
---- unix/unix.c.orig	2009-01-23 23:31:26 UTC
-+++ unix/unix.c
+--- unix.c.orig	2015-02-17 15:18:36.176142072 -0800
++++ unix.c	2015-02-17 15:18:56.289341100 -0800
 @@ -30,6 +30,9 @@
  #define UNZIP_INTERNAL
  #include "unzip.h"
@@ -10,7 +10,7 @@
  #ifdef SCO_XENIX
  #  define SYSNDIR
  #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,90 @@ static void qlfix(__G__ ef_ptr, ef_len)
+@@ -1874,3 +1877,102 @@
      }
  }
  #endif /* QLZIP */