svn commit: r413418 - head/net/rsync

[Mathieu Arnold]

Author: mat
Date: Sat Apr 16 08:02:20 2016
New Revision: 413418
URL: https://svnweb.freebsd.org/changeset/ports/413418

Log:
  Fix building with iconv on 10.1 at least.
  
  Sponsored by:	Absolight

Modified:
  head/net/rsync/Makefile   (contents, props changed)

Modified: head/net/rsync/Makefile
==============================================================================
--- head/net/rsync/Makefile	Sat Apr 16 06:52:14 2016	(r413417)
+++ head/net/rsync/Makefile	Sat Apr 16 08:02:20 2016	(r413418)
@@ -4,7 +4,7 @@
 PORTNAME=	rsync
 PORTVERSION=	3.1.2
 CATEGORIES=	net ipv6
-PORTREVISION=	1
+PORTREVISION=	2
 MASTER_SITES=	http://rsync.samba.org/ftp/rsync/ \
 		ftp://ftp.samba.org/pub/rsync/ \
 		ftp://ftp.sunet.se/pub/unix/admin/rsync/  \
@@ -84,9 +84,7 @@ SSH_CONFIGURE_OFF=	--with-rsh=rsh
 DISTFILES+=	${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
+.if ! ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
 .endif
 
@@ -104,4 +102,4 @@ post-install:
 test: build
 	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>