From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 17 21:35:03 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0DEF9DB5;
 Sun, 17 Nov 2013 21:35:02 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1EBCF25F0;
 Sun, 17 Nov 2013 21:35:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHLZ0gL074162;
 Sun, 17 Nov 2013 21:35:00 GMT (envelope-from rakuco@svn.freebsd.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHLZ0Fj074153;
 Sun, 17 Nov 2013 21:35:00 GMT (envelope-from rakuco@svn.freebsd.org)
Message-Id: <201311172135.rAHLZ0Fj074153@svn.freebsd.org>
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 17 Nov 2013 21:35:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334124 - in head/archivers/unalz: . 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.16
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: Sun, 17 Nov 2013 21:35:03 -0000

Author: rakuco
Date: Sun Nov 17 21:35:00 2013
New Revision: 334124
URL: http://svnweb.freebsd.org/changeset/ports/334124

Log:
  - Fix the build with libc++.
  - Fix the build with iconv in base.
  - Be verbose in the sed calls done in post-patch.

Modified:
  head/archivers/unalz/Makefile
  head/archivers/unalz/files/patch-UnAlz.cpp

Modified: head/archivers/unalz/Makefile
==============================================================================
--- head/archivers/unalz/Makefile	Sun Nov 17 21:08:54 2013	(r334123)
+++ head/archivers/unalz/Makefile	Sun Nov 17 21:35:00 2013	(r334124)
@@ -30,7 +30,9 @@ UNALZ_OBJS=	main.o UnAlz.o UnAlzUtils.o 
 		UnAlzBzip2.o UnAlzbzlib.o
 
 post-patch:
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
+		's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e \
 		'/<sys\/timeb.h>/d' ${WRKSRC}/main.cpp
 
 do-install:

Modified: head/archivers/unalz/files/patch-UnAlz.cpp
==============================================================================
--- head/archivers/unalz/files/patch-UnAlz.cpp	Sun Nov 17 21:08:54 2013	(r334123)
+++ head/archivers/unalz/files/patch-UnAlz.cpp	Sun Nov 17 21:35:00 2013	(r334124)
@@ -1,5 +1,14 @@
 --- UnAlz.cpp.orig
 +++ UnAlz.cpp
+@@ -37,7 +37,7 @@
+ #	include <errno.h>
+ #endif
+ 
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+ #	include <sys/param.h>	// __NetBSD_Version__
+ #	include <errno.h>		// iconv.h ¶§¹®¿¡ ÇÊ¿ä 
+ #endif
 @@ -1907,7 +1907,11 @@
  ////////////////////////////////////////////////////////////////////////////////////////////////////
  UINT32 CUnAlz::CRC32(UINT32 l, BYTE c)