[arch-commits] Commit in ucblogo/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Monday, March 18, 2019 @ 16:01:12
  Author: arodseth
Revision: 442477

upgpkg: ucblogo 6.0-9

remove makedep on addinclude

Modified:
  ucblogo/trunk/PKGBUILD

----------+
 PKGBUILD |   61 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-18 15:58:05 UTC (rev 442476)
+++ PKGBUILD	2019-03-18 16:01:12 UTC (rev 442477)
@@ -3,47 +3,62 @@
 
 pkgname=ucblogo
 pkgver=6.0
-pkgrel=8
+pkgrel=9
 pkgdesc='Interpreter for the Logo programming language'
 url='https://www.cs.berkeley.edu/~bh/logo.html'
-arch=('x86_64')
-license=('GPL')
-makedepends=('addinclude' 'setconf')
-depends=('libice' 'libsm' 'libx11' 'ncurses')
+arch=(x86_64)
+license=(GPL)
+makedepends=(setconf)
+depends=(libice libsm libx11 ncurses)
 source=("https://www.cs.berkeley.edu/~bh/downloads/$pkgname.tar.gz"
         'https://people.eecs.berkeley.edu/~bh/logo-sample.html'
-        'logo.sh'
-        'no-wx.patch'
-        'no-tex.patch')
+        no-wx.patch
+        no-tex.patch
+        logo.sh)
 sha256sums=('c659e989e9284efc0f904ebd7de24b559c2d7434a98bb9c92c23e6c11b49cef3'
             'd3dfeb90e5dd6cae6bc12c8b272e1203a2b2693963670a408d2a190d1ba819ab'
-            'b14dfea1bfc5f04df254e4067d8d6301851d42af6920bdb800fdd8ad4443682b'
             'e360ac71ac785fa8b00b89ff0c5bf8ed738114013143245d3bc0e62eb7d0333d'
-            'e83fb9d656a9064685cde5ebc0ee36242ac848228380b0567fe683901435707c')
+            'e83fb9d656a9064685cde5ebc0ee36242ac848228380b0567fe683901435707c'
+            'b14dfea1bfc5f04df254e4067d8d6301851d42af6920bdb800fdd8ad4443682b')
 
 prepare() {
-  echo '#!/usr/bin/env logo' >sample.logo
-  head -22 <logo-sample.html | grep -v '<' >>sample.logo
-  cd "$pkgname-$pkgver"
-  patch -Np2 -i ../no-wx.patch
-  patch -Np2 -i ../no-tex.patch
-  addinclude -t coms.c math
-  addinclude -t graphics.c math
-  setconf makefile CFLAGS "$CFLAGS -w -fPIC"
+  cd $pkgname-$pkgver
+
+  # Add missing includes
+  for csrc in coms.c graphics.c; do
+    sed -i '1s/^/#include <math.h> /' "$csrc"
+  done
+
+  # Various patching
+  patch -Np2 -i "$srcdir/no-wx.patch"
+  patch -Np2 -i "$srcdir/no-tex.patch"
+  sed -i 's/define HAVE_MATHERR 1/undef HAVE_MATHERR/' config.h
   setconf svn.c 'char* SVN' '"(1)";'
-  sed -i 's/define HAVE_MATHERR 1/undef HAVE_MATHERR/' config.h
+
+  # The makefile does not respect CFLAGS, set it manually
+  setconf makefile CFLAGS "$CFLAGS -w -fPIC  -fstack-protector-strong"
+
+  # Create an example logo file, to be placed in /usr/share/doc/ucblogo
+  echo '#!/usr/bin/env logo' > "$srcdir/sample.logo"
+  head -22 < "$srcdir/logo-sample.html" | grep -v '<' >> "$srcdir/sample.logo"
 }
 
 build() {
-  CFLAGS="$CFLAGS -fPIC -w" make -C "$pkgname-$pkgver"
-  rm -rf "$srcdir/$pkgname-$pkgver/csls/CVS"
+  make -C $pkgname-$pkgver
+  rm -rf $pkgname-$pkgver/csls/CVS
 }
 
 package() {
-  make -C "$pkgname-$pkgver" INFODIR="$pkgdir/usr/share/info" \
-    prefix="$pkgdir/usr" install
+  make -C $pkgname-$pkgver \
+    INFODIR="$pkgdir/usr/share/info" \
+    prefix="$pkgdir/usr" \
+    install
+
+  # Package executable and wrapper script
   mv "$pkgdir/usr/bin/logo" "$pkgdir/usr/bin/logo.elf"
   install -Dm755 logo.sh "$pkgdir/usr/bin/logo"
+
+  # Package documentation
   install -d "$pkgdir/usr/share/doc"
   mv "$pkgdir/usr/lib/logo/docs" "$pkgdir/usr/share/doc/$pkgname"
   rm "$pkgdir/usr/share/doc/$pkgname/usermanual.ps"