From 7258de6f3e27a5bc069b9779b43c995fd57dd48d Mon Sep 17 00:00:00 2001
From: rakuco <rakuco@FreeBSD.org>
Date: Sun, 17 Nov 2013 21:35:00 +0000
Subject: - Fix the build with libc++. - Fix the build with iconv in base. - Be
 verbose in the sed calls done in post-patch.

---
 archivers/unalz/Makefile              | 4 +++-
 archivers/unalz/files/patch-UnAlz.cpp | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 900273cbb713..c317d4d43eb1 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -30,7 +30,9 @@ UNALZ_OBJS=	main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.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:
diff --git a/archivers/unalz/files/patch-UnAlz.cpp b/archivers/unalz/files/patch-UnAlz.cpp
index b5e3aad67761..6bb4d2e3d5a5 100644
--- a/archivers/unalz/files/patch-UnAlz.cpp
+++ b/archivers/unalz/files/patch-UnAlz.cpp
@@ -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)
-- 
cgit