From fc56d228aaf2f0b09d35500e8dd0fd13027f3667 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 14 Jul 2020 20:27:13 +0000
Subject: [PATCH] - Update to 1.04

---
 games/sdl-ball/Makefile             | 12 +++++-------
 games/sdl-ball/distinfo             |  6 +++---
 games/sdl-ball/files/patch-Makefile | 27 ---------------------------
 games/sdl-ball/files/patch-main.cpp | 11 -----------
 games/sdl-ball/files/patch-menu.cpp | 11 -----------
 5 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 games/sdl-ball/files/patch-Makefile
 delete mode 100644 games/sdl-ball/files/patch-main.cpp
 delete mode 100644 games/sdl-ball/files/patch-menu.cpp

diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile
index 856412fdca71..d07ca7fa1794 100644
--- a/games/sdl-ball/Makefile
+++ b/games/sdl-ball/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	sdl-ball
-PORTVERSION=	1.03
-PORTREVISION=	1
+PORTVERSION=	1.04
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTNAME=	SDL-Ball_${PORTVERSION}_build-6_src
+DISTNAME=	SDL-Ball_${PORTVERSION}_src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Arkanoid/Breakout clone with pretty graphics
@@ -14,13 +13,12 @@ COMMENT=	Arkanoid/Breakout clone with pretty graphics
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-WRKSRC=		${WRKDIR}/SDL-Ball_source_build_0006_src
-
-USES=		dos2unix gl gmake sdl tar:xz
+USES=		gl gmake sdl tar:xz
 USE_SDL=	sdl mixer image ttf
 USE_GL=		gl glu
 MAKE_ENV=	DATADIR=${DATADIR}/
-DOS2UNIX_FILES=	main.cpp menu.cpp
+
+WRKSRC=		${WRKDIR}/SDL-Ball_src
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \
diff --git a/games/sdl-ball/distinfo b/games/sdl-ball/distinfo
index 95b0da356f7f..2a90a45e89be 100644
--- a/games/sdl-ball/distinfo
+++ b/games/sdl-ball/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491830927
-SHA256 (SDL-Ball_1.03_build-6_src.tar.xz) = 6910a7166d16e3bfe4a67b538d02e25eec0d06276aef399b9143fd246cd76442
-SIZE (SDL-Ball_1.03_build-6_src.tar.xz) = 4760328
+TIMESTAMP = 1594756788
+SHA256 (SDL-Ball_1.04_src.tar.xz) = 2aff75f892f768b1008fa36608ba4579beb1c3b212fe94b9b10fb14f9bb21a47
+SIZE (SDL-Ball_1.04_src.tar.xz) = 4342304
diff --git a/games/sdl-ball/files/patch-Makefile b/games/sdl-ball/files/patch-Makefile
deleted file mode 100644
index 2313baf90f69..000000000000
--- a/games/sdl-ball/files/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	2016-08-25 16:21:38 UTC
-+++ Makefile
-@@ -2,9 +2,9 @@ DATADIR?=themes/
- 
- #append -DWITH_WIIUSE to compile with WIIUSE support!
- #append -DNOSOUND to compile WITHOUT sound support
--CC=g++ -DDATADIR="\"$(DATADIR)\""
-+CXX?=g++
- 
--CFLAGS+=-c -Wall `sdl-config --cflags`
-+CXXFLAGS+=-Wall `sdl-config --cflags` -DDATADIR="\"$(DATADIR)\""
- 
- #append -lwiiuse to compile with WIIUSE support
- #remove -lSDL_mixer if compiling with -DNOSOUND
-@@ -18,10 +18,10 @@ EXECUTABLE=sdl-ball
- all: $(SOURCES) $(EXECUTABLE)
- 	
- $(EXECUTABLE): $(OBJECTS)
--	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+	$(CXX) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- 
- .cpp.o:
--	$(CC) $(CFLAGS) $< -o $@
-+	$(CXX) -c $(CXXFLAGS) $< -o $@
- 
- clean:
- 	rm -f *.o sdl-ball
diff --git a/games/sdl-ball/files/patch-main.cpp b/games/sdl-ball/files/patch-main.cpp
deleted file mode 100644
index 294ebcee7764..000000000000
--- a/games/sdl-ball/files/patch-main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.cpp.orig	2018-05-14 18:46:05 UTC
-+++ main.cpp
-@@ -3762,7 +3762,7 @@ int main (int argc, char *argv[]) {
- 
-   difficulty = static_difficulty;
- 
--  cout << "SDL-Ball v "VERSION << endl;
-+  cout << "SDL-Ball v " VERSION << endl;
- 
-   // default to "" (If this have a 0 len after trying to getenv, it defaults to ./)
-   privFile.programRoot = ""; 
diff --git a/games/sdl-ball/files/patch-menu.cpp b/games/sdl-ball/files/patch-menu.cpp
deleted file mode 100644
index 01c118fbbb00..000000000000
--- a/games/sdl-ball/files/patch-menu.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- menu.cpp.orig	2016-08-25 16:21:38 UTC
-+++ menu.cpp
-@@ -204,7 +204,7 @@ public:
-         switch(t)
-         {
-           case 0:
--          sprintf(highScores[t], "SDL-BALL v "VERSION );
-+          sprintf(highScores[t], "SDL-BALL v " VERSION );
-           break;
-           case 1:
-           sprintf(highScores[t], "-----------------------");