Add mono-msbuild to makedeps and add parallel compilation

2 files changed, 18 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca422ca391ac..38eaff469cf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = nbfc
 	pkgdesc = Cross-platform fan control service for notebooks (STABLE & BETA releases)
 	pkgver = 1.6.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/hirschmann/nbfc
 	install = nbfc.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = mono-msbuild
 	makedepends = nuget
 	depends = mono
 	provides = nbfc
@@ -21,4 +22,3 @@ pkgbase = nbfc
 	md5sums = 81686043a7fc44d620a00a171c917936
 
 pkgname = nbfc
-
diff --git a/PKGBUILD b/PKGBUILD
index fb0034076c78..3b1df3995f4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
-# Maintainer: Erikas Rudinskas <erikmnkl@gmail.com>
+# Maintainer: Francesco Minnocci <ascoli dot minnocci at gmail dot com>
+# Contributor: Erikas Rudinskas <erikmnkl@gmail.com>
 
 pkgname=nbfc
 pkgver=1.6.3
 _pkgver=$(echo $pkgver | sed -r 's/_/-/g')
 _pkgname=nbfc-${_pkgver}
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform fan control service for notebooks (STABLE & BETA releases)"
-arch=("i686" "x86_64")
 url="https://github.com/hirschmann/nbfc"
+arch=('i686' 'x86_64')
 conflicts=('nbfc-beta' 'nbfc-git')
-license=("GPL3")
+license=('GPL3')
 install=${pkgname}.install
-depends=("mono")
-makedepends=('ncurses<=6.0-4')
+depends=('mono')
+makedepends=('mono-msbuild' 'nuget')
 provides=('nbfc' 'ec-probe')
-makedepends=('nuget')
 source=("https://github.com/hirschmann/nbfc/archive/${_pkgver}.tar.gz"
         "nbfc"
         "ec-probe")
@@ -24,24 +24,27 @@ md5sums=("2b61dde6a98622b57d85448e611dd382"
 
 build() {
 	cd "${srcdir}/${_pkgname}/"
+
 	nuget restore NoteBookFanControl.sln
-	xbuild /t:Build /p:Configuration=ReleaseLinux NoteBookFanControl.sln
+	msbuild -m /t:Build /p:Configuration=ReleaseLinux NoteBookFanControl.sln
 }
 
 package() {
+	cd "${srcdir}/${_pkgname}/"
+
 	# Files installation:
 	mkdir -p "${pkgdir}/opt/nbfc"
-	cp -R "${srcdir}/${_pkgname}/Linux/bin/Release/"* "${pkgdir}/opt/nbfc/"
+	cp -R Linux/bin/Release/* "${pkgdir}/opt/nbfc/"
 
 	# Systemd services:
-	install -D -m644 "${srcdir}/${_pkgname}/Linux/nbfc.service" "${pkgdir}/etc/systemd/system/nbfc.service"
-	install -D -m644 "${srcdir}/${_pkgname}/Linux/nbfc-sleep.service" "${pkgdir}/etc/systemd/system/nbfc-sleep.service"
-	
+	install -D -m644 Linux/nbfc.service "${pkgdir}/etc/systemd/system/nbfc.service"
+	install -D -m644 Linux/nbfc-sleep.service "${pkgdir}/etc/systemd/system/nbfc-sleep.service"
+
 	# Executables:
 	install -Dm755 "${srcdir}/nbfc" "${pkgdir}/usr/bin/nbfc"
 	install -Dm755 "${srcdir}/ec-probe" "${pkgdir}/usr/bin/ec-probe"
 
 	# License:
 	mkdir -p "${pkgdir}/usr/share/licenses/nbfc"
-	install -D -m755 "${srcdir}/${_pkgname}/LICENSE.md" "${pkgdir}/usr/share/licenses/nbfc/LICENSE"
+	install -D -m755 LICENSE.md "${pkgdir}/usr/share/licenses/nbfc/LICENSE"
 }