From owner-svn-ports-head@freebsd.org Sat Apr 23 13:13:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7C03EB1AEE2; Sat, 23 Apr 2016 13:13:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B09217B5; Sat, 23 Apr 2016 13:13:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3NDDCkD074944; Sat, 23 Apr 2016 13:13:12 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3NDDCVC074943; Sat, 23 Apr 2016 13:13:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201604231313.u3NDDCVC074943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sat, 23 Apr 2016 13:13:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413870 - head/net/rsync 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.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Apr 2016 13:13:13 -0000 Author: mat Date: Sat Apr 23 13:13:12 2016 New Revision: 413870 URL: https://svnweb.freebsd.org/changeset/ports/413870 Log: Fix ICONV support. PR: 208958 Submitted by: mat Reviewed by: tijl Approved by: maintainer Sponsored by: Absolight Modified: head/net/rsync/Makefile (contents, props changed) Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Sat Apr 23 13:00:22 2016 (r413869) +++ head/net/rsync/Makefile Sat Apr 23 13:13:12 2016 (r413870) @@ -4,7 +4,7 @@ PORTNAME= rsync PORTVERSION= 3.1.2 CATEGORIES= net ipv6 -PORTREVISION= 2 +PORTREVISION= 3 MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ ftp://ftp.samba.org/pub/rsync/ \ ftp://ftp.sunet.se/pub/unix/admin/rsync/ \ @@ -65,11 +65,10 @@ RENAMED_EXTRA_PATCHES= ${WRKSRC}/patche ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff \ ${FILESDIR}/extrapatch-acl -ICONV_USES= iconv +ICONV_USES= iconv:translit ICONV_CPPFLAGS= -I${LOCALBASE}/include ICONV_LDFLAGS= -L${LOCALBASE}/lib ICONV_CONFIGURE_ENABLE= iconv iconv-open -ICONV_CONFIGURE_OFF= ac_cv_search_libiconv_open=no POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt POPT_PORT_CPPFLAGS= -I${LOCALBASE}/include @@ -85,6 +84,12 @@ SSH_CONFIGURE_OFF= --with-rsh=rsh DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX} .endif +.include + +.if empty(ICONV_LIB) || ! ${PORT_OPTIONS:MICONV} +CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no +.endif + post-patch: @${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's:/etc/:${ETCDIR}/:g' \ @@ -99,4 +104,4 @@ post-install: test: build @(cd ${WRKSRC} && ${MAKE_CMD} check) -.include +.include