4 files changed, 32 insertions, 8 deletions

diff --git a/devel/llvm32/Makefile b/devel/llvm32/Makefile
index 2102ca862833..46c681f76c52 100644
--- a/devel/llvm32/Makefile
+++ b/devel/llvm32/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -16,6 +17,7 @@ LLVM_SUFFIX=	${PORTVERSION:S/.//g}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
@@ -73,6 +75,12 @@ COMMANDS=	bugpoint \
 		opt
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		libLLVM-${PORTVERSION}.so.0 \
+		libLTO.so \
+		libprofile_rt.so
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERTS}
@@ -168,6 +176,7 @@ post-install:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \
 	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0
 	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
+	${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|}
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index 5d051bc2f4d0..e34c31735717 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	3.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -17,6 +17,7 @@ LLVM_SUFFIX=	${PORTVERSION:S/.//g}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
@@ -75,6 +76,12 @@ COMMANDS=	bugpoint \
 		opt
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		libLLVM-${PORTVERSION}.so.0 \
+		libLTO.so \
+		libprofile_rt.so
+
 # Enable AMD r600 backend used by the r600/radeonsi graphics/dri gallium drivers
 CONFIGURE_ARGS+=--enable-experimental-targets=R600
 
@@ -173,6 +180,7 @@ post-install:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \
 	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0
 	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
+	${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|}
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
diff --git a/lang/clang32/Makefile b/lang/clang32/Makefile
index 9bc950c70bc4..ddaa7be8368b 100644
--- a/lang/clang32/Makefile
+++ b/lang/clang32/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
@@ -108,16 +109,19 @@ post-build:
 .endif
 
 post-install:
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	     ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps
+	cd ${WRKSRC}/tools/clang/docs/tools && \
+	    ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps
 .endif
 	${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index c84c7c4c10ab..53b3f7e93677 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
@@ -110,16 +110,19 @@ post-build:
 .endif
 
 post-install:
-	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	     ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps
+	cd ${WRKSRC}/tools/clang/docs/tools && \
+	    ${GMAKE} DESTDIR=${STAGEDIR}/ install-html install-ps
 .endif
 	${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1