From amdmi3@amdmi3.ru  Wed Aug 26 00:04:39 2009
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCCDF106568B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Aug 2009 00:04:39 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C8688FC49
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Aug 2009 00:04:39 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
	(Exim 4.69)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1Mg60E-000146-JR; Wed, 26 Aug 2009 04:04:38 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 57A38B860;
	Wed, 26 Aug 2009 04:04:37 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 71E53108842; Wed, 26 Aug 2009 04:04:22 +0400 (MSD)
Message-Id: <20090826000422.71E53108842@hades.panopticon>
Date: Wed, 26 Aug 2009 04:04:22 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kde@FreeBSD.org
Subject: [PATCH] devel/cmake: support custom PREFIX/LOCALBASE
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         138187
>Category:       ports
>Synopsis:       [PATCH] devel/cmake: support custom PREFIX/LOCALBASE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 26 00:10:00 UTC 2009
>Closed-Date:    Sat Aug 29 07:37:55 UTC 2009
>Last-Modified:  Sat Aug 29 07:37:55 UTC 2009
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.0-BETA2 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Thu Jul 30 19:51:12 MSD 2009
>Description:
While the port replaces /usr/X11R6 to ${LOCALBASE} in cmake modules, it doesn't replace /usr/local, so with custom PREFIX/LOCALBASE some cmake-using ports will fail, as they won't be able to find required libs headers. For instance, that happens with spring which uses FindSDL.cmake.


Port maintainer (kde@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- cmake-2.6.4_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.32
diff -u -u -r1.32 Makefile
--- Makefile	4 Aug 2009 19:33:08 -0000	1.32
+++ Makefile	26 Aug 2009 00:01:03 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	cmake
 PORTVERSION=	2.6.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/
 
@@ -37,8 +38,10 @@
 		ctest.1
 
 post-patch:
-	@${GREP} -rl '/usr/X11R6' ${WRKSRC}/Modules ${WRKSRC}/Tests | \
-		${XARGS} ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g'
+	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
+		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
+		${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \
+			s,/usr/X11R6,${LOCALBASE},g'
 	@${REINPLACE_CMD} -e 's,/opt/kde4,${LOCALBASE}/kde4,g' \
 		${WRKSRC}/Modules/FindKDE4.cmake
 
--- cmake-2.6.4_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 26 00:10:11 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138187 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138187: commit references a PR
Date: Sat, 29 Aug 2009 07:15:25 +0000 (UTC)

 makc        2009-08-29 07:15:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/cmake          Makefile 
   Log:
   Respect LOCALBASE
   
   PR:             based on ports/138187
   Submitted by:   amdmi3
   
   Revision  Changes    Path
   1.33      +8 -2      ports/devel/cmake/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sat Aug 29 07:37:52 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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