system/wiimms-iso-tools: Updated for version 3.02a.

Signed-off-by: orbea <orbea@riseup.net>

3 files changed, 36 insertions, 22 deletions

diff --git a/system/wiimms-iso-tools/cflags.diff b/system/wiimms-iso-tools/cflags.diff
index 2107bdc175..0e483f6ecd 100644
--- a/system/wiimms-iso-tools/cflags.diff
+++ b/system/wiimms-iso-tools/cflags.diff
@@ -1,16 +1,27 @@
---- Makefile.orig	2018-04-01 01:05:20.377566441 -0700
-+++ Makefile	2018-04-01 01:05:59.596953701 -0700
+--- Makefile.orig	2019-12-22 07:58:45.850503487 -0800
++++ Makefile	2019-12-22 08:17:35.475369649 -0800
+@@ -112,8 +112,8 @@
+ # compiler settings
+ 
+ PRE		?= 
+-CC		= $(PRE)gcc
+-CPP		= $(PRE)g++
++CC		?= $(PRE)gcc
++CXX		?= $(PRE)g++
+ STRIP		= $(PRE)strip
+ 
+ #-------------------------------------------------------------------------------
 @@ -243,7 +243,8 @@
  DCLIB_DIR	:= ./dclib
  DIR_LIST	+= $(DCLIB_DIR)
  VPATH		+= $(DCLIB_DIR)
 -CFLAGS		+= -I$(DCLIB_DIR)
 +CFLAGS		?= -O3 -funroll-loops
-+DEF_FLAGS	+= -I$(DCLIB_DIR)
++DEF_FLAGS	:= -I$(DCLIB_DIR)
  
  # other objects
  WIT_O		:= lib-std.o lib-file.o lib-sf.o \
-@@ -297,15 +298,15 @@
+@@ -297,17 +298,17 @@
  DEFINES1	+= -D_LZMA_PROB32=1	# LZMA option
  DEFINES		=  $(strip $(DEFINES1) $(MODE) $(XDEF))
  
@@ -22,9 +33,12 @@
 +DEF_FLAGS	+= -Wall -Wno-parentheses -Wno-unused-function
 +#DEF_FLAGS	+= -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
 +DEF_FLAGS	+= -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
- ifeq ($(SYSTEM),mac)
+ ifeq ($(SYSTEM),cygwin)
+-  CFLAGS	+= -Wno-format-truncation
++  DEF_FLAGS	+= -Wno-format-truncation
+ else ifeq ($(SYSTEM),mac)
 - CFLAGS		+= -I/usr/local/include
-+ DEF_FLAGS		+= -I/usr/local/include
++ DEF_FLAGS	+= -I/usr/local/include
  endif
 -CFLAGS		+= $(XFLAGS)
 -CFLAGS		:= $(strip $(CFLAGS))
@@ -33,7 +47,7 @@
  
  DEPFLAGS	+= -MMD
  
-@@ -369,7 +370,7 @@
+@@ -371,7 +372,7 @@
  
  $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
  	@printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
@@ -42,7 +56,7 @@
  		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
  	@if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
  
-@@ -382,7 +383,7 @@
+@@ -384,7 +385,7 @@
  
  $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
  	@printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)"
@@ -51,7 +65,7 @@
  		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
  
  #--------------------------
-@@ -395,19 +396,19 @@
+@@ -397,19 +398,19 @@
  
  $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
  	@printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)"
@@ -74,7 +88,7 @@
  
  #--------------------------
  
-@@ -440,11 +441,11 @@
+@@ -442,11 +443,11 @@
  
  $(LIBBZ2_OBJ): %.o: %.c Makefile
  	@printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]"
@@ -88,7 +102,7 @@
  
  #
  ###############################################################################
-@@ -656,6 +657,8 @@
+@@ -658,6 +659,8 @@
  	@echo  ""
  	@echo  "CFLAGS:  $(CFLAGS)"
  	@echo  ""
@@ -97,7 +111,7 @@
  	@echo  "LDFLAGS: $(LDFLAGS)"
  	@echo  ""
  	@echo  "LIBS: $(LIBS)"
-@@ -1003,7 +1006,7 @@
+@@ -1005,7 +1008,7 @@
  	@echo  " make old	enable '-DOLD_FEATURES'"
  	@echo  " make wait	enable '-DWAIT'"
  	@echo  " make testtrace	enable '-DTESTTRACE'"
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
index a5d51c87dd..d10239ff94 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Wiimms ISO Tools
 #
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
-# Copyright 2015, 2018 Hunter Sezen California, USA
+# Copyright 2015, 2018-2019 Hunter Sezen California, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wiimms-iso-tools
-VERSION=${VERSION:-3.01a}
+VERSION=${VERSION:-3.02a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,9 +60,9 @@ set -eu
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM.source-$VERSION
+tar xvf $CWD/$PRGNAM.source-$VERSION.txz
+cd $PRGNAM.source-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,8 +79,8 @@ sed -i "s|/usr/local|$PKG/usr|" templates.sed
 
 make install
 
-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 -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
+  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.info b/system/wiimms-iso-tools/wiimms-iso-tools.info
index 3dd408d461..c15948fdb0 100644
--- a/system/wiimms-iso-tools/wiimms-iso-tools.info
+++ b/system/wiimms-iso-tools/wiimms-iso-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="wiimms-iso-tools"
-VERSION="3.01a"
+VERSION="3.02a"
 HOMEPAGE="https://wit.wiimm.de/"
-DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/system/wiimms-iso-tools/wiimms-iso-tools-3.01a.tar.xz"
-MD5SUM="ebfe94fc14d851770da9c921de1ebb8c"
+DOWNLOAD="https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-3.02a.txz"
+MD5SUM="a49c0fe7e5cf7fff7dd13fbdacb946eb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""