Update for v0.2.1 of GetPoplog

4 files changed, 36 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1db8d74e0811..24eb517e0704 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = poplog
 	pkgdesc = poplog development system
-	pkgver = 15.65
-	pkgrel = 4
-	url = http://www.cs.bham.ac.uk/research/projects/poplog/freepoplog.html
-	install = poplog.install
-	arch = i686
+	pkgver = 0.2.1
+	pkgrel = 1
+	url = https://getpoplog.github.io/
 	arch = x86_64
 	license = custom:poplog
 	depends = tcsh
+	depends = libxext
+	depends = libxt
+	depends = openmotif
+	depends = libxp
+	depends = ncurses5-compat-libs
 	optdepends = espeak: for run-speaking-eliza demo
-	source = http://www.cs.bham.ac.uk/research/projects/poplog/v15.65/AREADME.txt
-	source = http://www.cs.bham.ac.uk/research/poplog/bham-linux-poplog-v15.65.tar.gz
-	source = http://www.cs.bham.ac.uk/research/projects/poplog/copyright.html
-	sha256sums = f8713a74b36dfc9547848db43b332822d3b5a6887b671ab59e19a17add6e071a
-	sha256sums = 15a2ac11ec4b9a7c3d137b1d097e83b35c47aff7d7aec46e0b4499246f76d49b
-	sha256sums = 87c8728fcad9a4a24d70ba41e1628d44bd89b36bbe0eed75e49eb7b2b52b69a9
+	conflicts = poplog-git
+	source = https://github.com/GetPoplog/Seed/releases/download/v0.2.1/poplog-0.2.1.tar.gz
+	md5sums = 3623cf0ce5f6e9f4b3e60bca3ff8d621
 
 pkgname = poplog
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..303ab9d00549
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg
+/src
+/*.pkg*
+/*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f6e586de397d..c46e8ac949df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,38 @@
-# Submitter: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Maintainer: Will Price <willprice94@gmail.com>
 # Contributor: Aaron Sloman <a.sloman@cs.bham.ac.uk>
+# Contributor: Steve Leach <sfkleach@gmail.com>
 
 pkgname=poplog
-pkgver=15.65
-pkgrel=4
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="poplog development system"
-arch=('i686' 'x86_64')
-url="http://www.cs.bham.ac.uk/research/projects/poplog/freepoplog.html"
+arch=('x86_64')
+url="https://getpoplog.github.io/"
 license=('custom:poplog')
-
-depends=('tcsh')
-if test "$CARCH" == x86_64; then
-  depends+=('lib32-libxext' 'lib32-libxt' 'lib32-openmotif' 'lib32-libxp')
-elif test "$CARCH" == i686; then
-  depends+=('libxext' 'libxt' 'openmotif' 'libxp')
-fi
+depends=('tcsh' 'libxext' 'libxt' 'openmotif' 'libxp' 'ncurses5-compat-libs')
 optdepends=('espeak: for run-speaking-eliza demo')
+source=("https://github.com/GetPoplog/Seed/releases/download/v${pkgver}/poplog-${pkgver}.tar.gz")
+md5sums=('3623cf0ce5f6e9f4b3e60bca3ff8d621')
+#source=("${pkgname}-${pkgver}.tar.gz")
+conflicts=(poplog-git)
 
-
-source=(
-  "http://www.cs.bham.ac.uk/research/projects/poplog/v$pkgver/AREADME.txt"
-  "http://www.cs.bham.ac.uk/research/poplog/bham-linux-poplog-v$pkgver.tar.gz"
-  "http://www.cs.bham.ac.uk/research/projects/poplog/copyright.html"
-)
-sha256sums=('f8713a74b36dfc9547848db43b332822d3b5a6887b671ab59e19a17add6e071a'
-            '15a2ac11ec4b9a7c3d137b1d097e83b35c47aff7d7aec46e0b4499246f76d49b'
-            '87c8728fcad9a4a24d70ba41e1628d44bd89b36bbe0eed75e49eb7b2b52b69a9')
-install=poplog.install
-
-# PKGBUILDS aren't meant to have custom variables, if so they should be prefixed
-# by an underscore...
-usepop=$pkgdir/usr/share/poplog/current-poplog
+_prefix=/opt
+_bindir=/usr/bin
 
 build() {
-  # create poplog directories and set permissions
-  mkdir -p $pkgdir/usr/share/poplog/{local/lockfile/locks,v$pkgver/poplocalbin}
-  chmod -R 755 $pkgdir/usr/share/poplog
-  # copy over source files
-  cp -r $srcdir/v$pkgver $pkgdir/usr/share/poplog/
-  # symlink current-poplog dir to package version
-  cd $pkgdir/usr/share/poplog
-  ln -s v$pkgver current-poplog
-
-  # create poplog.sh executables
-  cd current-poplog/INSTALL
-  cat poplog1.sh > ../bin/poplog.sh
-  echo "poplogroot=/usr/share/poplog/" >> ../bin/poplog.sh
-  echo "export poplogroot" >> ../bin/poplog.sh
-  cat poplog2.sh >> ../bin/poplog.sh
-  chmod 755 ../bin/poplog.sh
-
-  # set variables for poplog to be built
-  source ../pop/com/popenv.sh
-  PATH=$popsys\:$PATH\:$popcom
-  export PATH
-
-  # building saved images with motif
-  cp -p $usepop/pop/com/mkstartup.bham $usepop/pop/com/mkstartup
-  cd $popsys
-  ./poplink_cmnd.motif.sh motif
-  
-  # rebuild basepop11 etc
-  cd $usepop/INSTALL 
-  ./LINK_USING_NEWPOP motif
-
+  cd "$srcdir/poplog-$pkgver"
+  make bindir="$_bindir" prefix="$_prefix"
 }
 
 package() {
-  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
-  ln -s "$pkgdir/usr/share/poplog/current-poplog/bin/poplog.sh" "$pkgdir/usr/bin/poplog"
-  ln -s "$pkgdir/usr/share/poplog/current-poplog/man/man1/*" "$pkgdir/usr/share/man/man1"
+  mkdir -p "$pkgdir/usr/share/man/man1"
+
+  cd "$srcdir/poplog-$pkgver"
+  make install DESTDIR="$pkgdir" prefix="$_prefix" bindir="$_bindir"
 
-  # Licence
-  install -Dm644 "$srcdir/copyright.html" "$pkgdir/usr/share/licenses/poplog/poplog.html"
+  for f in "$pkgdir/$_prefix/share/poplog/current_usepop/pop/doc/man/"*; do
+    ln -fs -t "$pkgdir/usr/share/man/man1" "${f##$pkgdir}"
+  done 
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/poplog.install b/poplog.install
deleted file mode 100644
index 156ce3282e9c..000000000000
--- a/poplog.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -d /usr/share/espeak-data ]; then
-    poplog mkeliza
-  fi
-  poplog mkgblocks
-}  
-
-post_remove() {
-  rm -rf /usr/share/poplog
-}
-
-
-# vim:set ts=2 sw=2 et: