3 files changed, 23 insertions, 24 deletions

diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index c931797ed1b8..9a5e1f634793 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -78,7 +78,6 @@ FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 # Enable AMD r600 backend used by the r600/radeonsi graphics/dri gallium drivers
 CONFIGURE_ARGS+=--enable-experimental-targets=R600
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERTS}
@@ -114,7 +113,7 @@ MAN1SRCS=	bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
 		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
 		llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
-MAN1=	${MAN1SRCS:S/.1/${LLVM_SUFFIX}.1/}
+PLIST_FILES+==	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 .endif
 
 .include <bsd.port.pre.mk>
@@ -159,29 +158,30 @@ post-build:
 .endif
 
 post-install:
-	${MV} ${PREFIX}/llvm33/lib/${LIBNAME} ${LLVM_PREFIX}/lib/${LIBNAME}.0
-	${LN} -sf ${LIBNAME}.0 ${LLVM_PREFIX}/lib/${LIBNAME}
+	${MV} ${STAGEDIR}${PREFIX}/llvm33/lib/${LIBNAME} \
+	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0
+	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	    ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	${LN} -f ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
-	    ${PREFIX}/bin/${command}${LLVM_SUFFIX}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 .if ${PORT_OPTIONS:MCMAKE}
-	${MKDIR} ${DATADIR}/cmake
-	${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake ${DATADIR}/cmake/
-	${INSTALL_DATA} ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \
-	    ${DATADIR}/cmake/
+	${MKDIR} ${STAGEDIR}${DATADIR}/cmake
+	${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake \
+	    ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \
+	    ${STAGEDIR}${DATADIR}/cmake/
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/html
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${FIND} ${WRKSRC}/docs/_build/html -type f | \
-	    ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/
+	    ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${STAGEDIR}${DOCSDIR}/html/
 .endif
 .if ${PORT_OPTIONS:MMANPAGES}
 	for man in ${MAN1SRCS}; do \
 		${INSTALL_MAN} ${WRKSRC}/docs/_build/man/$${man} \
-		     ${MANPREFIX}/man/man1/$${man%.1}${LLVM_SUFFIX}.1 ; \
+		    ${STAGEDIR}${MANPREFIX}/man/man1/$${man%.1}${LLVM_SUFFIX}.1 ; \
 	done
 .endif
 
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index f68e2dbc543a..affee39cfc6b 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -49,12 +49,10 @@ OPTIONS_DEFINE=	ASSERTS DOCS
 
 ASSERTS_DESC=	Enable assertions (thread unsafe)
 
-CONFIGURE_ARGS+=	--enable-optimized
+CONFIGURE_ARGS+=	--enable-optimized --enable-shared
 # Build some docs manually later
 CONFIGURE_ARGS+=	--disable-docs
 
-MAN1=		clang${LLVM_SUFFIX}.1
-
 PLIST_SUB+=		PORTVERSION=${PORTVERSION}
 
 COMMANDS=	c-index-test \
@@ -66,7 +64,6 @@ COMMANDS=	c-index-test \
 		clang-tblgen
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERTS}
@@ -113,18 +110,18 @@ post-build:
 .endif
 
 post-install:
-	${LN} -sf ${LLVM_PREFIX}/bin/clang ${LLVM_PREFIX}/bin/clang-cpp
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
-	     ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+	     ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
-	${LN} -f ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
-	    ${PREFIX}/bin/${command}${LLVM_SUFFIX}
+	${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} 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 \
-	    ${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1
+	    ${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1
 
 PLIST_FILE_LIST=	${COMMANDS:S|^|bin/|} \
 			lib/libclang*
@@ -140,6 +137,7 @@ build-plist:
 	(ls ${PLIST_FILE_LIST:S|^|${LLVM_PREFIX}/|}; \
 	    ${FIND} ${PLIST_DIR_LIST:S|^|${LLVM_PREFIX}/|} -type f) | \
 	    ${SED} -e 's|${PREFIX}/||' | ${SORT} >> ${PLIST}
+	echo man/man1/clang${LLVM_SUFFIX}.1.gz >> ${PLIST}
 	${FIND} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
 	    ${SORT} >> ${PLIST}
diff --git a/lang/clang33/pkg-plist b/lang/clang33/pkg-plist
index 24ad14e2a41f..579875a9df31 100644
--- a/lang/clang33/pkg-plist
+++ b/lang/clang33/pkg-plist
@@ -463,6 +463,7 @@ llvm33/lib/libclangStaticAnalyzerCheckers.a
 llvm33/lib/libclangStaticAnalyzerCore.a
 llvm33/lib/libclangStaticAnalyzerFrontend.a
 llvm33/lib/libclangTooling.a
+man/man1/clang33.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps