minor adjustments

3 files changed, 32 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27ca8e79b6ce..69592a2e572d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = nspr-hg
-	pkgdesc = Netscape Portable Runtime (latest Mercurial version)
+	pkgdesc = Netscape Portable Runtime
 	pkgver = 4.35.r4.g3e25d69ba6b2
 	pkgrel = 1
 	url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR
diff --git a/.gitignore b/.gitignore
index d3d570bebbbb..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-pkg/
-src/
-nspr*
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index a7ad7143ca11..1b1747fdd1f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,50 @@
+# Maintainer:
 # Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
 # Contributor: Franziskus Kiefer <franziskuskiefer@gmail.com>
 
-_pkgname=nspr
-pkgname=nspr-hg
+_pkgname="nspr"
+pkgname="$_pkgname-hg"
 pkgver=4.35.r4.g3e25d69ba6b2
 pkgrel=1
-pkgdesc="Netscape Portable Runtime (latest Mercurial version)"
+pkgdesc="Netscape Portable Runtime"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
 arch=(x86_64)
 license=(MPL GPL)
+
 depends=(glibc sh)
 makedepends=(mercurial zip)
-source=("hg+https://hg.mozilla.org/projects/nspr")
-sha256sums=('SKIP')
+
 conflicts=('nspr')
 provides=("nspr=${pkgver%.r*}")
 
+_pkgsrc="$_pkgname"
+source=("hg+https://hg.mozilla.org/projects/nspr")
+sha256sums=('SKIP')
+
 pkgver() {
-  cd $_pkgname
+  cd "$_pkgsrc"
   hg log -r . --template '{latesttag}.r{latesttagdistance}.g{node|short}\n' \
     | sed 's/^[a-zA-Z_]*//;s/_RTM//;s/_\([a-zA-Z][a-zA-Z0-9]\+\)/\1/;s/_/./g' \
     | tr '[:upper:]' '[:lower:]'
 }
 
 prepare() {
-  cd $_pkgname
-  ./configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --includedir=/usr/include/nspr \
-      --enable-optimize \
-      --disable-debug \
-      --enable-64bit
+  cd "$_pkgsrc"
+
+  local _configure_options=(
+    --prefix=/usr
+    --libdir=/usr/lib
+    --includedir=/usr/include/nspr
+    --enable-optimize
+    --disable-debug
+    --enable-64bit
+  )
+
+  ./configure "${_configure_options[@]}"
 }
 
 build() {
-  cd $_pkgname
+  cd "$_pkgsrc"
   make ${SOURCE_DATE_EPOCH:+
     SH_NOW="${SOURCE_DATE_EPOCH}000000"
     SH_DATE="$(date --utc --date="@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %T')"
@@ -43,9 +52,11 @@ build() {
 }
 
 package() {
-  cd $_pkgname
+  cd "$_pkgsrc"
   make DESTDIR="$pkgdir" install
+
   ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
+
   rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
         "$pkgdir"/usr/include/nspr/md
 }