diff options
| author | brooks <brooks@FreeBSD.org> | 2009-11-05 06:11:58 +0800 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2009-11-05 06:11:58 +0800 |
| commit | d4056533410784d2d7d986a9d58f27c7050f69a8 (patch) | |
| tree | 253a65937e9609443c28e46c8a2a931b5b87a117 /lang | |
| parent | a4668754cd61dfdff013d87d52a5fbd6db6ce845 (diff) | |
| download | freebsd-ports-gnome-d4056533410784d2d7d986a9d58f27c7050f69a8.tar.gz freebsd-ports-gnome-d4056533410784d2d7d986a9d58f27c7050f69a8.tar.zst freebsd-ports-gnome-d4056533410784d2d7d986a9d58f27c7050f69a8.zip | |
Fix plist (missing DATADIR).
Add conflicts for llvm-devel and the forthcoming clang-devel.
Add USE_GCC=4.2+ in hopes of fixing 6.x builds.
Reported by: pointhat
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/clang-devel/Makefile | 16 | ||||
| -rw-r--r-- | lang/clang-devel/pkg-plist | 1 | ||||
| -rw-r--r-- | lang/clang/Makefile | 16 | ||||
| -rw-r--r-- | lang/clang/pkg-plist | 1 |
4 files changed, 20 insertions, 14 deletions
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile index 637014641686..00f282ed3f02 100644 --- a/lang/clang-devel/Makefile +++ b/lang/clang-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= clang PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -17,6 +17,8 @@ EXTRACT_ONLY= ${LLVM_SOURCE} MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and (soon) C++ compiler +CONFLICTS= clang-devel-2.[0-9]* llvm-devel-2.[0-9]* + CLANG_NAME= clang-${PORTVERSION} CLANG_SOURCE= ${CLANG_NAME}${EXTRACT_SUFX} LLVM_NAME= llvm-${PORTVERSION} @@ -25,8 +27,8 @@ LLVM_SOURCE= ${LLVM_NAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/${LLVM_NAME} INSTALL_WRKSRC= ${WRKSRC}/tools/clang -BUILD_DEPENDS+= llvm=2.6:${PORTSDIR}/devel/llvm -RUN_DEPENDS+= llvm=2.6:${PORTSDIR}/devel/llvm +BUILD_DEPENDS+= llvm-as:${PORTSDIR}/devel/llvm +RUN_DEPENDS+= llvm-as:${PORTSDIR}/devel/llvm .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif @@ -35,6 +37,7 @@ BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif GNU_CONFIGURE= yes +USE_GCC= 4.2+ USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes @@ -109,9 +112,8 @@ build-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|${DATADIR}|%%DATADIR%%|' \ - -e 's|${DOCSDIR}|%%DOCSDIR%%|' \ - -e 's|^|%%PORTDOCS%%@dirrm |' >> ${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> diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist index 53fbbda13f19..1387c22cc5fe 100644 --- a/lang/clang-devel/pkg-plist +++ b/lang/clang-devel/pkg-plist @@ -40,3 +40,4 @@ libexec/clang-cc %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% diff --git a/lang/clang/Makefile b/lang/clang/Makefile index 637014641686..00f282ed3f02 100644 --- a/lang/clang/Makefile +++ b/lang/clang/Makefile @@ -7,7 +7,7 @@ PORTNAME= clang PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -17,6 +17,8 @@ EXTRACT_ONLY= ${LLVM_SOURCE} MAINTAINER= brooks@FreeBSD.org COMMENT= C, Objective-C, and (soon) C++ compiler +CONFLICTS= clang-devel-2.[0-9]* llvm-devel-2.[0-9]* + CLANG_NAME= clang-${PORTVERSION} CLANG_SOURCE= ${CLANG_NAME}${EXTRACT_SUFX} LLVM_NAME= llvm-${PORTVERSION} @@ -25,8 +27,8 @@ LLVM_SOURCE= ${LLVM_NAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/${LLVM_NAME} INSTALL_WRKSRC= ${WRKSRC}/tools/clang -BUILD_DEPENDS+= llvm=2.6:${PORTSDIR}/devel/llvm -RUN_DEPENDS+= llvm=2.6:${PORTSDIR}/devel/llvm +BUILD_DEPENDS+= llvm-as:${PORTSDIR}/devel/llvm +RUN_DEPENDS+= llvm-as:${PORTSDIR}/devel/llvm .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif @@ -35,6 +37,7 @@ BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif GNU_CONFIGURE= yes +USE_GCC= 4.2+ USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes @@ -109,9 +112,8 @@ build-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|${DATADIR}|%%DATADIR%%|' \ - -e 's|${DOCSDIR}|%%DOCSDIR%%|' \ - -e 's|^|%%PORTDOCS%%@dirrm |' >> ${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> diff --git a/lang/clang/pkg-plist b/lang/clang/pkg-plist index 53fbbda13f19..1387c22cc5fe 100644 --- a/lang/clang/pkg-plist +++ b/lang/clang/pkg-plist @@ -40,3 +40,4 @@ libexec/clang-cc %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/clang %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%% |