Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/rsync/Makefile,v
retrieving revision 1.131
diff -u -r1.131 Makefile
--- Makefile	8 Apr 2008 19:24:06 -0000	1.131
+++ Makefile	6 May 2008 15:28:33 -0000
@@ -55,6 +55,8 @@
 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 @@
 
 .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 @@
 	@${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/