From c14df07dd2ea428d957c2cc495d377c36669df5a Mon Sep 17 00:00:00 2001 From: Zbigniew Baniewski Date: Mon, 11 Feb 2013 14:44:56 -0600 Subject: development/4th: Updated for version 3.62.0. Signed-off-by: Erik Hanson --- development/4th/01-directories.patch | 32 ++++++++++++++++++++++++++++++++ development/4th/01-if_for_64bit.patch | 19 ------------------- development/4th/02-directories.patch | 32 -------------------------------- development/4th/4th.SlackBuild | 6 +++--- development/4th/4th.info | 8 ++++---- 5 files changed, 39 insertions(+), 58 deletions(-) create mode 100644 development/4th/01-directories.patch delete mode 100644 development/4th/01-if_for_64bit.patch delete mode 100644 development/4th/02-directories.patch diff --git a/development/4th/01-directories.patch b/development/4th/01-directories.patch new file mode 100644 index 0000000000..19e2c98354 --- /dev/null +++ b/development/4th/01-directories.patch @@ -0,0 +1,32 @@ +diff -Nur 4th-3.62.0-unix/sources/Makefile 4th-3.62.0-unix.new/sources/Makefile +--- 4th-3.62.0-unix/sources/Makefile 2012-12-22 12:26:35.000000000 +0000 ++++ 4th-3.62.0-unix.new/sources/Makefile 2013-02-11 15:30:00.531948113 +0000 +@@ -16,13 +16,13 @@ + + # The following variables may need to be changed + +-LIBRARIES=/usr/lib +-INCLUDES=/usr/include +-BINARIES=/usr/local/bin +-MANDIR=/usr/share/man +-DOCDIR=/usr/share/doc ++LIBRARIES=$(DESTDIR)/usr/lib$(LIBSUFFIX) ++INCLUDES=$(DESTDIR)/usr/include ++BINARIES=$(DESTDIR)/usr/bin ++MANDIR=$(DESTDIR)/usr/man ++DOCDIR=$(DESTDIR)/usr/doc + SOURCES=../4th +-CFLAGS= -DUNIX -fsigned-char -Wall -O3 -s ++CFLAGS=$(CXXFLAGS) -DUNIX -fsigned-char -Wall -s + + # Cross compilation variables + LD=$(CROSS)ld +@@ -128,7 +128,7 @@ + + install: mostlyinstall + install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1 +- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/ ++ install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th-3.62.0/ + + uninstall: + -rm -f $(LIBRARIES)/lib4th.{a,so*} diff --git a/development/4th/01-if_for_64bit.patch b/development/4th/01-if_for_64bit.patch deleted file mode 100644 index 51aa0d8a11..0000000000 --- a/development/4th/01-if_for_64bit.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur 4th-3.61.2-unix/sources/4th.h 4th-3.61.2-unix.new/sources/4th.h ---- 4th-3.61.2-unix/sources/4th.h 2009-11-20 23:52:02.000000000 +0000 -+++ 4th-3.61.2-unix.new/sources/4th.h 2011-08-15 19:55:51.674547949 +0000 -@@ -60,11 +60,11 @@ - #define M4DUPNAM 26 - #define M4CABORT 27 - --#define CELL_MIN LONG_MIN --#define CELL_MAX LONG_MAX --#define strtocell(a,b,c) strtol((a),(b),(c)) -+#define CELL_MIN INT_MIN -+#define CELL_MAX INT_MAX -+#define strtocell(a,b,c) (int)strtol((a),(b),(c)) - --typedef long cell; -+typedef int cell; - typedef unsigned char unit; - - typedef struct { diff --git a/development/4th/02-directories.patch b/development/4th/02-directories.patch deleted file mode 100644 index a16070aff1..0000000000 --- a/development/4th/02-directories.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nur 4th-3.61.2-unix/sources/Makefile 4th-3.61.2-unix.new/sources/Makefile ---- 4th-3.61.2-unix/sources/Makefile 2011-08-18 20:34:47.000000000 +0000 -+++ 4th-3.61.2-unix.new/sources/Makefile 2011-08-20 01:10:29.653081410 +0000 -@@ -16,13 +16,13 @@ - - # The following variables may need to be changed - --LIBRARIES=/usr/lib --INCLUDES=/usr/include --BINARIES=/usr/local/bin --MANDIR=/usr/share/man --DOCDIR=/usr/share/doc -+LIBRARIES=$(DESTDIR)/usr/lib$(LIBSUFFIX) -+INCLUDES=$(DESTDIR)/usr/include -+BINARIES=$(DESTDIR)/usr/bin -+MANDIR=$(DESTDIR)/usr/man -+DOCDIR=$(DESTDIR)/usr/doc - SOURCES=../4th --CFLAGS= -DUNIX -fsigned-char -Wall -O3 -s -+CFLAGS=$(CXXFLAGS) -DUNIX -fsigned-char -Wall -s - - # Cross compilation variables - LD=$(CROSS)ld -@@ -125,7 +125,7 @@ - - install: mostlyinstall - install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1 -- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/ -+ install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th-3.61.2/ - - uninstall: - -rm -f $(LIBRARIES)/lib4th.{a,so*} diff --git a/development/4th/4th.SlackBuild b/development/4th/4th.SlackBuild index 0fe35855a4..6ab6296148 100644 --- a/development/4th/4th.SlackBuild +++ b/development/4th/4th.SlackBuild @@ -2,10 +2,10 @@ # Slackware build script for 4th -# Written by Zbigniew Baniewski, zb@ispid.com.pl +# Written by Zbigniew Baniewski PRGNAM=4th -VERSION=3.61.2 +VERSION=3.62.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,7 +43,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION-unix tar xvf $CWD/$PRGNAM-$VERSION-unix.tar.gz -cat $CWD/02-directories.patch | patch -p0 || exit +cat $CWD/01-directories.patch | patch -p0 || exit cd $PRGNAM-$VERSION-unix/sources chown -R root:root . find . \ diff --git a/development/4th/4th.info b/development/4th/4th.info index 450fb86d58..2c4cb640ef 100644 --- a/development/4th/4th.info +++ b/development/4th/4th.info @@ -1,10 +1,10 @@ PRGNAM="4th" -VERSION="3.61.2" +VERSION="3.62.0" HOMEPAGE="http://thebeez.home.xs4all.nl/4tH/" -DOWNLOAD="http://4th.googlecode.com/files/4th-3.61.2-unix.tar.gz" -MD5SUM="b2730f7b68c91510e1b3762ab08d641b" +DOWNLOAD="http://4th.googlecode.com/files/4th-3.62.0-unix.tar.gz" +MD5SUM="7dea1c189e70f47730c279c0cda323a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Zbigniew Baniewski" -EMAIL="zb@ispid.com.pl" +EMAIL="Zbigniew.Baniewski@gmail.com" -- cgit v1.2.3