games/redeclipse: Updated for version 1.5.

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

3 files changed, 89 insertions, 71 deletions

diff --git a/games/redeclipse/Makefile.patch b/games/redeclipse/Makefile.patch
index 6036f5844a74f..317f9f50541e9 100644
--- a/games/redeclipse/Makefile.patch
+++ b/games/redeclipse/Makefile.patch
@@ -1,27 +1,27 @@
---- Makefile.orig	2013-03-22 02:27:41.000000000 -0600
-+++ Makefile	2013-04-03 13:52:08.721896778 -0600
-@@ -1,4 +1,5 @@
+--- /tmp/SBo/redeclipse-1.5/src/Makefile.orig	2015-03-21 18:26:54.000000000 -0600
++++ /tmp/SBo/redeclipse-1.5/src/Makefile	2015-03-23 22:51:17.188245930 -0600
+@@ -1,9 +1,10 @@
  APPNAME=redeclipse
-+VERSION=1.4
- 
- all:
- 
---- core.mk.orig	2013-03-21 13:45:14.000000000 -0600
-+++ core.mk	2013-04-03 13:52:08.723896754 -0600
-@@ -3,7 +3,7 @@
+ APPCLIENT=$(APPNAME)
  APPSERVER=$(APPNAME)_server
++VERSION=1.5
  
  #CXXFLAGS= -ggdb3
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS=$(EXTRA_CXXFLAGS) -fomit-frame-pointer
+-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math
++CXXFLAGS= $(EXTRA_CXXFLAGS) -O3 -fomit-frame-pointer -ffast-math
  override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
  
- PLATFORM= $(shell uname -s)
---- system-install.mk.orig	2013-03-20 16:21:57.000000000 -0600
-+++ system-install.mk	2013-04-03 22:44:56.979810436 -0600
-@@ -6,15 +6,15 @@
- appserver=$(APPSERVER)
- appgamedir=game/$(APPSHORTNAME)
+ PLATFORM= $(shell gcc -dumpmachine)
+--- /tmp/SBo/redeclipse-1.5/src/system-install.mk.orig	2015-03-21 18:26:54.000000000 -0600
++++ /tmp/SBo/redeclipse-1.5/src/system-install.mk	2015-03-23 23:41:19.164781711 -0600
+@@ -2,18 +2,18 @@
+ appnamefull=$(shell sed -n 's/.define VERSION_NAME *"\([^"]*\)"/\1/p' version.h)
+ appsrcname=$(APPNAME)
+ cappname=$(shell echo $(appname) | tr '[:lower:]' '[:upper:]')# Captial appname
+-appclient=$(APPCLIENT)
+-appserver=$(APPSERVER)
++appclient=$(APPCLIENT)$(BIN_SUFFIX)
++appserver=$(APPSERVER)$(BIN_SUFFIX)
  
 -prefix=/usr/local
 +prefix=/usr
@@ -40,68 +40,76 @@
  menudir=$(DESTDIR)$(prefix)/share/applications
  icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
  pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
-@@ -54,62 +54,62 @@
+@@ -53,70 +53,71 @@
  icons: $(ICONS)
  
  system-install-client: client
--	install -d $(libexecdir)/$(appname)
-+	install -d $(libexecdir)
- 	install -d $(gamesbindir)
+-	$(MKDIR) $(libexecdir)/$(appname)
++	$(MKDIR) $(libexecdir)
+ 	$(MKDIR) $(gamesbindir)
 -	install -m755 $(appclient) $(libexecdir)/$(appname)/$(appname)
 +	install -m755 $(appclient) $(libexecdir)/$(appname)
  	install -m755 install/nix/$(appsrcname).am \
  		$(gamesbindir)/$(appname)
--	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
--		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
--		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
-+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
- 		-e 's,@APPNAME@,$(appname),g' \
- 		-i $(gamesbindir)/$(appname)
+ 	printf "\
+ 	g,@LIBEXECDIR@,\
+-	s,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g\n\
++	s,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g\n\
+ 	g,@DATADIR@,\
+-	s,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g\n\
++	s,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g\n\
+ 	g,@DOCDIR@,\
+-	s,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
++	s,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
+ 	g,@APPNAME@,\
+ 	s,@APPNAME@,$(appname),g\n\
+ 	w\n" | ed -s $(gamesbindir)/$(appname)
  	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
 -		$(libexecdir)/$(appname)/data
 +		$(libexecdir)/data
- 	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/game \
--		$(libexecdir)/$(appname)/game
-+		$(libexecdir)/game
  
  system-install-server: server
--	install -d $(libexecdir)/$(appname)
-+	install -d $(libexecdir)
- 	install -d $(gamesbindir)
--	install -d $(datadir)/$(appname)
-+	install -d $(datadir)
+-	$(MKDIR) $(libexecdir)/$(appname)
++	$(MKDIR) $(libexecdir)
+ 	$(MKDIR) $(gamesbindir)
+-	$(MKDIR) $(datadir)/$(appname)
++	$(MKDIR) $(datadir)
  	install -m755 $(appserver) \
 -		$(libexecdir)/$(appname)/$(appname)-server
 +		$(libexecdir)/$(appname)-server
  	install -m755 install/nix/$(appsrcname)-server.am \
  		$(gamesbindir)/$(appname)-server
--	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
--		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
--		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
-+	sed -e 's,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-+		-e 's,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-+		-e 's,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
- 		-e 's,@APPNAME@,$(appname),g' \
- 		-i $(gamesbindir)/$(appname)-server
- 	install -m644 ../$(appgamedir)/version.cfg \
+ 	printf "\
+ 	g,@LIBEXECDIR@,\
+-	s,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g\n\
++	s,@LIBEXECDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g\n\
+ 	g,@DATADIR@,\
+-	s,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g\n\
++	s,@DATADIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(datadir)),g\n\
+ 	g,@DOCDIR@,\
+-	s,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
++	s,@DOCDIR@/@APPNAME@,$(patsubst $(DESTDIR)%,%,$(docdir)),g\n\
+ 	g,@APPNAME@,\
+ 	s,@APPNAME@,$(appname),g\n\
+ 	w\n" | ed -s $(gamesbindir)/$(appname)-server
+-	install -m644 ../config/version.cfg \
 -		$(datadir)/$(appname)/version.cfg
-+		$(datadir)/version.cfg
+ 	ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/version.cfg \
+-		$(libexecdir)/$(appname)/version.cfg
++		$(libexecdir)/version.cfg
  
  system-install-data:
--	install -d $(datadir)/$(appname)
--	install -d $(datadir)/$(appname)/game
 -	cp -r ../data $(datadir)/$(appname)/data
--	cp -r ../$(appgamedir) $(datadir)/$(appname)/game
-+	install -d $(datadir)
-+	install -d $(datadir)/game
+-	rm -f $(datadir)/$(appname)/data/misc/largeandincharge.png
 +	cp -r ../data $(datadir)/data
-+	cp -r ../$(appgamedir) $(datadir)/game
++	rm -f $(datadir)/data/misc/largeandincharge.png
++
++system-install-config:
++	cp -r ../config $(datadir)/config
  
  system-install-docs: $(MANPAGES)
- 	install	-d $(mandir)/man6
- 	install -d $(docdir)/$(appname)
+ 	$(MKDIR) $(mandir)/man6
+ 	$(MKDIR) $(docdir)/$(appname)
 -	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
 -		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
 -		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
@@ -128,11 +136,11 @@
 +	cp ../doc/guidelines.txt $(docdir)/guidelines.txt
  
  system-install-menus: icons
- 	install -d $(menudir)
-@@ -119,9 +119,9 @@
- 	install -d $(icondir)/64x64/apps
- 	install -d $(icondir)/128x128/apps
- 	install -d $(pixmapdir)
+ 	$(MKDIR) $(menudir)
+@@ -126,9 +127,9 @@
+ 	$(MKDIR) $(icondir)/64x64/apps
+ 	$(MKDIR) $(icondir)/128x128/apps
+ 	$(MKDIR) $(pixmapdir)
 -	sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
 -		-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
 -		-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
@@ -142,3 +150,12 @@
  		-e 's,@APPNAME@,$(appname),g' \
  		install/nix/$(appsrcname).desktop.am > \
  		$(menudir)/$(appname).desktop
+@@ -154,7 +155,7 @@
+ 	gzip -9 -n -c < ../doc/man/cube2font.1 \
+ 		> $(mandir)/man1/cube2font.1.gz
+ 
+-system-install: system-install-client system-install-server system-install-data system-install-docs system-install-menus
++system-install: system-install-client system-install-server system-install-config system-install-data system-install-docs system-install-menus
+ 
+ system-uninstall-client:
+ 	@rm -fv $(libexecdir)/$(appname)/$(appname)
diff --git a/games/redeclipse/redeclipse.SlackBuild b/games/redeclipse/redeclipse.SlackBuild
index 38d02faf6fbc6..0de07f6c4b8b5 100644
--- a/games/redeclipse/redeclipse.SlackBuild
+++ b/games/redeclipse/redeclipse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Red Eclipse
 
-# Copyright 2013 Erik Falor USA
+# Copyright 2015 Erik Falor USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=redeclipse
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.5}
+SRCVER="7e7aba44e58a90f256321e5a7cb4879b"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,14 +61,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}_nix.tar.bz2
+tar xvf $CWD/${PRGNAM}_${VERSION}_nix.tar.bz2 || tar xvf $CWD/$SRCVER
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # remove the pre-built binaries
 rm -rf bin/*
diff --git a/games/redeclipse/redeclipse.info b/games/redeclipse/redeclipse.info
index 29a7d4f396e04..507f3f1feb761 100644
--- a/games/redeclipse/redeclipse.info
+++ b/games/redeclipse/redeclipse.info
@@ -1,8 +1,8 @@
 PRGNAM="redeclipse"
-VERSION="1.4"
+VERSION="1.5"
 HOMEPAGE="http://www.redeclipse.net"
-DOWNLOAD="http://downloads.sourceforge.net/redeclipse/redeclipse_1.4_nix.tar.bz2"
-MD5SUM="3d478f5cf4838adcf5cde8d3421f2ffe"
+DOWNLOAD="http://www.indiedb.com/downloads/mirror/82335/101/7e7aba44e58a90f256321e5a7cb4879b"
+MD5SUM="7c0f211630225923166eefa6c1778241"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""