Date: Sat, 23 Apr 2016 13:13:12 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413870 - head/net/rsync Message-ID: <201604231313.u3NDDCVC074943@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604231313.u3NDDCVC074943>