From itetcu@FreeBSD.org  Thu Jun 15 09:52:58 2006
Return-Path: <itetcu@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CB86F16A474
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jun 2006 09:52:58 +0000 (UTC)
	(envelope-from itetcu@FreeBSD.org)
Received: from it.buh.tecnik93.com (it.buh.tecnik93.com [81.196.204.98])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2A48D43D6E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jun 2006 09:52:53 +0000 (GMT)
	(envelope-from itetcu@FreeBSD.org)
Received: from it.buh.tecnik93.com (localhost [127.0.0.1])
	by it.buh.tecnik93.com (Postfix) with ESMTP id 30B4F1765B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Jun 2006 12:52:53 +0300 (EEST)
Message-Id: <1150365173.52349@it.buh.tecnik93.com>
Date: Thu, 15 Jun 2006 12:52:53 +0300
From: "Ion-Mihai "IOnut" Tetcu" <itetcu@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [PATCH] misc/tinderbox: don't depend on net/csup if it's already in base
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify: andreas@syndrom23.de

>Number:         98977
>Category:       ports
>Synopsis:       [PATCH] misc/tinderbox: don't depend on net/csup if it's already in base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 15 10:00:34 GMT 2006
>Closed-Date:    Tue Jun 20 10:45:51 GMT 2006
>Last-Modified:  Tue Jun 20 10:45:51 GMT 2006
>Originator:     Ion-Mihai "IOnut" Tetcu
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Tecnik'93 
>Environment:


System: FreeBSD 6.1-STABLE #5: Fri Jun  9 11:15:37 EEST 2006
    root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_U_P



>Description:


From: Dmitry Morozovsky <marck@rinet.ru>:

upgrading the tinderbox I've seen a glitch with csup:

> Stale dependency: tinderbox-2.3.1 --> csup-20060313 -- manually run 'pkgdb 
-F' to fix, or specify -O to force.

.if defined(WITH_CSUP)
RUN_DEPENDS+=   csup:${PORTSDIR}/net/csup
.endif

But current after 2006/03/14 and RELENG_6 after 2006/05/15 (revisions 1.3 and 
1.3.2.1 of src/usr.bin/M<akefile respectively) has csup included in base system


>How-To-Repeat:





>Fix:


--- ports_tinderbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/tinderbox/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	11 Jun 2006 22:45:36 -0000	1.16
+++ Makefile	15 Jun 2006 09:50:30 -0000
@@ -50,8 +50,10 @@
 .endif
 
 .if defined(WITH_CSUP)
+.if ! exists(/usr/bin/csup)
 RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 .endif
+.endif
 
 .if defined(WITH_CVSUP)
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
--- ports_tinderbox.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 15 10:04:11 UTC 2006 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98977 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jun 15 10:04:19 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98977 
State-Changed-From-To: feedback->closed 
State-Changed-By: itetcu 
State-Changed-When: Tue Jun 20 10:45:49 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98977 
>Unformatted:
