Fixed pkgbase and added SVN modname variable for now.

3 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe4b07e8011a..424d662d403e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 # Generated by mksrcinfo v8
-# Wed Jan 13 19:30:18 UTC 2016
-pkgbase = ggnfs-code
+# Wed Jan 13 20:00:05 UTC 2016
+pkgbase = ggnfs-svn
 	pkgdesc = GGNFS is an open source implementation of General Number Field Sieve algorithm for factoring integers.
 	pkgver = 441
 	pkgrel = 1
diff --git a/PKGBUILD b/PKGBUILD
index b942c85eb0a6..9f318b3d0b91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # No guarantees.
 # Maintainer: K. Hampf <khampf@users.sourceforge.net>
 
-pkgbase=ggnfs-code
+pkgbase=ggnfs-svn
 pkgname=('ggnfs-lasieve4e-x86_64-svn' 'ggnfs-svn')
 pkgver=441
 pkgrel=1
@@ -21,20 +21,21 @@ sha256sums=('SKIP'
             'a0265a78f87eb9e2c4add9d125d803af1892659c59103a794ecfc4ba9a8b87a6'
             '39018ea8dd0c65183038bdfb44eb58c87a5794f93982edb3866a5aab659939d7')
 
+_svnmod=ggnfs-code
 _ggnfstarget="nocona" # Works on Intel i7. YMMW
 _lasieveL1bits="15" # default is 15 bits = 32 KB L1 data cache, 14 bits = 16 KB
 
 pkgver() {
-  cd "${srcdir}/${pkgbase}"
+  cd "${srcdir}/${_svnmod}"
   local ver="$(svnversion)"
   printf "%s" "${ver//[[:alpha:]]}"
 }
 
 prepare() {
-  cd "$srcdir/$pkgbase"
+  cd "${srcdir}/${_svnmod}"
   patch -p1 < "$srcdir/makefile-lasieve4_64.patch"
   patch -p1 < "$srcdir/lasieve4_64-athlon64-i7.patch"
-  cd "$srcdir/$pkgbase/src/experimental/lasieve4_64"
+  cd "${srcdir}/${_svnmod}/src/experimental/lasieve4_64"
   if [ "$_lasieveL1bits" != "15" ]; then
     echo "Patching asm code for ${_lasieveL1bits}-bit L1 data cache ..."
     sed -i -e "s/#define L1_BITS 15/#define L1_BITS ${_lasieveL1bits}/" athlon64/siever-config.h
@@ -45,10 +46,10 @@ prepare() {
 
 build() {
   msg "Starting ggnfs-lasieve4e-${CARCH}-svn build..."
-  cd "$srcdir/$pkgbase/src/experimental/lasieve4_64"
+  cd "${srcdir}/${_svnmod}/src/experimental/lasieve4_64"
   make
   msg "Starting ggnfs-svn build..."
-  cd "$srcdir/$pkgbase"
+  cd "${srcdir}/${_svnmod}"
   make "$_ggnfstarget"
 }
 
@@ -58,7 +59,7 @@ package_ggnfs-lasieve4e-x86_64-svn() {
   provides=('ggnfs-lasieve4e')
   conflicts=('ggnfs-lasieve4e')
 
-  cd "$srcdir/$pkgbase"
+  cd "${srcdir}/${_svnmod}"
 #  install -D -m755 src/experimental/lasieve4_64/gnfs-lasieve4I1?e "${pkgdir}/usr/bin"
   install -d -m755 "${pkgdir}/usr/bin"
   install -D -m755 bin/gnfs-lasieve4I1?e "${pkgdir}/usr/bin"
@@ -71,7 +72,7 @@ package_ggnfs-svn() {
   depends=('ggnfs-lasieve4e')
   optdepends=('gnuplot')
 
-  cd "$srcdir/$pkgbase"
+  cd "${srcdir}/${_svnmod}"
   install -d -m755 "${pkgdir}/usr/bin"
   install -D -m755 bin/autogplot.sh "${pkgdir}/usr/bin"
   install -D -m755 bin/makefb "${pkgdir}/usr/bin"
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index 9b5850c3068a..5587589298b5 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAABCAAGBQJWlqqVAAoJECSyfCdcYmjT0MQH/jiIp2jiC+UpHcgdHfII9zOn
-lF8/T80SXfC6+1kRsPmzvxT7n9qVKw9dpyXQcFMdFe33FCLkfJDYvBZq2F642NQd
-p3bAxUHxQSM1ZHtdKvGVcDMGBogyP/epEhq0lihImBVhFnFj1I2jKrKkqD0xczr1
-aVy+euPR/rVlcJjturXuMCR2jqVszOlaDgV/1xU+ZUFPJKwee/HyietXs+mmSkE2
-YoGyO17VeV5GEcHZn/PVzCaxLVtVDZAXJwssRf3oeEtcm1GaFmQBzwbAIg9fgno7
-M9mI4lJTm8uubq047gwVEvQgfBfNSdHd23i+YGzgdkL9iuAz7E9Sid+gecyMhU0=
-=qnlk
+iQEcBAABCAAGBQJWlqxRAAoJECSyfCdcYmjTUhgH/ipFxjWGtqGGb6WoLRf55l0J
+aUppw+BMY9D4SkwfDLroJriJUc/MRXQV/uhRu9Rl/KGEGdoQ8Z+AsWFRK2Bu0Aj8
+eb3jtHl5xN/vGP/uaGV+eK0ngs6O2f4LCrv97xxviNH9Rqz2ArfyWCh7INb1eROm
+E6IkWx1p/Asdz0y1evGzf3yIlxTuoRalsIC+ZFOY3gcmUq3TagrVHEeRQpep4s6v
+7smuctLoclpHBrbCMvzkpe7DQZiuPIurZabjmO7j2WFQG5Ny4LRLy/b522ouuwuv
+qHDqVYvbFMYxpwo9YeNiyZxyEdxj1QTujr9S1/ZVaqMMBSscuJoVewE1ZaUbztA=
+=+i6u
 -----END PGP SIGNATURE-----