Date: Sat, 28 Jun 2014 03:10:53 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359640 - head/net/rsync Message-ID: <201406280310.s5S3ArpC078243@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> - -.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 <bsd.port.options.mk> .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 <bsd.port.pre.mk> .if empty(ICONV_LIB)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406280310.s5S3ArpC078243>