development/ucblogo: Updated for version 6.2.2.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 18 insertions, 117 deletions

diff --git a/development/ucblogo/01-makefiles.patch b/development/ucblogo/01-makefiles.patch
deleted file mode 100644
index a50f032da7..0000000000
--- a/development/ucblogo/01-makefiles.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nur ucblogo-6.0/docs/makefile ucblogo-6.0.new/docs/makefile
---- ucblogo-6.0/docs/makefile	2008-08-19 21:56:59.000000000 +0200
-+++ ucblogo-6.0.new/docs/makefile	2014-12-19 01:16:37.021678595 +0100
-@@ -1,6 +1,6 @@
- BUILDIR	      = `pwd`
- INFODIR	      = $(prefix)/info
--DOCSDIR	      = $(LIBLOC)/docs
-+DOCSDIR	      = $(prefix)/doc/ucblogo-6.0
- HTMLDIR	      = $(DOCSDIR)/html
- 
- all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info
-@@ -30,9 +30,11 @@
- ship:
- 	-rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
- 
--install: all
-+#install: all
-+install:
- 	for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
--	-cp -f *.info* $(INFODIR)/.
-+	-gzip *.info*
-+	-cp -f *.info.gz* $(INFODIR)/.
- 	-cp -f html/*.html $(HTMLDIR)/.
- 	-cp -f usermanual.ps $(DOCSDIR)/.
- 	-cp -f usermanual.pdf $(DOCSDIR)/.
-diff -Nur ucblogo-6.0/makefile.in ucblogo-6.0.new/makefile.in
---- ucblogo-6.0/makefile.in	2008-09-14 01:27:17.000000000 +0200
-+++ ucblogo-6.0.new/makefile.in	2014-12-19 00:46:50.621593132 +0100
-@@ -24,7 +24,7 @@
- logo:	$(OBJS)
- 	$(LINKER) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o logo
- 
--everything:	logo logolib/Messages helpfiles helpfiles/HELPCONTENTS
-+all:	logo logolib/Messages helpfiles helpfiles/HELPCONTENTS
- #logo-mode
- 
- mem.o:	mem.c
-@@ -71,13 +71,14 @@
- 	cd docs; $(MAKE) ship
- 
- install: all
--	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
--	cp logo $(BINDIR)/.
--	cp -f logolib/* $(LIBLOC)/logolib/.
--	cp -f helpfiles/* $(LIBLOC)/helpfiles/.
--	cp -f csls/* $(LIBLOC)/csls/.
-+#	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $(DESTDIR)/$$d || exit 1; done
-+	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do mkdir -p $(DESTDIR)/$$d || exit 1; done
-+	cp logo $(DESTDIR)$(BINDIR)/.
-+	cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/.
-+	cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/.
-+	cp -rf csls/* $(DESTDIR)$(LIBLOC)/csls/.
- #	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
--	(cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
-+	(cd docs; prefix=$(DESTDIR)$(prefix) LIBLOC=$(DESTDIR)$(LIBLOC) BINDIR=$(DESTDIR)$(BINDIR) $(MAKE) install)
- #	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
- 
- logo-mode: 
-@@ -85,7 +86,7 @@
- #	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
- 
- make-docs:
--	(cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) $(MAKE) all)
-+	(cd docs; prefix=$(DESTDIR)$(prefix) LIBLOC=$(DESTDIR)$(LIBLOC) $(MAKE) all)
- 
- mac: all
- 	mkdir -p UCBLogo.app
diff --git a/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch b/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch
deleted file mode 100644
index 47e6efb567..0000000000
--- a/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -upr ucblogo-6.0.orig/coms.c ucblogo-6.0/coms.c
---- ucblogo-6.0.orig/coms.c	2008-08-23 22:51:14.000000000 +0300
-+++ ucblogo-6.0/coms.c	2015-09-09 19:48:45.375415764 +0300
-@@ -24,10 +24,11 @@
- extern int check_wx_stop(int force_yield);
- #endif
- 
-+#include <math.h>
-+
- #define WANT_EVAL_REGS 1
- #include "logo.h"
- #include "globals.h"
--#include <math.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-diff -upr ucblogo-6.0.orig/graphics.c ucblogo-6.0/graphics.c
---- ucblogo-6.0.orig/graphics.c	2008-09-03 20:58:13.000000000 +0300
-+++ ucblogo-6.0/graphics.c	2015-09-09 19:49:04.289294029 +0300
-@@ -22,11 +22,12 @@
- #ifdef WIN32
- #include <windows.h>
- #endif /* WIN32 */
-- 
-+
-+#include <math.h>
-+
- #define WANT_EVAL_REGS 1
- #include "logo.h"
- /*   #include "globals.h"   has been moved further down */
--#include <math.h>
- 
- #ifdef HAVE_WX
- #include "wxGraphics.h"
diff --git a/development/ucblogo/ucblogo.SlackBuild b/development/ucblogo/ucblogo.SlackBuild
index b4075e277c..46cc436533 100644
--- a/development/ucblogo/ucblogo.SlackBuild
+++ b/development/ucblogo/ucblogo.SlackBuild
@@ -7,14 +7,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ucblogo
-VERSION=${VERSION:-6.0}
+VERSION=${VERSION:-6.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -32,8 +32,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -52,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar zxvf $CWD/${PRGNAM}.tar.gz
+tar zxvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -61,18 +61,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/01-makefiles.patch
-sed -i -e 's:lib/logo:share/logo:' makefile.in
-# Fix build with gcc-5 (thanks to Arch Linux)
-patch -p1 < $CWD/ucblogo-6.0-include-math.h-earlier.patch
-
 CFLAGS="$SLKCFLAGS -std=gnu89" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --with-x \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --infodir=/usr/info \
+  --enable-x11 \
   --build=$ARCH-slackware-linux
 
 make
@@ -81,9 +78,14 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*.info*
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README TODO changes.txt gpl plm usermanual logologo.ico logologo.png ucblogo.png ucblogo.xpm \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README* TODO changes.txt gpl.html plm usermanual logologo.ico \
+  logologo.png ucblogo.png ucblogo.xpm $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/ucblogo/ucblogo.info b/development/ucblogo/ucblogo.info
index 9ac4719008..44ee232b2b 100644
--- a/development/ucblogo/ucblogo.info
+++ b/development/ucblogo/ucblogo.info
@@ -1,8 +1,8 @@
 PRGNAM="ucblogo"
-VERSION="6.0"
+VERSION="6.2.2"
 HOMEPAGE="http://www.cs.berkeley.edu/~bh/logo.html"
-DOWNLOAD="ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo.tar.gz"
-MD5SUM="36a56765b18136c817880c5381af196b"
+DOWNLOAD="https://github.com/jrincayc/ucblogo-code/releases/download/version_6.2.2/ucblogo-6.2.2.tar.gz"
+MD5SUM="9f92d6a95afa7030c9beba47345cf29d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libbsd"