View | Details | Raw Unified | Return to bug 123469
Collapse All | Expand All

(-)Makefile (-6 / +3 lines)
Lines 55-60 Link Here
55
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
55
CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
56
.else
56
.else
57
CONFIGURE_ARGS+=	--disable-iconv
57
CONFIGURE_ARGS+=	--disable-iconv
58
CONFIGURE_ENV+=		ac_cv_search_libiconv_open=no
59
CONFIGURE_ENV+=		ac_cv_header_iconv_h=no
58
.endif
60
.endif
59
61
60
.if defined(WITH_FLAGS)
62
.if defined(WITH_FLAGS)
Lines 71-77 Link Here
71
73
72
.if defined(WITH_POPT_PORT)
74
.if defined(WITH_POPT_PORT)
73
LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
75
LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
74
CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
76
CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
75
		LIBS="-L${LOCALBASE}/lib"
77
		LIBS="-L${LOCALBASE}/lib"
76
.else
78
.else
77
CONFIGURE_ARGS+=	--with-included-popt
79
CONFIGURE_ARGS+=	--with-included-popt
Lines 91-101 Link Here
91
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
93
	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
92
		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
94
		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
93
95
94
.if defined(WITHOUT_ICONV)
95
post-configure:
96
	@${REINPLACE_CMD} -e 's|-liconv||' ${WRKSRC}/Makefile
97
.endif
98
99
post-install:
96
post-install:
100
	@${STRIP_CMD} ${PREFIX}/bin/rsync
97
	@${STRIP_CMD} ${PREFIX}/bin/rsync
101
	@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/
98
	@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/

Return to bug 123469