[update] Cleanup and migrate to git repository

5 files changed, 46 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7457209e0fc8..db47188a9e8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,27 @@
-pkgbase = gngeo-hg
+pkgbase = gngeo-git
 	pkgdesc = A portable command-line NeoGeo Emulator (development version)
-	pkgver = 0.8.r95.6ad2a3d1bba3
+	pkgver = 0.8.r21.ged06739
 	pkgrel = 1
-	url = https://code.google.com/p/gngeo/
-	install = gngeo-hg.install
+	url = https://github.com/pepone42/gngeo
+	install = gngeo-git.install
 	arch = i686
 	arch = x86_64
 	license = custom GPL
 	makedepends = mercurial
-	makedepends = nasm
 	makedepends = glu
 	depends = zlib
 	depends = sdl
 	optdepends = libgl: OpenGL renderer backend
 	provides = gngeo
 	conflicts = gngeo
-	source = gngeo::hg+https://code.google.com/p/gngeo/
-	source = gngeo.desktop
-	source = gngeo.png
-	source = gngeo-hg.install
+	replaces = gngeo-hg
+	source = gngeo::git+https://github.com/pepone42/gngeo.git#branch=gngeo
+	source = gngeo-git.desktop
+	source = gngeo-git.png
 	sha256sums = SKIP
-	sha256sums = b66038445a4ac8f2fdc088a37013bc14cd2cca86e5bb2c5a68aa7942c17662d2
+	sha256sums = 75f5aee2e7d33c61ed220aad8baf0db0d05aa93752aa99dd9e9a3771605dfc62
 	sha256sums = b543425d51bd669fe5081b0b89492f18163c292194ac2a4acff683ba2a60063e
-	sha256sums = a1fe0ad7b8f601abcca92650e225c28af45db0b9eb4d96f3bdc055af0fe5c635
+	makedepends_i686 = nasm
 
-pkgname = gngeo-hg
+pkgname = gngeo-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 587efdade8c4..8ea2cad11fb4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,62 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
-_pkgbase=gngeo
-pkgname=$_pkgbase-hg
-pkgver=0.8.r95.6ad2a3d1bba3
+pkgname=gngeo-git
+pkgver=0.8.r21.ged06739
 pkgrel=1
 pkgdesc="A portable command-line NeoGeo Emulator (development version)"
 arch=('i686' 'x86_64')
-url="https://code.google.com/p/gngeo/"
+url="https://github.com/pepone42/gngeo"
 license=('custom GPL')
 depends=('zlib' 'sdl')
+makedepends=('mercurial' 'glu')
+makedepends_i686=('nasm')
 optdepends=('libgl: OpenGL renderer backend')
-makedepends=('mercurial' 'nasm' 'glu')
-# nasm is x86-only
-[ "$CARCH" == "x86_64" ] && makedepends=('mercurial' 'glu')
-conflicts=("$_pkgbase")
-provides=("$_pkgbase")
+conflicts=("${pkgname%-*}")
+provides=("${pkgname%-*}")
+replaces=("gngeo-hg")
 install=$pkgname.install
-source=($_pkgbase::"hg+$url"
-        "$_pkgbase.desktop"
-        "$_pkgbase.png"
-        "$pkgname.install")
+source=(${pkgname%-*}::"git+https://github.com/pepone42/gngeo.git#branch=gngeo"
+        "$pkgname.desktop"
+        "$pkgname.png")
 sha256sums=('SKIP'
-            'b66038445a4ac8f2fdc088a37013bc14cd2cca86e5bb2c5a68aa7942c17662d2'
-            'b543425d51bd669fe5081b0b89492f18163c292194ac2a4acff683ba2a60063e'
-            'a1fe0ad7b8f601abcca92650e225c28af45db0b9eb4d96f3bdc055af0fe5c635')
+            '75f5aee2e7d33c61ed220aad8baf0db0d05aa93752aa99dd9e9a3771605dfc62'
+            'b543425d51bd669fe5081b0b89492f18163c292194ac2a4acff683ba2a60063e')
 
 pkgver() {
-  cd $_pkgbase
+  cd ${pkgname%-*}
 
-  # get latest tag, revision count and commit identifier
-  printf "%s.r%s.%s" "$(hg parents --template {latesttag} | sed 's/gngeo_//')" \
-    "$(hg identify -n)" "$(hg identify -i)"
+  git describe --tags --long | sed 's/^gngeo_//;s/-/.r/;s/-/./'
 }
 
 prepare() {
-  cd $_pkgbase
+  cd ${pkgname%-*}
 
   # change path
-  sed 's#games/lib#share#' -i sample_gngeorc
+  sed 's|games/lib|share|' -i sample_gngeorc
+
+  # fixup makefile
+  sed 's|SUBDIRS = src|& gngeo.dat|' -i Makefile.am
 }
 
 build() {
-  cd $_pkgbase
+  cd ${pkgname%-*}
 
+  ./bootstrap
   ./configure --prefix=/usr
   # force single threaded build
   make -j1
 }
 
 package() {
-  cd $_pkgbase
+  cd ${pkgname%-*}
 
   make DESTDIR="$pkgdir/" install
 
   # install icon, .desktop, sample config and license file
-  install -Dm644 ../$_pkgbase.png "$pkgdir"/usr/share/pixmaps/$_pkgbase.png
-  install -Dm644 ../$_pkgbase.desktop "$pkgdir"/usr/share/applications/$_pkgbase.desktop
-  install -Dm644 sample_gngeorc "$pkgdir"/usr/share/$_pkgbase/sample_gngeorc
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$_pkgbase/COPYING
+  install -Dm644 ../$pkgname.png "$pkgdir"/usr/share/pixmaps/${pkgname%-*}.png
+  install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
+  install -Dm644 sample_gngeorc "$pkgdir"/usr/share/${pkgname%-*}/sample_gngeorc
+  install -d "$pkgdir"/usr/share/doc/${pkgname%-*}
+  install -m644 AUTHORS FAQ NEWS README TODO "$pkgdir"/usr/share/doc/${pkgname%-*}
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/gngeo.desktop b/gngeo-git.desktop
index 15d1fc2aebe8..62cfb4845515 100644
--- a/gngeo.desktop
+++ b/gngeo-git.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Type=Application
-Version=1.0
 Name=gngeo
 Comment=portable NeoGeo Emulator
 Exec=gngeo
diff --git a/gngeo-hg.install b/gngeo-git.install
index cf3f1a033ac5..b1817a4c694d 100644
--- a/gngeo-hg.install
+++ b/gngeo-git.install
@@ -1,6 +1,9 @@
 
-post_install()
-{
+post_install() {
   echo "See /usr/share/gngeo/sample_gngeorc for a sample configuration file" \
        "and save your config to ~/.gngeo/gngeorc file."
 }
+
+post_upgrade() {
+  post_install
+}
diff --git a/gngeo.png b/gngeo-git.png
index fb495e63f412..fb495e63f412 100644
--- a/gngeo.png
+++ b/gngeo-git.png