From owner-svn-ports-all@FreeBSD.ORG Sat Jun 28 03:10:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 802D738D; Sat, 28 Jun 2014 03:10:53 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6116F2A10; Sat, 28 Jun 2014 03:10:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S3ArRl078292; Sat, 28 Jun 2014 03:10:53 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S3ArpC078243; Sat, 28 Jun 2014 03:10:53 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201406280310.s5S3ArpC078243@svn.freebsd.org> From: Adam Weinberger Date: Sat, 28 Jun 2014 03:10:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359640 - 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.18 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: Sat, 28 Jun 2014 03:10:53 -0000 Author: adamw Date: Sat Jun 28 03:10:52 2014 New Revision: 359640 URL: http://svnweb.freebsd.org/changeset/ports/359640 QAT: https://qat.redports.org/buildarchive/r359640/ Log: Use OPTIONS helpers. Modified: head/net/rsync/Makefile Modified: head/net/rsync/Makefile ============================================================================== --- head/net/rsync/Makefile Sat Jun 28 01:10:44 2014 (r359639) +++ head/net/rsync/Makefile Sat Jun 28 03:10:52 2014 (r359640) @@ -19,6 +19,7 @@ COMMENT= Network file distribution/synch LICENSE= GPLv3 +PATCH_STRIP= -p1 GNU_CONFIGURE= yes USE_RC_SUBR= rsyncd SUB_LIST= NAME=rsyncd @@ -49,64 +50,33 @@ ACL_DESC= Add backward-compatibility for # define default options OPTIONS_DEFAULT=SSH FLAGS -.include - -.if ${PORT_OPTIONS:MZLIB_BASE} -CONFIGURE_ARGS+= --with-included-zlib=no -.endif +ZLIB_BASE_CONFIGURE_ARGS= --with-included-zlib=no +TIMELIMIT_EXTRA_PATCHES= ${WRKSRC}/patches/time-limit.diff +ATIMES_EXTRA_PATCHES= ${WRKSRC}/patches/atimes.diff +FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ + ${FILESDIR}/extrapatch-main.c +RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff +ACL_EXTRA_PATCHES= ${WRKSRC}/patches/acls.diff + +ICONV_USES= iconv +ICONV_CPPFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_CONFIGURE_ENABLE= iconv iconv-open + +POPT_PORT_LIB_DEPENDS= libopt.so:${PORTSDIR}/devel/popt +POPT_PORT_CPPFLAGS= -I${LOCALBASE}/include +POPT_PORT_LDFLAGS= -L${LOCALBASE}/lib +POPT_CONFIGURE_WITH= included-popt -.if ${PORT_OPTIONS:MTIMELIMIT} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff -.endif +SSH_CONFIGURE_ON= --with-rsh=ssh +SSH_CONFIGURE_OFF= --with-rsh=rsh -.if ${PORT_OPTIONS:MATIMES} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/atimes.diff -.endif +.include .if ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MACL} || make(makesum) || ${PORT_OPTIONS:MTIMELIMIT} || ${PORT_OPTIONS:MATIMES} || ${PORT_OPTIONS:MRENAMED} DISTFILES+= ${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX} .endif -.if ${PORT_OPTIONS:MICONV} -USES+= iconv -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+=--disable-iconv --disable-iconv-open -.endif - -.if ${PORT_OPTIONS:MFLAGS} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/fileflags.diff \ - ${FILESDIR}/extrapatch-main.c -.endif - -.if ${PORT_OPTIONS:MRENAMED} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/detect-renamed.diff -.endif - -.if ${PORT_OPTIONS:MACL} -PATCH_STRIP= -p1 -EXTRA_PATCHES+= ${WRKSRC}/patches/acls.diff -.endif - -.if ${PORT_OPTIONS:MPOPT_PORT} -LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-included-popt -.endif - -.if ${PORT_OPTIONS:MSSH} -CONFIGURE_ARGS+= --with-rsh=ssh -.else -CONFIGURE_ARGS+= --with-rsh=rsh -.endif - .include .if empty(ICONV_LIB)