svn commit: r334124 - in head/archivers/unalz: . files

[Raphael Kubo da Costa]

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)