system/unace: New maintainer.

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

5 files changed, 214 insertions, 7 deletions

diff --git a/system/unace/01-makefiles.dpatch b/system/unace/01-makefiles.dpatch
new file mode 100644
index 0000000000..812ce49ac0
--- /dev/null
+++ b/system/unace/01-makefiles.dpatch
@@ -0,0 +1,52 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-makefiles.dpatch by Fabian Greffrath <fabian@debian-unofficial.org>
+##
+## DP: Fix upstream makefiles
+
+@DPATCH@
+
+diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk
+--- unace-nonfree-2.5.orig/base.mk	2003-11-27 20:16:20.000000000 +0100
++++ unace-nonfree-2.5/base.mk	2006-01-31 09:33:04.000000000 +0100
+@@ -427,9 +427,7 @@
+ ##############################################################################
+ 
+ ifndef ISWMAKE
+-include $(MAKE_DIR)baseace.mk
+ include $(MAKE_DIR)baseuace.mk
+ else
+-!include $(MAKE_DIR)baseace.mk
+ !include $(MAKE_DIR)baseuace.mk
+ endif
+diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile
+--- unace-nonfree-2.5.orig/makefile	2003-11-24 00:24:24.000000000 +0100
++++ unace-nonfree-2.5/makefile	2006-01-31 09:40:17.000000000 +0100
+@@ -18,6 +18,6 @@
+ INCLDIR 	= //usr/include
+ 
+-DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__
++DEFINES		= -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__
+ 
+ ifdef DEBUG
+ LSWITCHES	=
+@@ -47,7 +47,7 @@
+   $(APPS_UNACEEXE_CFILES)
+ 
+ unace: $(UNACEEXELIN_CFILES)
+-	gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
++	gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace
+ ifndef DEBUG
+ 	tar cfvz linunace25.tgz unace file_id.diz licence
+ 	#sh linpack.sh
+diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk
+--- unace-nonfree-2.5.orig/unace.mk	2003-11-27 20:17:46.000000000 +0100
++++ unace-nonfree-2.5/unace.mk	2006-01-31 09:33:21.000000000 +0100
+@@ -27,8 +27,6 @@
+ 
+ ifndef ISWMAKE
+ include $(MAKE_DIR)unaceexe.mk
+-include $(MAKE_DIR)unacedll.mk
+ else
+ !include $(MAKE_DIR)unaceexe.mk
+-!include $(MAKE_DIR)unacedll.mk
+ endif
diff --git a/system/unace/04-64bit.dpatch b/system/unace/04-64bit.dpatch
new file mode 100644
index 0000000000..2d1b15ef7d
--- /dev/null
+++ b/system/unace/04-64bit.dpatch
@@ -0,0 +1,119 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-64bit.dpatch by Michael Karcher
+## <debian@mkarcher.dialup.fu-berlin.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replace declare.h by a generic stdint based version.
+
+@DPATCH@
+diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h
+--- unace-nonfree-2.5~/source/base/all/declare.h	2007-11-06 00:11:47.000000000 +0100
++++ unace-nonfree-2.5/source/base/all/declare.h	2007-11-06 00:13:18.498574104 +0100
+@@ -7,76 +7,47 @@
+ #ifndef _DECLARE_H_INCLUDED
+ #define _DECLARE_H_INCLUDED
+ 
+-#if !defined(__OS2__) && !defined(_WINDOWS_)
+-  typedef int             BOOL;
+-
+-  typedef char               CHAR;
+-  typedef unsigned char      UCHAR;
+-  typedef UCHAR             *PUCHAR;
+-  typedef char              *PSZ;
+-
+-  typedef short              SHORT;
+-  typedef unsigned short     USHORT;
+-  typedef USHORT            *PUSHORT;
+-
+-  typedef long               LONG;
+-  typedef unsigned long      ULONG;
+-
+-  typedef ULONG             *PULONG;
+-
+-  typedef int                INT;
+-  typedef unsigned int       UINT;
+-  typedef unsigned int      *PUINT;
++#include <stdint.h>
+ 
+-  typedef CHAR              *LPSTR;
+-#endif
++typedef int             BOOL;
++typedef BOOL           *PBOOL;
+ 
+-#if __WATCOMC__==1060
+-  typedef long               __int64[2];
+-  typedef __int64            LONGLONG;
+-  typedef LONGLONG          *PLONGLONG;
+-  typedef __int64            ULONGLONG;
+-  typedef ULONGLONG          DWORDLONG;
+-#else
+-  #if !defined(_WINDOWS_)
+-    #if !defined(__WATCOMC__) && !defined(__int64)
+-      #define __int64  long long
+-    #endif
++typedef char               CHAR;
++typedef CHAR              *PCHAR;
++typedef unsigned char      UCHAR;
++typedef UCHAR             *PUCHAR;
++typedef signed char        SCHAR;
++typedef CHAR              *PSZ;
++typedef CHAR              *LPSTR;
+ 
+-    typedef __int64            LONGLONG;
+-    typedef LONGLONG          *PLONGLONG;
+-    typedef unsigned __int64   ULONGLONG;
+-    typedef ULONGLONG          DWORDLONG;
+-  #endif
+-#endif
++typedef int                INT;
++typedef INT               *PINT;
++typedef unsigned int       UINT;
++typedef unsigned int      *PUINT;
+ 
++typedef int16_t            SHORT;
++typedef SHORT             *PSHORT;
++typedef uint16_t           USHORT;
++typedef USHORT            *PUSHORT;
+ 
+-#if !defined(_WINDOWS_)
+-  typedef BOOL           *PBOOL;
+-  typedef INT            *PINT;
+-#endif
++typedef int32_t            LONG;
++typedef LONG              *PLONG;
++typedef uint32_t           ULONG;
++typedef ULONG             *PULONG;
+ 
+-#if !defined(__wtypes_h__)
+-  typedef void           *PVOID;
+-  typedef CHAR           *PCHAR;
+-  typedef SHORT          *PSHORT;
+-  typedef LONG           *PLONG;
+-  typedef ULONGLONG      *PULONGLONG;
+-#endif
++typedef int64_t            LONGLONG;
++typedef LONGLONG          *PLONGLONG;
++typedef uint64_t           ULONGLONG;
++typedef ULONGLONG         *PULONGLONG;
+ 
+-#if defined(_GNU_H_WINDOWS32_BASE)
+-  typedef LONGLONG  	  ULONGLONG;
+-  typedef ULONGLONG      *PULONGLONG;
+-#endif
++typedef void              *PVOID;
+ 
+-typedef signed char     SCHAR;
++/* Dear ACE team, please clean your code to remove the following types */
++typedef LONGLONG           __int64;
++typedef ULONGLONG          DWORDLONG;
+ 
+ #ifndef NULL
+- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)
+-  #define NULL   0
+- #else
+-  #define NULL   0L
+- #endif
++#include <stdlib.h>
+ #endif
+ 
+ 
diff --git a/system/unace/README b/system/unace/README
index 6b578a1a33..bd8d6d824b 100644
--- a/system/unace/README
+++ b/system/unace/README
@@ -1 +1,5 @@
 unace is a tool for decompressing ACE archives in linux.
+
+To use this software, you have to accept the Public UnAce Licence located at:
+/usr/doc/unace-2.5/license
+If you do not accept, please remove this package.
diff --git a/system/unace/unace.SlackBuild b/system/unace/unace.SlackBuild
index 88a6f8d1e3..da0c5f360e 100644
--- a/system/unace/unace.SlackBuild
+++ b/system/unace/unace.SlackBuild
@@ -2,6 +2,7 @@
 #
 # Slackware build script for unace
 #
+# Copyright 2017  Jeremy Hansen <jebrhansen+SBo -at- gmail.com>
 # Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
@@ -24,15 +25,36 @@
 
 PRGNAM=unace
 VERSION=${VERSION:-2.5}
-ARCH=i586   # Static Binary
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 set -eu
 
 rm -rf $PKG
@@ -41,7 +63,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-tar xvf $CWD/lin${PRGNAM}${VERSION/./}.tgz
+tar xvf $CWD/${PRGNAM}-nonfree_${VERSION}.orig.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -49,6 +72,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 {} \;
 
+# Thanks to AUR for the patches
+patch -p1 < $CWD/01-makefiles.dpatch
+
+if [ "$ARCH" = "x86_64" ]; then
+  patch -p1 < $CWD/04-64bit.dpatch
+fi
+
+make
+
 mkdir -p $PKG/usr/bin
 install -m 0755 unace $PKG/usr/bin/unace
 
diff --git a/system/unace/unace.info b/system/unace/unace.info
index 7015db6411..eb26b34bfd 100644
--- a/system/unace/unace.info
+++ b/system/unace/unace.info
@@ -1,10 +1,10 @@
 PRGNAM="unace"
 VERSION="2.5"
 HOMEPAGE="http://www.winace.com/"
-DOWNLOAD="http://downloads.sourceforge.net/salix-sbo/linunace25.tgz"
-MD5SUM="ad1f8cb7ff3a6c6019da869b72300719"
+DOWNLOAD="http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz"
+MD5SUM="59013e74e5ac2ee15c1e92026ec1e3cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Erik Hanson"
-EMAIL="erik@slackbuilds.org"
+MAINTAINER="Jeremy Hansen"
+EMAIL="jebrhansen+SBo@gmail.com"