From owner-svn-ports-all@FreeBSD.ORG Tue Mar 25 13:20:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EC9FB17; Tue, 25 Mar 2014 13:20:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08CD6ADB; Tue, 25 Mar 2014 13:20:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PDKsnS000983; Tue, 25 Mar 2014 13:20:54 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PDKsEM000982; Tue, 25 Mar 2014 13:20:54 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201403251320.s2PDKsEM000982@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 25 Mar 2014 13:20:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349139 - head/net/rsync X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 13:20:55 -0000 Author: tijl Date: Tue Mar 25 13:20:54 2014 New Revision: 349139 URL: http://svnweb.freebsd.org/changeset/ports/349139 QAT: https://qat.redports.org/buildarchive/r349139/ Log: - Bump PORTREVISION after the latest change to converters/libiconv because rsync uses locale_charset when the ICONV option is enabled. [1] - Replace CFLAGS+=-I... with CPPFLAGS+=-I... to fix warnings during configure about headers being accepted by the compiler but not the preprocessor. - Replace CONFIGUREDCFLAGS (guard against CFLAGS damage by MAKE_ENV) with CPPFLAGS. The dist makefile contains CFLAGS=@CFLAGS@ so CFLAGS in MAKE_ENV isn't a problem. - Replace ac_cv_header_iconv_h=no with --disable-iconv-open. The first disables HAVE_ICONV_H while the latter disables USE_ICONV_OPEN but both are checked in rsync.h: #if defined USE_ICONV_OPEN && defined HAVE_ICONV_H - Set ac_cv_search_libiconv_open=no when empty(ICONV_LIB). This prevents detection of libiconv when the ICONV option is disabled, but it is also needed on FreeBSD 10 with libiconv installed to prevent linking with -liconv. - New LIB_DEPENDS syntax. - Move pre-configure to post-patch. - Remove malloc.h patching. - Replace MAKE with MAKE_CMD. MAKE is the currently running make and MAKE_CMD is the make used to build the port. - Unmute installation commands. Reported by: "Kenta S." [1] Approved by: ehaupt Modified: head/net/rsync/Makefile Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Tue Mar 25 13:10:12 2014 (r349138) +++ head/net/rsync/Makefile Tue Mar 25 13:20:54 2014 (r349139) @@ -3,7 +3,7 @@ PORTNAME= rsync PORTVERSION= 3.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org/pub/%SUBDIR%/ \ @@ -71,18 +71,14 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/atimes .if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MRENFL} DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX} -CFLAGS+= -I${LOCALBASE}/include .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv -CONFIGUREDCFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV+= CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else -CONFIGURE_ARGS+= --disable-iconv -CONFIGURE_ENV+= ac_cv_search_libiconv_open=no -CONFIGURE_ENV+= ac_cv_header_iconv_h=no +CONFIGURE_ARGS+=--disable-iconv --disable-iconv-open .endif .if ${PORT_OPTIONS:MFLAGS} @@ -111,9 +107,9 @@ EXTRA_PATCHES+= ${WRKSRC}/patches/acls.d .endif .if ${PORT_OPTIONS:MPOPT_PORT} -LIB_DEPENDS+= popt:${PORTSDIR}/devel/popt -CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -I${LOCALBASE}/include +LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .else CONFIGURE_ARGS+= --with-included-popt .endif @@ -124,25 +120,24 @@ CONFIGURE_ARGS+= --with-rsh=ssh CONFIGURE_ARGS+= --with-rsh=rsh .endif -# guard against CFLAGS damage by MAKE_ENV -post-patch: - @${REINPLACE_CMD} -e 's|CFLAGS|CONFIGUREDCFLAGS|' \ - -e 's|perl.*|${DO_NADA}|' \ - ${WRKSRC}/Makefile.in +.include + +.if empty(ICONV_LIB) +CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no +.endif -pre-configure: +post-patch: + @${REINPLACE_CMD} -e 's|perl.*|${DO_NADA}|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's:/etc/:${PREFIX}/etc/:g' \ ${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ - ${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rsync - @${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${PREFIX}/etc/ + ${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${PREFIX}/etc/ @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} test: build - @cd ${WRKSRC} && ${MAKE} check + @(cd ${WRKSRC} && ${MAKE_CMD} check) -.include +.include