Revised package to add dependencies and improve PKGBUILD quality

2 files changed, 30 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83c20a1377c8..9ff9cfadb45c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = gsplus-git
 	pkgdesc = Modern cross-platform Apple IIgs emulator
 	pkgver = r556.4805720
-	pkgrel = 1
+	pkgrel = 2
 	url = http://apple2.gs/plus/
 	install = gsplus.install
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
-	depends = git
-	depends = libpcap
-	depends = sdl2
+	makedepends = pkgconfig
+	makedepends = re2c
 	depends = sdl2_image
 	depends = libxext
-	depends = re2c
+	depends = freetype2
 	optdepends = alsa-oss
+	optdepends = git
 	provides = gsplus
 	conflicts = gsplus
 	source = git+https://github.com/digarok/gsplus
@@ -26,4 +26,3 @@ pkgbase = gsplus-git
 	sha256sums = b49a30685334485d0d6fea480a90c36c6d5ed2821bfe90490ed5bb971fe6735a
 
 pkgname = gsplus-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 11cfe781c6e1..439fd8ffadb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: mosh5382 <arch@moshermail.com>
+# Contributor: Frederic Bezies <fred bezies at gmail dot com>
 pkgname=gsplus-git
 _name=gsplus
 pkgver=r556.4805720
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern cross-platform Apple IIgs emulator"
 arch=('x86_64')
 url="http://apple2.gs/plus/"
 license=('GPL2')
 provides=('gsplus')
 conflicts=('gsplus')
-depends=('git' 'libpcap' 'sdl2' 'sdl2_image' 'libxext' 're2c')
-optdepends=('alsa-oss')
-makedepends=('cmake')
+depends=('sdl2_image' 'libxext' 'freetype2')
+optdepends=('alsa-oss' 'git')
+makedepends=('cmake' 'pkgconfig' 're2c')
 install=$_name.install
 source=("git+https://github.com/digarok/gsplus"
         "gsplus.png"
@@ -23,11 +24,10 @@ sha256sums=("SKIP"
             "b49a30685334485d0d6fea480a90c36c6d5ed2821bfe90490ed5bb971fe6735a")
 
 pkgver() {
-
-	cd "$_name"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$_name"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
-	
+
 build() {
 
   msg2 "Generate desktop application entry for gsplus..."
@@ -45,30 +45,30 @@ MimeType=application/x-gsplus;
 Keywords=apple,simulator;
 EOF
 
-#	cd "$srcdir/$_name/src"
-#  	ln -s vars_x86linux_x11 vars
-#	make clean ; make
-	mkdir "$srcdir"/$_name/build ; cd "$srcdir"/$_name/build
-	cmake ..
-	make
+#   cd "$srcdir/$_name/src"
+#   ln -s vars_x86linux_x11 vars
+#   make clean ; make
+    mkdir "$srcdir"/$_name/build ; cd "$srcdir"/$_name/build
+    cmake ..
+    make
 }
 
 package() {
         # Creating directories for pkgbuild
         mkdir -pm 755 "$pkgdir"/usr/share/$_name
         mkdir -pm 755 "$pkgdir"/usr/bin
-	mkdir -pm 755 "$pkgdir"/usr/share/$_name/docs
-	mkdir -pm 755 "$pkgdir"/usr/share/$_name/images
-        
+    mkdir -pm 755 "$pkgdir"/usr/share/$_name/docs
+    mkdir -pm 755 "$pkgdir"/usr/share/$_name/images
+
         # Install config file in /etc/gsplus - NOT NEEDED
-	# install -m 755 "$srcdir"/$_name/config.template "$pkgdir"/usr/share/$_name/config.txt
+    # install -m 755 "$srcdir"/$_name/config.template "$pkgdir"/usr/share/$_name/config.txt
 
-	install -m 755 "$srcdir"/$_name/build/bin/GSplus "$pkgdir"/usr/share/$_name/GSplus 
-	ln -s /usr/share/$_name/GSplus $pkgdir/usr/bin/gsplus
-	install -m 755 "$srcdir"/README.txt "$pkgdir"/usr/share/$_name/docs/README.txt
-#	install -m 755 "$srcdir"/gsplusmanual.pdf "$pkgdir"/usr/share/$_name/docs/gsplusmanual.pdf
+    install -m 755 "$srcdir"/$_name/build/bin/GSplus "$pkgdir"/usr/share/$_name/GSplus 
+    ln -s /usr/share/$_name/GSplus $pkgdir/usr/bin/gsplus
+    install -m 755 "$srcdir"/README.txt "$pkgdir"/usr/share/$_name/docs/README.txt
+#   install -m 755 "$srcdir"/gsplusmanual.pdf "$pkgdir"/usr/share/$_name/docs/gsplusmanual.pdf
 
-	#msg2 "Install desktop application entry in /usr/share/applications..."
-	install -Dm644 "$srcdir"/$_name.desktop "$pkgdir"/usr/share/applications/$_name.desktop
-	install -Dm644 "$srcdir"/$_name.png "$pkgdir"/usr/share/pixmaps/$_name.png
+    #msg2 "Install desktop application entry in /usr/share/applications..."
+    install -Dm644 "$srcdir"/$_name.desktop "$pkgdir"/usr/share/applications/$_name.desktop
+    install -Dm644 "$srcdir"/$_name.png "$pkgdir"/usr/share/pixmaps/$_name.png
 }