Version 3.62.4

This package used to be a disgrace.

4 files changed, 27 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48d6b3dce832..f9bca72f5b12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
 pkgbase = 4th
 	pkgdesc = A Forth Compiler
-	pkgver = 3.62.0
-	pkgrel = 4
+	pkgver = 3.62.4
+	pkgrel = 1
 	url = http://www.xs4all.nl/~thebeez/4tH/index.html
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	source = https://4th.googlecode.com/files/4th-3.62.0-i586.tar.gz
-	source = Makefile.patch
-	sha512sums = 80dbe8f3c54baa9150226b7f555e37c0183695dec77adb562262bbad10572f60966b47f5c5db133184a00052a42aed48363a00be7f1ed6bf7d891e619e7eff30
-	sha512sums = 80d5b2da61b419be13c96cb5a89066a54c0d5abde85300eda625fd106ee73b82978f9897aff9f427f9518dad2ccee1301172d9c93074bb83aaaad070b52eab1a
+	source = 4th-3.62.4-unix.tar.gz::http://sourceforge.net/projects/forth-4th/files/4th-3.62.4/4th-3.62.4-unix.tar.gz/download
+	sha256sums = 1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2
 
 pkgname = 4th
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8ced07b6c655
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+src/
+pkg/
+*.tar.gz
+*.pkg.tar.xz
+*.pkg.tar.xz.sig
+*.log*
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 4d0a3484b751..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /home/jorge/Descargas/4th-3.62.0/sources/Makefile	2012-12-22 13:26:35.000000000 +0100
-+++ /home/jorge/Descargas/4th-3.62.0/sources/Makefile2	2013-02-25 15:44:21.622302210 +0100
-@@ -18,7 +18,7 @@
- 
- LIBRARIES=/usr/lib
- INCLUDES=/usr/include
--BINARIES=/usr/local/bin
-+BINARIES=/usr/bin
- MANDIR=/usr/share/man
- DOCDIR=/usr/share/doc
- SOURCES=../4th
-@@ -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.ps $(DOCDIR)/4th/
- 
- uninstall:
- 	-rm -f $(LIBRARIES)/lib4th.{a,so*}
diff --git a/PKGBUILD b/PKGBUILD
index 2c14c451ae1b..124b7020a424 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,28 @@
-#! /bin/bash
-#Contributor: scj <scj archlinux us>
-#Maintainer: jorge_barroso <jorge.barroso.11@gmail.com
+# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Contributor: scj <scj archlinux us>
+# Contributor: jorge_barroso <jorge.barroso.11@gmail.com
 
 pkgname=4th
-pkgver=3.62.0
-pkgrel=4
+pkgver=3.62.4
+pkgrel=1
 pkgdesc="A Forth Compiler"
 arch=('i686' 'x86_64')
 url="http://www.xs4all.nl/~thebeez/4tH/index.html"
 license=('LGPL')
-install=
-if [ "$CARCH" = "x86_64" ]; then
-source=("https://4th.googlecode.com/files/${pkgname}-${pkgver}-$CARCH.tar.gz"
-	'Makefile.patch')
-sha512sums=('e9a5824d937cc72511ca7ee49c39adefed261865231e47797dac7f49f1a3c1b3476882a76121765b1f5f4936cc3693e8eae2f3d0df6aa48aae9f761abfacdc9f'
-            '80d5b2da61b419be13c96cb5a89066a54c0d5abde85300eda625fd106ee73b82978f9897aff9f427f9518dad2ccee1301172d9c93074bb83aaaad070b52eab1a')
-else
-_iarch=i586
-source=("https://4th.googlecode.com/files/${pkgname}-${pkgver}-$_iarch.tar.gz"
-	'Makefile.patch')
-sha512sums=('80dbe8f3c54baa9150226b7f555e37c0183695dec77adb562262bbad10572f60966b47f5c5db133184a00052a42aed48363a00be7f1ed6bf7d891e619e7eff30'
-            '80d5b2da61b419be13c96cb5a89066a54c0d5abde85300eda625fd106ee73b82978f9897aff9f427f9518dad2ccee1301172d9c93074bb83aaaad070b52eab1a')
-fi
+source=("4th-${pkgver}-unix.tar.gz::http://sourceforge.net/projects/forth-4th/files/4th-${pkgver}/4th-${pkgver}-unix.tar.gz/download")
+sha256sums=('1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/sources"
-  patch -uNi ${srcdir}/Makefile.patch || return 1
-  if [ "$CARCH" == "x86_64" ]; then
-    cp include/* . ; make clean || return 1
-  fi
-  make || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}-unix/sources/"
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/sources"
-  install -d ${pkgdir}/usr/{share/{doc,man}/4th,{lib,bin}}
-  make BINARIES=${pkgdir}/usr/bin \ || return 1
-       LIBRARIES=${pkgdir}/usr/lib \ || return 1
-       DOCDIR=${pkgdir}/usr/share/doc \ || return 1
-       MANDIR=${pkgdir}/usr/share/man install || return 1
-}
\ No newline at end of file
+  cd "${srcdir}/${pkgname}-${pkgver}-unix/sources/"
+	install -D -m644 "../COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -d "${pkgdir}/usr/"{share/doc/4th,lib,bin}
+  make BINARIES="${pkgdir}/usr/bin" \
+       LIBRARIES="${pkgdir}/usr/lib" \
+       DOCDIR="${pkgdir}/usr/share/doc" \
+       MANDIR="${pkgdir}/usr/share/man" install
+}