Get package to build and install correctly

3 files changed, 17 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e68a8f369134..1f81c4ac2aa8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = monogame-git
 	pkgdesc = XNA Implementation for Mono based platforms (git)
-	pkgver = v3.2.2792
+	pkgver = v3.2.3792
 	pkgrel = 1
 	url = http://monogame.codeplex.com
 	arch = i686
@@ -10,7 +10,7 @@ pkgbase = monogame-git
 	makedepends = nvidia-texture-tools
 	makedepends = dos2unix
 	makedepends = monodevelop
-	makedepends = sharpfont
+	makedepends = sharpfonts
 	makedepends = assimp-net
 	depends = opentk
 	depends = sdl_mixer
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..3b4fd7698708
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.tar.gz
+*.tar.xz
+src/
+pkg/
+Dependencies/
+monogame/
diff --git a/PKGBUILD b/PKGBUILD
index 3ebb3fab4a3f..0120e1e53583 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 pkgname=monogame-git
-pkgver=v3.2.2792
+pkgver=v3.2.3792
 pkgrel=1
 pkgdesc="XNA Implementation for Mono based platforms (git)"
 arch=(i686 x86_64)
 license=("Microsoft Public License")
 depends=(opentk sdl_mixer sdl_ttf sdl_image sdl_net smpeg sdl_gfx)
-makedepends=(nant nvidia-texture-tools dos2unix monodevelop sharpfont assimp-net)
+makedepends=(nant nvidia-texture-tools dos2unix monodevelop sharpfonts assimp-net)
 conflicts=(monogame tao-framework tao-framework-svn)
 provides=(monogame)
 url="http://monogame.codeplex.com"
@@ -30,7 +30,7 @@ prepare() {
 	cp -r ../../../Dependencies/* .
 	cd ../..
 	find . -name '*.csproj' -exec sed -i 's,<DebugType>none,<DebugType>pdbonly,g' {} \;
-	cd ProjectTemplates/MonoDevelop/MonoDevelop.MonoGame/MonoDevelop.MonoGame
+	cd "$srcdir/${pkgname%-*}/IDE/MonoDevelop/MonoDevelop.MonoGame"
 	sed -i -e "s,assemblies/WindowsGL,/usr/lib/monogame,g" -e "s,\"3\.0\",\"${_mdver}\",g" MonoDevelop.MonoGame.addin.xml
 }
 
@@ -38,30 +38,26 @@ build() {
 	cd "${srcdir}/${pkgname%-*}"
   mono Protobuild.exe
   nant build_linux
-  cd ProjectTemplates/MonoDevelop/MonoDevelop.MonoGame
-  xbuild MonoDevelop.MonoGame.sln /p:Configuration=ReleaseLinux
+  cd "$srcdir/${pkgname%-*}/IDE/MonoDevelop/MonoDevelop.MonoGame"
+  xbuild MonoDevelop.MonoGame.csproj /p:Configuration=Release
   cd ../../../
   xbuild MonoGame.Framework.Linux.sln /p:Configuration=Release
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-*}/MonoGame.ContentPipeline"
-  install -Dm644 MonoGame.ContentPipeline.targets "$pkgdir/usr/lib/mono/xbuild/MonoGame.ContentPipeline.targets"
-  cd ../MonoGame.Framework/bin/Linux/AnyCPU/Release
-  find . -name 'MonoGame.Framework.dll*' -exec install -Dm644 {} "$pkgdir/usr/lib/monogame/"{} \;
+  cd "${srcdir}/${pkgname%-*}/MonoGame.Framework/bin/Linux/AnyCPU/Release/"
+  find . -name 'MonoGame.Framework.*' -exec install -Dm644 {} "$pkgdir/usr/lib/monogame/"{} \;
   find . -name 'Lidgren.Network.dll*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
-  find . -name 'Tao.Sdl.dll*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
+  find . -name 'NVorbis.dll*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
   find . -name '*.mgfxo' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
   cd "${srcdir}/${pkgname%-*}/MonoGame.Framework.Content.Pipeline/bin/Linux/AnyCPU/Release"
   find . -name 'MonoGame.Framework.Content.Pipeline.dll*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
   find . -name 'Nvidia.TextureTools.dll*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
-  install -m644 ManagedPVRTC.dll "$pkgdir/usr/lib/monogame/"
-  cd "${srcdir}/${pkgname%-*}/ProjectTemplates/MonoDevelop/MonoDevelop.MonoGame/MonoDevelop.MonoGame/bin/Linux/Release"
+  cd "${srcdir}/${pkgname%-*}/IDE/MonoDevelop/bin/Release"
   find . -type f -exec install -Dm644 {} "$pkgdir/usr/lib/monodevelop/AddIns/MonoDevelop.MonoGame/"{} \;
   cd "${srcdir}/${pkgname%-*}/Tools/MGCB/bin/Linux/AnyCPU/Release"
   find . -name 'MGCB.Linux.exe*' -exec install -m644 {} "$pkgdir/usr/lib/monogame/"{} \;
   cd "$pkgdir/usr/lib/monogame"
-  gacutil -i Tao.Sdl.dll -root "$pkgdir/usr/lib"
   install -Dm644 "${srcdir}/${pkgname%-*}/LICENSE.txt" "$pkgdir/usr/share/licenses/monogame/LICENSE.txt"
   install -Dm755 "$srcdir/mgcb.sh" "$pkgdir/usr/bin/mgcb"
   install -Dm644 "$srcdir/monogame.pc.in" "$pkgdir/usr/lib/pkgconfig/monogame.pc"