aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/rsync/Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index e521f5e65541..272a1457c60e 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -55,6 +55,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
.else
CONFIGURE_ARGS+= --disable-iconv
+CONFIGURE_ENV+= ac_cv_search_libiconv_open=no
+CONFIGURE_ENV+= ac_cv_header_iconv_h=no
.endif
.if defined(WITH_FLAGS)
@@ -71,7 +73,7 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff
.if defined(WITH_POPT_PORT)
LIB_DEPENDS+= popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.else
CONFIGURE_ARGS+= --with-included-popt
@@ -91,11 +93,6 @@ pre-configure:
@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
-.if defined(WITHOUT_ICONV)
-post-configure:
- @${REINPLACE_CMD} -e 's|-liconv||' ${WRKSRC}/Makefile
-.endif
-
post-install:
@${STRIP_CMD} ${PREFIX}/bin/rsync
@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/