Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Mar 2014 06:01:54 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346987 - head/devel/cmake
Message-ID:  <201403040601.s2461si3040066@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Tue Mar  4 06:01:54 2014
New Revision: 346987
URL: http://svnweb.freebsd.org/changeset/ports/346987
QAT: https://qat.redports.org/buildarchive/r346987/

Log:
  devel/cmake:
  - Use KDE4_PREFIX instead of ${LOCALBASE}/kde4 [1]
  - Add DOCS option after r346983
  
  Reported by:	Alan Hicks <ahicks@p-o.co.uk> via kde-freebsd maillist [1]

Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Tue Mar  4 02:52:52 2014	(r346986)
+++ head/devel/cmake/Makefile	Tue Mar  4 06:01:54 2014	(r346987)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmake
 PORTVERSION=	2.8.12.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.cmake.org/files/v2.8/
 
@@ -12,6 +12,7 @@ COMMENT?=	Cross-platform Makefile genera
 
 LICENSE=	BSD3CLAUSE
 
+USE_KDE4=	# env
 CONFIGURE_ENV=	MAKE=make
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir="/${DATADIR_REL}" \
@@ -23,6 +24,8 @@ INSTALL_TARGET=	install/strip
 .endif
 
 .if !defined(CMAKE_MODULES)
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
 HAS_CONFIGURE=	yes
 RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules
 .endif
@@ -36,7 +39,7 @@ post-patch:
 		${WRKSRC}/Source/cmLocalGenerator.cxx \
 		${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
 		${WRKSRC}/bootstrap
-	@${REINPLACE_CMD} -e 's,/opt/kde4,${LOCALBASE}/kde4,g' \
+	@${REINPLACE_CMD} -e 's,/opt/kde4,${KDE4_PREFIX},g' \
 		${WRKSRC}/Modules/FindKDE4.cmake
 	@${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \
 	   	${WRKSRC}/Modules/FindDCMTK.cmake



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