Date: Fri, 10 Mar 2006 03:45:23 +0200 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/94288: [PATCH] misc/tinderbox: OPTIONaly depend on c[v]sup Message-ID: <1141955123.89714@it.buh.tecnik93.com> Resent-Message-ID: <200603100150.k2A1o6ml070814@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94288
>Category: ports
>Synopsis: [PATCH] misc/tinderbox: OPTIONaly depend on c[v]sup
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 10 01:50:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.1-PRERELEASE #0: Fri Feb 24 07:01:54 EET 2006
root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_B_P
>Description:
Csup is mature enough to be used and builds much faster that cvsup and dependencies.
Tinderbox now has support for using something else that cvsup for updates.
So offer the option to tun-depend on one or the other.
On HEAD csup is in the base, but I don't think we had a OSVERSION bump since it was imported;
when a new bump is done we should try to install/depend on csup.
>How-To-Repeat:
>Fix:
--- tinderbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/tinderbox/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 24 Feb 2006 02:28:02 -0000 1.13
+++ Makefile 10 Mar 2006 01:33:59 -0000
@@ -6,7 +6,7 @@
PORTNAME= tinderbox
PORTVERSION= 2.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= http://tinderbox.marcuscom.com/
@@ -19,7 +19,9 @@
cvsup:${PORTSDIR}/net/cvsup-without-gui
OPTIONS= PGSQL "With pgsql" On \
- MYSQL "With mysql" Off
+ MYSQL "With mysql" Off \
+ CSUP "Use CSUP for updates" On \
+ CVSUP "Use CVSUP for updates" Off
NO_BUILD= yes
USE_APACHE= yes
@@ -44,6 +46,14 @@
USE_PHP+= mysql
USE_MYSQL= yes
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+.endif
+
+.if defined(WITH_CSUP)
+RUN_DEPENDS+= csup:${PORTSDIR}/net/csup
+.endif
+
+.if defined(WITH_CVSUP)
+RUN_DEPENDS+= cvsup:${PORTSDIR}/net/cvsup-without-gui
.endif
.include "${PORTSDIR}/Mk/bsd.php.mk"
--- tinderbox.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1141955123.89714>