academic/g3data: Updated for version 1.5.4.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

6 files changed, 27 insertions, 298 deletions

diff --git a/academic/g3data/g3data.SlackBuild b/academic/g3data/g3data.SlackBuild
index 0be826f916..e36de78050 100644
--- a/academic/g3data/g3data.SlackBuild
+++ b/academic/g3data/g3data.SlackBuild
@@ -6,16 +6,14 @@
 
 
 PRGNAM=g3data
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -39,7 +37,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -54,20 +52,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/patch-makefile.diff
 
-CPPFLAGS="$SLKCFLAGS" make
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-mkdir -p $PKG/usr/bin $PKG/usr/man/man1
-make install bindir=$PKG/usr/bin mandir=$PKG/usr/man
+make
+make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/g3data.desktop > $PKG/usr/share/applications/g3data.desktop
-cat $CWD/g3data.xpm > $PKG/usr/share/pixmaps/g3data.xpm
+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 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  README.TEST test1.png test2.png \
+  README COPYING ChangeLog NEWS AUTHORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/g3data/g3data.desktop b/academic/g3data/g3data.desktop
deleted file mode 100644
index af9b1e22ff..0000000000
--- a/academic/g3data/g3data.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=g3data
-Comment=Data Extraction Tool
-Exec=g3data
-Icon=g3data
-Terminal=false
-Type=Application
-Categories=Education;Science;Graphics;
diff --git a/academic/g3data/g3data.info b/academic/g3data/g3data.info
index 8b4bcc7f6e..7c5553dfc4 100644
--- a/academic/g3data/g3data.info
+++ b/academic/g3data/g3data.info
@@ -1,8 +1,8 @@
 PRGNAM="g3data"
-VERSION="1.5.3"
-HOMEPAGE="http://www.frantz.fi/software/g3data.php"
-DOWNLOAD="http://www.frantz.fi/software/g3data-1.5.3.tar.gz"
-MD5SUM="21c37526dff8601d699fa511c9d5bc36"
+VERSION="1.5.4"
+HOMEPAGE="https://github.com/pn2200/g3data"
+DOWNLOAD="https://github.com/downloads/pn2200/g3data/g3data-1.5.4.tar.gz"
+MD5SUM="acb41e54ee5fbf167413218f209c4e3f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pablo Santamaria"
diff --git a/academic/g3data/g3data.xpm b/academic/g3data/g3data.xpm
deleted file mode 100644
index 26f80c778c..0000000000
--- a/academic/g3data/g3data.xpm
+++ /dev/null
@@ -1,260 +0,0 @@
-/* XPM */
-static char *g_data_icon[] = {
-/* columns rows colors chars-per-pixel */
-"56 57 197 2",
-"   c #000000",
-".  c #1B1B1B",
-"X  c #122C38",
-"o  c gray14",
-"O  c #22373C",
-"+  c #393839",
-"@  c #1B4051",
-"#  c #2F4244",
-"$  c #304041",
-"%  c #285077",
-"&  c #275E76",
-"*  c #295E75",
-"=  c #464444",
-"-  c #525455",
-";  c #595959",
-":  c #436C75",
-">  c #576C76",
-",  c #686666",
-"<  c #696969",
-"1  c #726E6E",
-"2  c #676F72",
-"3  c #686E70",
-"4  c #677175",
-"5  c #65767C",
-"6  c #767373",
-"7  c #797777",
-"8  c #FC221C",
-"9  c #DE332D",
-"0  c #F3443D",
-"q  c #F94639",
-"w  c #F84B3E",
-"e  c #E63B41",
-"r  c #A6625B",
-"t  c #E54247",
-"y  c #EE554E",
-"u  c #F85444",
-"i  c #F75949",
-"p  c #FF5757",
-"a  c #F66754",
-"s  c #F66957",
-"d  c #C67465",
-"f  c #F57660",
-"g  c #F47C66",
-"h  c #F47F68",
-"j  c #FF7F7F",
-"k  c #C28877",
-"l  c #F3846C",
-"z  c #F38A71",
-"x  c #F2957A",
-"c  c #F2997E",
-"v  c #347E9D",
-"b  c #58668C",
-"n  c #657982",
-"m  c #627E8A",
-"M  c #5E71AD",
-"N  c #5F76BF",
-"B  c #687DBC",
-"V  c #3655CA",
-"C  c #3A62F1",
-"Z  c #7068C7",
-"A  c #6071DB",
-"S  c #5857FF",
-"D  c #446AEE",
-"F  c #496EED",
-"G  c #4C70EC",
-"H  c #5D7DE5",
-"J  c #5477EA",
-"K  c #5579EA",
-"L  c #5B7DE8",
-"P  c #706FFF",
-"I  c #7372FF",
-"U  c #807FFF",
-"Y  c #3682A2",
-"T  c #3D95BA",
-"R  c #5E8A9D",
-"E  c #62818E",
-"W  c #72838F",
-"Q  c #618393",
-"!  c #618999",
-"~  c #5D8EA2",
-"^  c #5D90A5",
-"/  c #5C93AA",
-"(  c #5A97B0",
-")  c #599AB5",
-"_  c #579EBC",
-"`  c #599DBA",
-"'  c #6D88A4",
-"]  c #6795A9",
-"[  c #7B8AB1",
-"{  c #57A0BF",
-"}  c #58A0BE",
-"|  c #3F99C0",
-" . c #57A3C3",
-".. c #55A6C8",
-"X. c #55A9CD",
-"o. c #53ADD3",
-"O. c #51B3DC",
-"+. c #5F81E7",
-"@. c #6284E7",
-"#. c #6A89E5",
-"$. c #7592E2",
-"%. c #7B97E1",
-"&. c #7F9AE0",
-"*. c #4CB7E5",
-"=. c #4FB9E6",
-"-. c #4EBDEC",
-";. c #50B6E1",
-":. c #50B8E4",
-">. c #5FC2E8",
-",. c #67C5E6",
-"<. c #848080",
-"1. c #9A9B88",
-"2. c #879490",
-"3. c #9D9B9B",
-"4. c #9DA39A",
-"5. c #A6A08D",
-"6. c #A6AC9E",
-"7. c #AAAB98",
-"8. c #B5B89F",
-"9. c #9182BF",
-"0. c #99A2A3",
-"q. c #91B1AF",
-"w. c #99BBB2",
-"e. c #A4A2A2",
-"r. c #A3ABAE",
-"t. c #AAA8A8",
-"y. c #B1AFAB",
-"u. c #B0B8AF",
-"i. c #A0AEBF",
-"p. c #FF8787",
-"a. c #FF9191",
-"s. c #CCB196",
-"d. c #D3B095",
-"f. c #F1A386",
-"g. c #F0A789",
-"h. c #F0AC8D",
-"j. c #EEB594",
-"k. c #EFB897",
-"l. c #E0BE9E",
-"z. c #EEBF9D",
-"x. c #FFABAB",
-"c. c #FFB1B1",
-"v. c #D2CEAD",
-"b. c #CDD3B3",
-"n. c #DCDCB7",
-"m. c #EDCFA9",
-"M. c #ECD3AD",
-"N. c #ECD7B0",
-"B. c #ECDAB3",
-"V. c #DAE0BA",
-"C. c #E1E6BE",
-"Z. c #EBE5BC",
-"A. c #EBE8BE",
-"S. c #8586CC",
-"D. c #839DDF",
-"F. c #8BA3DC",
-"G. c #92A9DB",
-"H. c #9DB2D8",
-"J. c #A7B7CC",
-"K. c #A2B7D7",
-"L. c #A6B8D6",
-"P. c #AABDD5",
-"I. c #8786FF",
-"U. c #8887FF",
-"Y. c #8C8BFF",
-"T. c #9392FF",
-"R. c #9D9CFF",
-"E. c #A2A1FF",
-"W. c #ACABFF",
-"Q. c #B2B1FF",
-"!. c #B3C4D2",
-"~. c #B8C7D2",
-"^. c #BBCAD1",
-"/. c #BAE1D1",
-"(. c #C3D1CF",
-"). c #CFDAC8",
-"_. c #D2DDCB",
-"`. c #FFC5C5",
-"'. c #FFD7D7",
-"]. c #FFDBDB",
-"[. c #DFE6C4",
-"{. c #DAE4C9",
-"}. c #E2E2C1",
-"|. c #E5EBC5",
-" X c #E9EEC3",
-".X c #E0E8C8",
-"XX c #EAF0C5",
-"oX c #C7C7FF",
-"OX c #CDCDFF",
-"+X c #D6D6FF",
-"@X c #DEDEFF",
-"#X c #FFE5E5",
-"$X c #FFEDED",
-"%X c #E3E3FF",
-"&X c #EAEAFF",
-"*X c gray100",
-"=X c None",
-/* pixels */
-"=X                                                                        =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  v Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y X . 2 =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.>.-.-.-.-.-.-.-.-.-.>.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.: /././././././././././././././././././././././././././././.>.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.Xy.XXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXj.k XXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXw Z.XXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXn.v.XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXh.l XXXXA.4. X,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXd.d XXXXXXXXXXXXXXXXXXXX0.V.XXXXXXXXXXXXXXw Z.XXXX~.B XX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXx 8 M.XXXXXXXXXXXXXXXX.XV [.XXXXXXXXXXXXf.z XXXXXXC {.XX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXs k.u XXXXXXXXXXXXXXXXG.+.G.XXXXXXXXXXA.q A.XXXXF.G.XXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.>.# .Xw  Xl f.XXXXXXXXXXXXXXF .XG XXXXXXXXXXx c XXXX{.D XXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# XXu |. Xq A.XXXXXXXXXX~.$.XX$.^.XXXXXXA.q XXXXXX+.^.XXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# B.s 6.C.j.f  XXXXXXXXXK {.XX_.+.XXXXXXz g.XXXX^.+.XXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# h.x N ). Xi m.XXXXXX{.J XXXXXXK {.XXA.w XXXXXXD {.XXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.$ g z.C K XXN.u XXXXXXF.!.XXXXXXP.F.|.g j.XXXXG.F.XXXXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.>.# i V.J $.P.XXl g.XXXXC |.XXXXXX XD l.r XXXX{.D  XXXXXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.# w ^.%.[.C |.XXq C.!.%.XXXXXXXX X9.e v.XXXX#.!.XXXXXXXXXXXX,.@ o < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X  *.-.$ i G.L.XX!.%.A.j.f J {.XXXXXXXXM.0 A  XXX(.L XXXXXX1.y.y.y.r.3.3.e.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.1 =X",
-"=X  *.-.+ l +._.XXXXM u.XXa Z XXXXXXXXM.q Z.K {.XXF _.XXXXXX7.*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X6.=X",
-"=X  *.-.- s.G XXXXXXJ.F.XXS.t XXXXXXN.q B. X!.$.H.D.XXXXXXXX7.*X*Xc.p.p.*X`.p.p.*X*X*X*XY.U.Q.*XR.U.Q.*X*X*X3., ",
-"=X  *.-.# XXF XXXXXX{.+.XXC z c XXB.q N.XXXXXXD D |.XXXXXXXX7.*X*X].`.`.*X#X`.`.*X*X*X*XoXoX@X*X+XoX@X*X*X*X3.< ",
-"=X  *.-.# _.@.XXXXXXXXF L.F.A.q N.0 M.XXXXXXXX[ J.XXXXXXXXXX7.*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X  *.-.# L.G.XXXXXXXX+.C {.XXl.9 N.XXXXXXXXXXb.V. XXXXXXXXX7.*X*Xa.p p *Xc.p p *X*X*X*XS S Y.*XP S T.*X*X*X3.< ",
-"=X  *.-.# %.~.XXXXC.XX&.+.XXXXV.5.XXXXXXXXXXXX.XXXXXXXXXXXXX7.*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X  *.-.O b q.w.q.w.q.M W w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.2.*X*X#X'.'.*X$X'.'.*X*X*X*X+X+X&X*X@X@X&X*X*X*X3.< ",
-"=X  *.-.& % & & & & & v & & & & & & & & & & & & * * & & & & > *X*Xx.j j *X`.j j *X*X*X*XI I.W.*XT.I W.*X*X*X3.< ",
-"=X  *.-.-.-.-.-.-.-.-.-.-.-.-.-.-.>.-.-.-.-.-.-.-.-.-.-.-.-.] *X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X  *.-.-.>.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.>.-.-.-.-.] *X*Xx.j j *X`.j j *X*X*X*XI.I W.*XT.I W.*X*X*X3.< ",
-"=X  *.-.-.-.-.-.-.-.-.-.-.>.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.] *X*X#X'.'.*X$X'.'.*X*X*X*X+X+X&X*X%X+X&X*X*X*X3., ",
-"=X  | | | | | | | | | | | | | | | | | | | | | | | | | | T T R *X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X                                                          = *X*Xa.p p *Xc.p p *X*X*X*XS S T.*XI S T.*X*X*X3.< ",
-"=X=X; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; < *X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X6 *X*X*X*X*X*X*X*X*X*X*X*X*XOXOX%X*X+XOX@X*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X7 *X*X*X*X*X*X*X*X*X*X*X*X*XU.I.Q.*XR.U.Q.*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X7 *X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X7 *X*X*X*X*X*X*X*X*X*X*X*X*XP P E.*XU.P E.*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X7 *X*X*X*X*X*X*X*X*X*X*X*X*X%X@X&X*X%X@X&X*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X7 *X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X*X3.< ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X<.7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 , < ",
-"=X=X=X=X=X=X=X=X=X=X=X=X=X-.-.=X=X=X=X=X=X=X=X=X=X=X=X-.=X=X=X=X< < < < < < < < < < < < < < < < < < < < < < < < ",
-"=X=X=X=X=X=X=X=X=X=X=X-.:.o.:.-.;.=X=X=X=X=X=X=X=X=X=X-.5 =X=X=X=X=X=X=X=X=X=X=X=X-.) =X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X=X=X=X=X=X=X=X=X=X=X=X< =X=X/ -...=X=X=X=X=X=X=X=X=X-.5 =X=X=X=X=X=X=X=X=X=X=X=X-.R =X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X=X=X-.O.=X=X=X=X=X=X=X=X=X=X=X:.o.< =X=X=X=X-.;.=X=X-.n =X=X=X=X-.;.O.=X=X=X=X=X-. ...=X=X=X=X=X-.:.O.=X=X=X=X",
-"=X-.-.X.o.O.O.O.< =X=X=X=X=X=X=X-.) < =X=X=X-.X.` O...-.5 =X=X-.O._ ..:.:.Q =X=XO.-.o. . .m =X-.O. . .;.*.! =X=X",
-"-.-.m < =X) -.o.< =X=X=X=X*.*.-. .2 =X=X=X-./ < =X=X:.-.5 =X=X=X< =X=X=X*. .=X=X=X-.~ =X=X=X=X=X=X=X=X=X:.o.=X=X",
-"-.O.< =X=X=X-.o.< =X=X=X=Xo.O.-.` =X=X=X=X-.2 =X=X=X=X-.n =X=X=X=X=X=X=X-.O.< =X=X-.! =X=X=X=X=X=X=X=X=X-.-.< =X",
-"-.) < =X=X=X-.o.< =X=X=X=X=X=X! -...=X=X-.;.< =X=X=X=X-.n =X=X=X-.-.-.;.:.:.< =X=X-.! =X=X=X=X=X-.-.-.;.:.-.4 =X",
-"-. .=X=X=X=X-.O.< =X=X=X=X=X=X=X:.-.4 =X-.;.< =X=X=X=X-.5 =X=X-. .5 < =XX.-.< =X=X-.~ =X=X=X=X-.o.n < =X_ -.4 =X",
-"-.;.< =X=X=X-.o.< =X=X=X=X=X=X=X-.-.2 =X=X-.5 =X=X=X*.-.5 =X=X-.5 =X=X=X-.:.< =X=X-.~ =X=X=X=X-.m =X=X=X-.-.4 =X",
-"=X-. .=X=X-.-.o.< =X=X=X=X=X=X=X-.X.< =X=X-._ =X=X=X-.-.5 =X=X-.~ =X=X=X-.-.< =X=X-. .=X=X=X=X-.( =X=X=X-.-.4 =X",
-"=Xo.-.-.-.}  .o.< =X=X-.-.:.-.-.o.4 =X=X=X=X-.O.;.-.` -.5 =X=X-.-.O.:.:.` *.< =X=X=X-.-.-./ =X*.-.;.:.*.) -.4 =X",
-"=X=X=XQ 2 < :. .< =X=X=X~ / ! m < =X=X=X=X=X=X/ ! 4 5 =X3 =X=X=X( / E 2 =X~ < =X=X=X=XQ Q 5 =X=X=X/ Q 4 =X/ < =X",
-"=X=X=X=X=X=X-.! =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X-.O.;.*.-...< =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X",
-"=X=X/ ) ^ m < =X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X=X"
-};
diff --git a/academic/g3data/patch-makefile.diff b/academic/g3data/patch-makefile.diff
deleted file mode 100644
index fab44fe530..0000000000
--- a/academic/g3data/patch-makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru g3data-1.5.3.org/Makefile g3data-1.5.3/Makefile
---- g3data-1.5.3.org/Makefile	2008-12-14 06:20:17.000000000 -0200
-+++ g3data-1.5.3/Makefile	2010-01-19 20:52:40.000000000 -0200
-@@ -22,6 +22,7 @@
- g3data.1.gz: g3data.sgml
- 	rm -f *.1
- 	onsgmls g3data.sgml | sgmlspl /usr/share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl
-+	mv *.1 g3data.1
- 	gzip g3data.1
- 
- clean:
diff --git a/academic/g3data/slack-desc b/academic/g3data/slack-desc
index 5f4b5a320d..255d0f1143 100644
--- a/academic/g3data/slack-desc
+++ b/academic/g3data/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler----------------------------------------------------|
+      |-----handy-ruler------------------------------------------------------|
 g3data: g3data (A tool for extracting data from graphs)
 g3data:
-g3data: g3data is a tool for extracting data from scanned graphs. For graphs 
-g3data: published in scientific articles the actual data is usually not 
+g3data: g3data is a tool for extracting data from scanned graphs. For graphs
+g3data: published in scientific articles the actual data is usually not
 g3data: explicitly given g3data makes the process of extracting this data
 g3data: easy.
 g3data: