llvm: update to 3.1.

common/shlibs

@@ -863,7 +863,7 @@ libyaml-0.so.2 libyaml-0.1.4
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0
 libyajl.so.2 yajl-2.0.1
 libconfuse.so.0 confuse-2.7
-libLLVM-3.0.so libllvm-3.0
+libLLVM-3.1.so libllvm-3.1
 libclang.so libclang-3.0
 libisofs.so.6 libisofs-0.6.24
 libbfd-2.22.so binutils-2.22_1<2.23

srcpkgs/llvm/clang-analyzer.template

@@ -1,6 +1,8 @@
 # Template file for 'clang-analyzer'.
 #
-depends="clang python perl"
+noarch=yes
+pycompile_dirs="usr/lib/clang-analyzer"
+depends="clang>=$version python perl"
 short_desc="Low-Level Virtual Machine (LLVM) - A source code analysis framework"
 long_desc="
  The Clang Static Analyzer is source code analysis tool that find bugs in
@@ -14,12 +16,7 @@ long_desc="
  rest of Clang, the analyzer is implemented as a C++ library that can be used
  by other tools and applications."
 
-noarch=yes
+do_install() {
-pycompile_dirs="usr/lib/clang-analyzer"
-
-
-do_install()
-{
 	install -d ${DESTDIR}/usr/bin
 	install -d ${DESTDIR}/usr/lib/clang-analyzer
 

srcpkgs/llvm/clang-devel.template

@@ -1,6 +1,6 @@
 # Template file for 'clang-devel'.
 #
-depends="clang"
+depends="clang>=$version"
 short_desc="LLVM C language family frontend - development files"
 long_desc="
  Clang project is a new C, C++, Objective C and Objective C++ front-end for
@@ -29,10 +29,7 @@ long_desc="
 
   This package includes development files for the LLVM clang."
 
-
+do_install() {
-do_install()
+	vmove "usr/include/clang*" usr/include
-{
+	vmove "usr/lib/libclang*.a" usr/lib
-	install -d ${DESTDIR}/usr/{include,lib}
-	mv ${SRCPKGDESTDIR}/usr/include/clang* ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/libclang*.a ${DESTDIR}/usr/lib
 }

srcpkgs/llvm/clang.rshlibs

@@ -2,6 +2,6 @@ libpthread.so.0
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libLLVM-3.0.so
 libdl.so.2
 libm.so.6
+libLLVM-3.1.so

srcpkgs/llvm/clang.template

@@ -27,12 +27,8 @@ long_desc="
    * A single unified parser for C, Objective C, C++, and Objective C++
    * Conformance with C/C++/ObjC and their variants"
 
-
+do_install() {
-do_install()
+	vmove "usr/bin/*clang*" usr/bin
-{
+	vmove usr/lib/clang usr/lib
-	mkdir -p ${DESTDIR}/usr/{bin,lib} ${DESTDIR}/usr/share/man/man1
+	vmove "usr/share/man/man1/*clang*" usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/bin/*clang* ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/lib/clang ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/*clang* \
-		${DESTDIR}/usr/share/man/man1
 }

srcpkgs/llvm/libclang.rshlibs

@@ -3,4 +3,4 @@ libdl.so.2
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libLLVM-3.0.so
+libLLVM-3.1.so

srcpkgs/llvm/libclang.template

@@ -29,9 +29,6 @@ long_desc="
 
  This package includes the shared library used by the Clang frontend."
 
-
+do_install() {
-do_install()
+	vmove "usr/lib/libclang.so*" usr/lib
-{
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libclang.so* ${DESTDIR}/usr/lib
 }

srcpkgs/llvm/libllvm.template

@@ -6,8 +6,6 @@ long_desc="
 
  This package includes the shared libraries used by the LLVM projects."
 
-do_install()
+do_install() {
-{
+	vmove "usr/lib/*.so*" usr/lib
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
 }

srcpkgs/llvm/llvm-devel.template

@@ -1,15 +1,13 @@
 # Template file for 'llvm-devel'.
 #
-depends="libffi-devel libllvm llvm"
+depends="libffi-devel llvm>=$version"
 short_desc="Low Level Virtual Machine - development files"
 long_desc="
   ${long_desc}
 
   This package includes development files for the LLVM clang."
 
-
+do_install() {
-do_install()
+	vmove usr/include usr
-{
+	vmove usr/lib usr
-	install -d ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/{include,lib} ${DESTDIR}/usr
 }

srcpkgs/llvm/llvm-docs.template

@@ -1,14 +1,11 @@
 # Template file for 'llvm-docs'.
 #
+noarch=yes
 short_desc="${sourcepkg} - documentation files"
 long_desc="${long_desc}
 
  This package contains the documentation for LLVM."
 
-noarch=yes
+do_install() {
-
+	vmove usr/docs usr/share/llvm
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/llvm
-	mv ${SRCPKGDESTDIR}/usr/docs ${DESTDIR}/usr/share/llvm
 }

srcpkgs/llvm/llvm.rshlibs

@@ -4,5 +4,5 @@ libc.so.6
 libdl.so.2
 libm.so.6
 libgcc_s.so.1
-libLLVM-3.0.so
 libclang.so
+libLLVM-3.1.so

srcpkgs/llvm/template

@@ -1,23 +1,24 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=3.0
+version=3.1
-wrksrc=${pkgname}-${version}.src
+wrksrc="${pkgname}-${version}.src"
 distfiles="
-http://www.llvm.org/releases/${version}/llvm-${version}.tar.gz
+http://www.llvm.org/releases/${version}/llvm-${version}.src.tar.gz
-http://www.llvm.org/releases/${version}/clang-${version}.tar.gz"
+http://www.llvm.org/releases/${version}/clang-${version}.src.tar.gz"
+subpackages="libclang clang-analyzer clang clang-devel libllvm llvm-devel llvm-docs"
 build_style=gnu-configure
 configure_args="--disable-expensive-checks --disable-debug-runtime
 --enable-targets=all --enable-bindings=none --enable-optimize
 --enable-shared --enable-libffi --enable-llvmc-dynamic"
+# XXX: Investigate bindings support.
 makedepends="groff perl python libffi-devel"
 short_desc="Low Level Virtual Machine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.llvm.org"
 license="BSD"
 checksum="
-519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
+1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab
-b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d"
+ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786"
-
 long_desc="
  Low Level Virtual Machine (LLVM) is:
 
@@ -50,11 +51,6 @@ long_desc="
     optional LLVM components can be used to build high-level virtual machines
     and other systems that need these services."
 
-subpackages="libclang clang-analyzer clang clang-devel libllvm"
-subpackages="${subpackages} llvm-devel llvm-docs"
-
-# XXX: Investigate bindings support.
-
 post_extract() {
 	# Move clang files into the llvm source.
 	if [ -d ${XBPS_BUILDDIR}/clang-${version}.src ]; then