svn commit: r356653 - head/security/i2p

[Jung-uk Kim]

Author: jkim
Date: Thu Jun  5 17:14:33 2014
New Revision: 356653
URL: http://svnweb.freebsd.org/changeset/ports/356653
QAT: https://qat.redports.org/buildarchive/r356653/

Log:
  Fix build with JDK7 and later and make it always dependent upon libiconv
  from the ports tree.
  
  Reported by:	exp-run (PR190511)

Modified:
  head/security/i2p/Makefile

Modified: head/security/i2p/Makefile
==============================================================================
--- head/security/i2p/Makefile	Thu Jun  5 17:11:22 2014	(r356652)
+++ head/security/i2p/Makefile	Thu Jun  5 17:14:33 2014	(r356653)
@@ -24,6 +24,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 LICENSE_DISTFILES=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libiconv.so.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -31,7 +32,7 @@ ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gettext iconv tar:bzip2
+USES=		gettext tar:bzip2
 USE_RC_SUBR=	i2p
 
 USE_ANT=	yes
@@ -42,6 +43,7 @@ JAVA_VERSION=	1.6+
 ALL_TARGET=	\
 		updater \
 		tarball
+MAKE_ENV=	LANG=en_US.UTF-8
 
 PORTDATA=	*
 
@@ -62,14 +64,6 @@ JAVADOC_WRKSRC=	${WRKSRC}/build/javadoc
 
 .include <bsd.port.pre.mk>
 
-# Only works with converters/iconv port due to binary dependency:
-# source code isn't available at this moment
-.if ${OSVERSION} >= 1000043
-IGNORE= libwrapper.so binary depends on converters/iconv port.\
-	Therefore, it's not compatible with FreeBSD 10.x and above. Check\
-	entry 20130904 on ${PORTSDIR}/UPDATING
-.endif
-
 post-patch:
 # postinstall.sh SHOULD only do post installation house keeping
 	@${REINPLACE_CMD} -E \