Date: Sun, 2 Mar 2014 09:18:30 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346745 - in head: devel/cvs-syncmail devel/cvs2html net-mgmt/rancid Message-ID: <201403020918.s229IUpl063357@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Mar 2 09:18:29 2014 New Revision: 346745 URL: http://svnweb.freebsd.org/changeset/ports/346745 QAT: https://qat.redports.org/buildarchive/r346745/ Log: net-mgmt/rancid, devel/cvs(2html,-syncmail): Fix recent cvs dependency CVS is no longer in base on FreeBSD 10 and later, but it's still in DragonFly's base, and the devel/cvs port doesn't even build on DF. The dependence on CVS was added to some ports recently, make sure that only applies to FreeBSD. Note the rancid approach where it further limits it to FreeBSD 10+ is better than devel/cvs* where they pull in CVS unconditionally on FreeBSD 8 and 9 where it's not needed. The unmaintained cvs-syncmail port was updated to be like rancid, but I didn't make the same update to the maintained cvs2html port. Modified: head/devel/cvs-syncmail/Makefile head/devel/cvs2html/Makefile head/net-mgmt/rancid/Makefile Modified: head/devel/cvs-syncmail/Makefile ============================================================================== --- head/devel/cvs-syncmail/Makefile Sun Mar 2 09:10:35 2014 (r346744) +++ head/devel/cvs-syncmail/Makefile Sun Mar 2 09:18:29 2014 (r346745) @@ -11,8 +11,6 @@ EXTRACT_SUFX= MAINTAINER= ports@FreeBSD.org COMMENT= CVS notification tool -RUN_DEPENDS= cvs:${PORTSDIR}/devel/cvs - USES= shebangfix SHEBANG_FILES= ${DISTNAME} NO_BUILD= yes @@ -21,6 +19,12 @@ USE_PYTHON= yes PLIST_FILES= bin/${DISTNAME} +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${OPSYS} > 1000000 +RUN_DEPENDS= cvs:${PORTSDIR}/devel/cvs +.endif + do-extract: @${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} @@ -28,4 +32,4 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${DISTNAME} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/devel/cvs2html/Makefile ============================================================================== --- head/devel/cvs2html/Makefile Sun Mar 2 09:10:35 2014 (r346744) +++ head/devel/cvs2html/Makefile Sun Mar 2 09:18:29 2014 (r346745) @@ -16,14 +16,19 @@ COMMENT= Perl script to turn ``cvs log'' LICENSE= GPLv2 -RUN_DEPENDS= cvs:${PORTSDIR}/devel/cvs - PLIST_FILES= bin/cvs2html NO_WRKSUBDIR= yes NO_BUILD= yes USES= perl5 shebangfix SHEBANG_FILES= ${PORTNAME} +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD +# DragonFly has CVS in base and devel/cvs doesn't build there +RUN_DEPENDS= cvs:${PORTSDIR}/devel/cvs +.endif + do-extract: @${MKDIR} ${WRKSRC} @${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC} @@ -31,4 +36,4 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/net-mgmt/rancid/Makefile ============================================================================== --- head/net-mgmt/rancid/Makefile Sun Mar 2 09:10:35 2014 (r346744) +++ head/net-mgmt/rancid/Makefile Sun Mar 2 09:18:29 2014 (r346745) @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-svn BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion .else CONFIGURE_ARGS+= --without-svn -.if ${OSVERSION} >= 1000000 +.if ${OPSYS} == DragonFly && ${OSVERSION} >= 1000000 RUN_DEPENDS+= cvs>0:${PORTSDIR}/devel/cvs .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403020918.s229IUpl063357>