PKGBUILD revamp / added missing dependencies

2 files changed, 40 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db25e2b84e91..7dcb47ec9ffa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,27 @@
 pkgbase = ncsa-mosaic-git
 	pkgdesc = One of the first graphical web browsers
-	pkgver = 2.7b6.r25.gaf942b9
-	pkgrel = 1
+	pkgver = 2.7b6.r25.af942b9
+	pkgrel = 2
 	epoch = 1
-	url = http://github.com/yotann/ncsa-mosaic
+	url = https://github.com/yotann/ncsa-mosaic
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = git
-	depends = lesstif
+	depends = openmotif
 	depends = libjpeg
 	depends = libpng
 	depends = libxmu
 	depends = libxpm
-	options = !makeflags
-	source = git://github.com/yotann/ncsa-mosaic
-	md5sums = SKIP
+	depends = xorg-fonts-misc
+	depends = xorg-fonts-100dpi
+	depends = xorg-fonts-75dpi
+	provides = ncsa-mosaic
+	provides = mosaic
+	conflicts = ncsa-mosaic
+	conflicts = mosaic
+	source = git+https://github.com/yotann/ncsa-mosaic.git
+	sha256sums = SKIP
 
 pkgname = ncsa-mosaic-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e2ac5b130dd..80ab06434185 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,40 @@
-# Contributor: Konstantin Mochalov <incredible.angst@gmail.com>
-# Maintainer: FredBezies <fredbezies@gmail.com>
-# Maintainer: Sean Bartell <archlinux@yotann.org>
+# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+# Contributor: Konstantin Mochalov <incredible dot angst at gmail dot com>
+# Contributor: FredBezies <fredbezies at gmail dot com>
+# Contributor: Sean Bartell <archlinux at yotann dot org>
 
-pkgname="ncsa-mosaic-git"
+pkgname=ncsa-mosaic-git
 epoch=1
-pkgver=2.7b6.r25.gaf942b9
+pkgver=2.7b6.r25.af942b9
 _pkgver=2.7b6
-pkgrel=1
+pkgrel=2
 pkgdesc="One of the first graphical web browsers"
-url="http://github.com/yotann/ncsa-mosaic"
-license=(custom)
-arch=(i686 x86_64)
-depends=(lesstif libjpeg libpng libxmu libxpm)
-makedepends=("git")
-source=("git://github.com/yotann/ncsa-mosaic")
-md5sums=(SKIP)
-options=(!makeflags)
+url="https://github.com/yotann/ncsa-mosaic"
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('openmotif' 'libjpeg' 'libpng' 'libxmu' 'libxpm' 'xorg-fonts-misc' 'xorg-fonts-100dpi' 
+         'xorg-fonts-75dpi')
+makedepends=('git')
+provides=("${pkgname%-git}" 'mosaic')
+conflicts=("${pkgname%-git}" 'mosaic')
+source=('git+https://github.com/yotann/ncsa-mosaic.git')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd ncsa-mosaic
-  echo $_pkgver.r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)
+	cd "$srcdir/${pkgname%-git}"
+	printf "$_pkgver.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd ncsa-mosaic
-  make linux
+	cd "$srcdir/${pkgname%-git}"
+	make linux
 }
 
 package() {
-  cd ncsa-mosaic
-  install -Dm0755 "src/Mosaic"              "$pkgdir/usr/bin/Mosaic"
-  install -Dm0644 "COPYRIGHT"               "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
-  install -Dm0644 "desktop/Mosaic.png"      "$pkgdir/usr/share/icons/Mosaic.png"
-  install -Dm0644 "desktop/Mosaic.desktop"  "$pkgdir/usr/share/applications/Mosaic.desktop"
+	cd "$srcdir/${pkgname%-git}"
+	install -Dm755 src/Mosaic "$pkgdir/usr/bin/Mosaic"
+	install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/${pkgname%-git}/COPYRIGHT"
+	install -Dm644 desktop/Mosaic.png "$pkgdir/usr/share/icons/Mosaic.png"
+	install -Dm644 desktop/Mosaic.desktop "$pkgdir/usr/share/applications/Mosaic.desktop"
+	install -Dm644 docs/resources.html "$pkgdir/usr/share/doc/${pkgname%-git}/resources.html"
 }