Upgrade to LLVM 2.6.

1 files changed, 17 insertions, 18 deletions

diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index 98b6a81dec47..9cd67a3f04cb 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	llvm
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
-CONFLICTS=	llvm-2.4.s* llvm-2.6.r*
-
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
@@ -22,9 +20,13 @@ BUILD_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
+CONFLICTS=	llvm-2.[12345]* llvm-2.7.r*
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
+MAKE_JOBS_SAFE=	yes
 
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
@@ -58,14 +60,6 @@ post-patch:
 	${REINPLACE_CMD} -e 's|%%DOCSRCDIR%%|${DOCSRCDIR}|' \
 	    ${WRKSRC}/Makefile
 
-post-build:
-	cd ${WRKSRC}/docs/CommandGuide && \
-	    ${GMAKE} man
-
-post-install:
-	cd ${WRKSRC}/docs/CommandGuide && \
-	    ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
-
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
@@ -82,23 +76,28 @@ PLIST_FILE_LIST=	bin/bugpoint \
 			bin/lli \
 			bin/llvm* \
 			bin/opt \
-			lib/LLVM* \
+			bin/tblgen \
+			lib/libCompilerDriver.a \
+			lib/libLTO.* \
 			lib/libLLVM* \
-			lib/plugin_llvm*
+			lib/libplugin_llvmc* \
+			lib/libprofile_rt.so
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm
 build-plist:
-	${RM} ${PLIST}
+	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
 	    ${SORT} >> ${PLIST}
-	${FIND} ${DOCSDIR} -type f | \
-	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
+	${FIND} ${DATADIR} ${DOCSDIR} -type f | \
+	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
+	     -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
 	cd ${PREFIX} && \
 	    ${FIND} ${PLIST_DIR_LIST} -type d | \
 	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
 	${FIND} ${DOCSDIR} -type d | ${SORT} -r | \
-	    ${SED} -e 's|^|%%PORTDOCS%%@dirrm |' \
-	    -e 's|${DOCSDIR}|%%DOCSDIR%%|' >> ${PLIST}
+	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
+	     -e 's|${DOCSDIR}|%%DOCSDIR%%|' \
+	     -e 's|^|%%PORTDOCS%%@dirrm |' >> ${PLIST}
 
 .include <bsd.port.post.mk>