From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 26 00:10:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC9AC1065693 for ; Wed, 26 Aug 2009 00:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 87BFC8FC26 for ; Wed, 26 Aug 2009 00:10:01 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7Q0A1kV030338 for ; Wed, 26 Aug 2009 00:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7Q0A1Q1030337; Wed, 26 Aug 2009 00:10:01 GMT (envelope-from gnats) Resent-Date: Wed, 26 Aug 2009 00:10:01 GMT Resent-Message-Id: <200908260010.n7Q0A1Q1030337@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCCDF106568B for ; 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 ; 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 ) 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: kde@FreeBSD.org Subject: ports/138187: [PATCH] devel/cmake: support custom PREFIX/LOCALBASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2009 00:10:01 -0000 >Number: 138187 >Category: ports >Synopsis: [PATCH] devel/cmake: support custom PREFIX/LOCALBASE >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: Wed Aug 26 00:10:00 UTC 2009 >Closed-Date: >Last-Modified: >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: >Unformatted: