diff options
| author | brooks <brooks@FreeBSD.org> | 2013-02-12 03:11:57 +0800 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-02-12 03:11:57 +0800 |
| commit | fca37bc1726f30b2c1f6190a5f2ec74dfec5b535 (patch) | |
| tree | 9deee180579df2aa8632abb0a9cba44575e28d9e | |
| parent | 3ec9325e03fda509ebc83ed5bdbb657007d450af (diff) | |
| download | freebsd-ports-graphics-fca37bc1726f30b2c1f6190a5f2ec74dfec5b535.tar.gz freebsd-ports-graphics-fca37bc1726f30b2c1f6190a5f2ec74dfec5b535.tar.zst freebsd-ports-graphics-fca37bc1726f30b2c1f6190a5f2ec74dfec5b535.zip | |
Fix cmake depend.
Correct pre-expansion of ${DATADIR} in plist.
Reported by: FreshPorts, portlint
| -rw-r--r-- | devel/llvm-devel/Makefile | 6 | ||||
| -rw-r--r-- | devel/llvm-devel/pkg-plist | 26 |
2 files changed, 17 insertions, 15 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 7524b2010c3..3409e8df19d 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= llvm DISTVERSION= 3.3.r${SVN_REV} +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -15,7 +16,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= brooks@FreeBSD.org COMMENT= Low Level Virtual Machine -BUILD_DEPENDS+= cmake:${PORSTDIR}/devel/cmake +BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE) BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash @@ -182,7 +183,8 @@ build-plist: ${RM} -f ${PLIST} cd ${PREFIX} && \ (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \ - ${SED} -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' | \ + ${SED} -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ + -e 's|${DATADIR_REL}|%%DATADIR%%|' | \ ${SORT} >> ${PLIST} ${FIND} ${DOCSDIR} -type f | \ ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \ diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index c295ec0e807..6d03fed532e 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -1,3 +1,16 @@ +%%DATADIR%%/cmake/AddLLVM.cmake +%%DATADIR%%/cmake/AddLLVMDefinitions.cmake +%%DATADIR%%/cmake/CheckAtomic.cmake +%%DATADIR%%/cmake/ChooseMSVCCRT.cmake +%%DATADIR%%/cmake/GetHostTriple.cmake +%%DATADIR%%/cmake/HandleLLVMOptions.cmake +%%DATADIR%%/cmake/LLVM-Config.cmake +%%DATADIR%%/cmake/LLVMConfig.cmake +%%DATADIR%%/cmake/LLVMConfigVersion.cmake +%%DATADIR%%/cmake/LLVMParseArguments.cmake +%%DATADIR%%/cmake/LLVMProcessSources.cmake +%%DATADIR%%/cmake/TableGen.cmake +%%DATADIR%%/cmake/VersionFromVCS.cmake bin/bugpoint bin/llc bin/lli @@ -668,19 +681,6 @@ lib/libLTO.a lib/libLTO.so lib/libprofile_rt.a lib/libprofile_rt.so -share/llvm/cmake/AddLLVM.cmake -share/llvm/cmake/AddLLVMDefinitions.cmake -share/llvm/cmake/CheckAtomic.cmake -share/llvm/cmake/ChooseMSVCCRT.cmake -share/llvm/cmake/GetHostTriple.cmake -share/llvm/cmake/HandleLLVMOptions.cmake -share/llvm/cmake/LLVM-Config.cmake -share/llvm/cmake/LLVMConfig.cmake -share/llvm/cmake/LLVMConfigVersion.cmake -share/llvm/cmake/LLVMParseArguments.cmake -share/llvm/cmake/LLVMProcessSources.cmake -share/llvm/cmake/TableGen.cmake -share/llvm/cmake/VersionFromVCS.cmake %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz %%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html |