diff options
| author | mat <mat@FreeBSD.org> | 2016-04-23 13:13:12 +0000 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-04-23 13:13:12 +0000 |
| commit | c81130ed47d47565800cc049e21a49d0927d759a (patch) | |
| tree | 94dc590377e30bc84c631b8e86c1e7c58617f9c8 | |
| parent | 661a45d8f69dd9a6d8df51f0620fd9ae1f56b5d8 (diff) | |
| download | FreeBSD-ports-c81130ed47d47565800cc049e21a49d0927d759a.zip FreeBSD-ports-c81130ed47d47565800cc049e21a49d0927d759a.tar.gz | |
Fix ICONV support.
PR: 208958
Submitted by: mat
Reviewed by: tijl
Approved by: maintainer
Sponsored by: Absolight
| -rw-r--r-- | net/rsync/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index a86bc49..be931b9 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -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}/patches/detect-renamed.diff 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> |
