From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 12 16:20:51 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C89C4A4A;
 Wed, 12 Jun 2013 16:20:51 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BAFFD19DD;
 Wed, 12 Jun 2013 16:20:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CGKpql061659;
 Wed, 12 Jun 2013 16:20:51 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CGKpH8061658;
 Wed, 12 Jun 2013 16:20:51 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201306121620.r5CGKpH8061658@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 12 Jun 2013 16:20:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320704 - head/devel/llvm-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jun 2013 16:20:51 -0000

Author: brooks
Date: Wed Jun 12 16:20:51 2013
New Revision: 320704
URL: http://svnweb.freebsd.org/changeset/ports/320704

Log:
  Correct some WRKDIR relative paths in the cmake files so they actually
  work.  I've verified that libobjc2 builds with them installed.
  
  Remove the conflict with llvm-3.3 and later.  Newer ports will not
  conflict.

Modified:
  head/devel/llvm-devel/Makefile

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Wed Jun 12 16:08:37 2013	(r320703)
+++ head/devel/llvm-devel/Makefile	Wed Jun 12 16:20:51 2013	(r320704)
@@ -7,6 +7,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.4.r${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -20,7 +21,7 @@ BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
 .endif
 
-CONFLICTS=	llvm-[23]* llvm31-[3]*
+CONFLICTS=	llvm-2* llvm-3.[012]* llvm31-[3]*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -126,9 +127,12 @@ post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
 
-pre-configure:
+post-configure:
 	${MKDIR} ${WRKDIR}/cmake
 	cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC}
+	${REINPLACE_CMD} -e 's|${WRKDIR}/cmake|${PREFIX}|' \
+	    -e 's|${WRKSRC}|${DATADIR}|' \
+	    ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}