Index: head/devel/llvm31/Makefile
===================================================================
--- head/devel/llvm31/Makefile	(revision 341851)
+++ head/devel/llvm31/Makefile	(revision 341852)
@@ -1,166 +1,166 @@
 # Created by: Hye-Shik Chang
 # $FreeBSD$
 
 PORTNAME=	llvm31
 PORTVERSION=	3.1
 PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	llvm-${PORTVERSION}.src
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
 DEPRECATED=	No remaining dependencies (except clang31)
-EXPIRATION_DATE=	2013-03-01
+EXPIRATION_DATE=	2014-03-01
 
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 .endif
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
 CONFLICTS=	llvm-[3]* llvm-devel-[23]* llvm29-*
 
 USES=		gmake perl5 shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	2
 
 python_OLD_CMD=	/usr/bin/env python
 python_CMD=	/usr/bin/env python2
 SHEBANG_FILES=	test/Scripts/coff-dump.py test/Scripts/elf-dump \
 		test/Scripts/macho-dumpx utils/clang-parse-diagnostics-file \
 		utils/lit/lit/main.py utils/lit/lit/ProgressBar.py \
 		utils/lit/lit.py utils/llvm-build/llvm-build \
 		utils/llvm-lit/llvm-lit.in utils/Misc/zkill \
 		utils/release/findRegressions-nightly.py \
 		utils/release/findRegressions-simple.py \
 		utils/Target/ARM/analyze-match-table.py
 
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
 CONFIGURE_ARGS+=	--enable-shared
 MAKE_ARGS+=		REQUIRES_RTTI=1
 LIBNAME=		libLLVM-${DISTVERSION:C/\.r[0-9]*//}.so
 
 CONFIGURE_ARGS+=	--enable-bindings=none
 
 OPTIONS_DEFINE=	ASSERTS DOCS LTOPLUGIN
 
 ASSERTS_DESC=	Enable assertions (thread unsafe)
 LTOPLUGIN_DESC=	Build LTO plugin (requires gold)
 
 MAN1=		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-ld.1 llvm-link.1 llvm-nm.1 \
 		llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
 
 PLIST_SUB+=		PORTVERSION=${PORTVERSION}
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-docs
 .else
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
 .if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--enable-assertions
 .else
 CONFIGURE_ARGS+=	--disable-assertions
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
 BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
 RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		lib/LLVMgold.so
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
 BROKEN=		Does not compile on arm
 .elif ${ARCH} == "sparc64"
 BROKEN=		does not compile on sparc64
 .endif
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CONFIGURE_ARGS+=	--enable-pic --with-pic
 .endif
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--with-optimize-option=-O2
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
 
 .if empty(PORT_OPTIONS:MDOCS)
 post-build:
 	@cd ${WRKSRC}/docs/CommandGuide && ${GMAKE} ${MAN1}
 .endif
 
 post-install:
 	${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0
 	${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME}
 .if empty(PORT_OPTIONS:MDOCS)
 .for man in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/docs/CommandGuide/${man} \
 	     ${MANPREFIX}/man/man1/
 .endfor
 .endif
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 PLIST_FILE_LIST=	bin/bugpoint \
 			bin/llc \
 			bin/lli \
 			bin/llvm* \
 			bin/macho-dump \
 			bin/opt \
 			lib/BugpointPasses.so \
 			lib/LLVMHello.so \
 			lib/libLTO.* \
 			lib/libLLVM* \
 			lib/libprofile_rt.a \
 			lib/libprofile_rt.so
 PLIST_DIR_LIST=		include/llvm-c \
 			include/llvm
 build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
 	    ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${DOCSDIR} -type f | \
 	    ${SED} -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|${DOCSDIR}|%%DOCSDIR%%|' \
 	     -e 's|^|%%PORTDOCS%%@dirrm |' >> ${PLIST}
 
 .include <bsd.port.post.mk>
Index: head/lang/clang31/Makefile
===================================================================
--- head/lang/clang31/Makefile	(revision 341851)
+++ head/lang/clang31/Makefile	(revision 341852)
@@ -1,189 +1,189 @@
 # Created by: Brooks Davis
 # $FreeBSD$
 
 PORTNAME=	clang31
 PORTVERSION=	3.1
 PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	clang-${PORTVERSION}.src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${LLVM_SOURCE}
 EXTRACT_ONLY=	${LLVM_SOURCE}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
 DEPRECATED=	No remaining dependencies
-EXPIRATION_DATE=	2013-03-01
+EXPIRATION_DATE=	2014-03-01
 
 CONFLICTS=	clang-[23]* clang-devel-[23]*
 
 CLANG_NAME=	clang-${PORTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 LLVM_NAME=	llvm-${PORTVERSION}.src
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
 BUILD_DEPENDS+=	llvm31>=${PORTVERSION}:${PORTSDIR}/devel/llvm31
 RUN_DEPENDS+=	llvm31>=${PORTVERSION}:${PORTSDIR}/devel/llvm31
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 .if defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
 GNU_CONFIGURE=	yes
 USES=		gmake perl5
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
 		LLVMIncDir=${LOCALBASE}/include \
 		LLVMToolDir=${LOCALBASE}/bin \
 		LLVMLibDir=${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	ASSERTS DOCS
 
 ASSERTS_DESC=	Enable assertions (thread unsafe)
 
 MAN1=		clang.1
 
 PLIST_SUB+=		PORTVERSION=${PORTVERSION}
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-docs
 .else
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
 .if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--enable-assertions
 RELTYPE=		Release+Asserts
 .else
 CONFIGURE_ARGS+=	--disable-assertions
 RELTYPE=		Release
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
 post-extract:
 	cd ${WRKSRC}/tools && \
 	    tar xf ${DISTDIR}/${CLANG_SOURCE} && \
 	    ${MV} ${CLANG_NAME} clang
 
 post-patch:
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
 	${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \
 	    -e 's|%%DATADIR%%|${DATADIR}|' \
 	    ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
 	    ${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
 	    ${WRKSRC}/tools/clang/tools/scan-build/scan-build
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
 	${MKDIR} ${WRKSRC}/${RELTYPE}/lib
 	${LN} -sf ${LOCALBASE}/lib/libLLVM-${PORTVERSION}.so ${WRKSRC}/${RELTYPE}/lib/
 	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/
 	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
 	cd ${WRKSRC}/utils/unittest && ${GMAKE}
 
 .if empty(PORT_OPTIONS:MDOCS)
 post-build:
 	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
 .endif
 
 post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
 		${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
 		${WRKSRC}/tools/clang/tools/scan-build/scan-build \
 		${WRKSRC}/tools/clang/tools/scan-view/scan-view \
 	    ${PREFIX}/bin
 	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/Resources
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \
 	    ${PYTHONPREFIX_SITELIBDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \
 	    ${PYTHONPREFIX_SITELIBDIR}/Resources
 	@${MKDIR} ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css ${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js ${DATADIR}
 .if empty(PORT_OPTIONS:MDOCS)
 	@${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
 	    ${MANPREFIX}/man/man1/
 .else
 	@${RMDIR} ${DOCSDIR}/html/img
 .endif
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
 regression-test: ${BUILD_COOKIE}
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/c++-analyzer \
 			bin/clang \
 			bin/clang++ \
 			bin/clang-tblgen \
 			bin/c-index-test \
 			bin/scan-build \
 			bin/scan-view \
 			lib/libclang*
 PLIST_DIR_LIST=		include/clang \
 			include/clang-c \
 			lib/clang
 PLIST_PYFILE_LIST=	ScanView.py \
 			Reporter.py \
 			Resources/* \
 			startfile.py
 PLIST_PYDIR_LIST=	Resources
 
 build-plist:
 	${RM} -f ${PLIST}
 	cd ${PREFIX} && \
 	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
 	     ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | ${SORT} >> ${PLIST}
 	${FIND} ${DATADIR} ${DOCSDIR} -type f | \
 	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' \
 	     -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
 	cd ${PYTHONPREFIX_SITELIBDIR} && \
 	    ls ${PLIST_PYFILE_LIST} | ${SORT} | \
 	    ${SED} -e 's|^|%%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
 	cd ${PREFIX} && \
 	    ${FIND} ${PLIST_DIR_LIST} -type d | \
 	    ${SED} -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
 	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
 	cd ${PYTHONPREFIX_SITELIBDIR} && \
 	    ${FIND} ${PLIST_PYDIR_LIST} -type d | ${SORT} -r | \
 	    ${SED} -e 's|^|@dirrm %%PYTHON_SITELIBDIR%%/|' >> ${PLIST}
 	${FIND} ${DATADIR} ${DOCSDIR} -type d | ${SORT} -r | \
 	    ${SED} -e 's|${DATADIR}|@dirrm %%DATADIR%%|' \
 	     -e 's|${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' >> ${PLIST}
 
 .include <bsd.port.post.mk>