From edefc6a8bc6ec1fd6b275cbd74a2ecb0e55aeafc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 1 Nov 2011 05:49:16 +0100
Subject: [PATCH] mcpp: license BSD, wrap long lines, no need to use vmkdir
 with vmove, etc.

---
 srcpkgs/mcpp/libmcpp.template    | 1 -
 srcpkgs/mcpp/mcpp-devel.template | 2 --
 srcpkgs/mcpp/template            | 6 ++++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mcpp/libmcpp.template b/srcpkgs/mcpp/libmcpp.template
index fd2900bbfc9..b8797cb50f5 100644
--- a/srcpkgs/mcpp/libmcpp.template
+++ b/srcpkgs/mcpp/libmcpp.template
@@ -10,6 +10,5 @@ Add_dependency run mcpp
 
 do_install()
 {
-	vmkdir usr/lib
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/mcpp/mcpp-devel.template b/srcpkgs/mcpp/mcpp-devel.template
index d1be3dc94d8..2b535d285ad 100644
--- a/srcpkgs/mcpp/mcpp-devel.template
+++ b/srcpkgs/mcpp/mcpp-devel.template
@@ -10,8 +10,6 @@ Add_dependency run mcpp
 
 do_install()
 {
-	vmkdir usr/lib
-	vmkdir usr/include
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/mcpp/template b/srcpkgs/mcpp/template
index 9662585d988..d651b2a5ba7 100644
--- a/srcpkgs/mcpp/template
+++ b/srcpkgs/mcpp/template
@@ -5,7 +5,7 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-mcpplib"
 homepage="http://mcpp.sourceforge.net/"
-license="BSD-Style"
+license="BSD"
 short_desc="Portable C preprocessor"
 maintainer="davehome <davehome@redthumb.info.tm>"
 checksum=3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864
@@ -23,7 +23,9 @@ long_desc="
    and Visual C++, on UNIX-like systems and Windows.
  * Has various behavior modes.
  * Can be built either as a compiler-specific preprocessor to replace the
-   resident preprocessor of a particular compiler system, or as a compiler-independent command, or even as a subroutine called from some other main program.
+   resident preprocessor of a particular compiler system, or as a
+   compiler-independent command, or even as a subroutine called from some
+   other main program.
  * Provides comprehensive documents both in Japanese and in English.
  * Is an open source software released under BSD-style-license.
  * It is probably number one C/C++ preprocessor now available in the world."