Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Dec 2006 12:05:50 +0100
From:      "Beat Gaetzi" <beat@chruetertee.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/106556: [PATCH] misc/tinderbox: Fix path of csup for systems without csup in base
Message-ID:  <4513C5E20146C7A3@mail13.bluewin.ch> (added by postmaster@bluewin.ch)
Resent-Message-ID: <200612101110.kBABADuH071408@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         106556
>Category:       ports
>Synopsis:       [PATCH] misc/tinderbox: Fix path of csup for systems without csup in base
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 10 11:10:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Beat Gätzi
>Release:        FreeBSD 6.2-RC1 i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 6.2-RC1 FreeBSD 6.2-RC1 #0: Sun Nov 19 19:23:21 CET 2006 beat@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386


	
>Description:
	Fix path of csup for systems where csup is builded from the ports
	
>How-To-Repeat:
	Run tinderbox on a system where csup isn't in base
	
>Fix:

	

--- tinderbox.patch begins here ---
--- tinderbox.ori/Makefile	Sun Dec 10 11:41:34 2006
+++ tinderbox/Makefile	Sun Dec 10 11:52:09 2006
@@ -103,6 +103,14 @@
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
+	${SED} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/create > ${WRKSRC}/create.sed
+	${SED} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/tc > ${WRKSRC}/tc.sed
+	${MV} ${WRKSRC}/create.sed ${WRKSRC}/create
+	${MV} ${WRKSRC}/tc.sed ${WRKSRC}/tc
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
--- tinderbox.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4513C5E20146C7A3>