svn commit: r320704 - head/devel/llvm-devel
Brooks Davis
brooks at FreeBSD.org
Wed Jun 12 16:20:51 UTC 2013
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}
More information about the svn-ports-all
mailing list