ports/115332: [MAINTAINER] games/untahris: update to 2.0

[Dmitry Marakasov]

>Number:         115332
>Category:       ports
>Synopsis:       [MAINTAINER] games/untahris: update to 2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 08 23:40:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
* Update to 2.0
>How-To-Repeat:
>Fix:

--- untahris-2.0.patch begins here ---
diff -ruN untahris.orig/Makefile untahris/Makefile
--- untahris.orig/Makefile	Thu Aug  9 02:40:46 2007
+++ untahris/Makefile	Thu Aug  9 03:34:44 2007
@@ -6,44 +6,39 @@
 #
 
 PORTNAME=	untahris
-DISTVERSION=	1.0beta
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${DISTVERSION}-src
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	amdmi3 at amdmi3.ru
 COMMENT=	Play several classic fun, simple arcade games in multiplayer mode
 
-USE_SDL=	sdl net ttf
-USE_GCC=	3.4+
+USE_SDL=	sdl net ttf mixer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-PLIST_FILES=	bin/untahris %%DATADIR%%/VeraBd.ttf %%DATADIR%%/graph16.unt
-PLIST_DIRS=	%%DATADIR%%
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile on 4.x
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|verabd.ttf|${DATADIR}/VeraBd.ttf|; \
-		s|graph%d|${DATADIR}/graph%d|' ${WRKSRC}/intface.cpp
+	@${REINPLACE_CMD} -e 's|VeraBd.ttf|${DATADIR}/VeraBd.ttf|; \
+		s|graph%d|${DATADIR}/&|; s|[a-z]*\.wav|${DATADIR}/&|' \
+		${WRKSRC}/intface.cpp
 	@${REINPLACE_CMD} -e 's|TPlayground::||' ${WRKSRC}/untahris.h
 
 do-build:
 	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} `${SDL_CONFIG} --libs --cflags` \
-		-lSDL_net -lSDL_ttf untahris.cpp -o untahris
+		-lSDL_net -lSDL_ttf -lSDL_mixer untahris.cpp -o untahris
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/untahris ${PREFIX}/bin
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/VeraBd.ttf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/graph16.unt ${DATADIR}
+.for f in VeraBd.ttf graph16.unt *.wav
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
+.endfor
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff -ruN untahris.orig/distinfo untahris/distinfo
--- untahris.orig/distinfo	Thu Aug  9 02:40:46 2007
+++ untahris/distinfo	Thu Aug  9 02:42:48 2007
@@ -1,3 +1,3 @@
-MD5 (untahris-1.0beta-src.tgz) = 567f6b203dc8b7efb26ec7f9eae08fe0
-SHA256 (untahris-1.0beta-src.tgz) = 9c1067c9edb64fce5e23c11de34fe20ed6591e3048388fec89e921f9e350d0a5
-SIZE (untahris-1.0beta-src.tgz) = 70050
+MD5 (untahris-2.0-src.tgz) = 85af8afdbff12f347ec60f2d50fb899c
+SHA256 (untahris-2.0-src.tgz) = a1fbe980d2a4842c492bb23878ccaf2e6aa4fa9e46fde209306990942d89b17f
+SIZE (untahris-2.0-src.tgz) = 1102921
diff -ruN untahris.orig/files/patch-intface.cpp untahris/files/patch-intface.cpp
--- untahris.orig/files/patch-intface.cpp	Thu Aug  9 02:40:46 2007
+++ untahris/files/patch-intface.cpp	Thu Aug  9 03:04:33 2007
@@ -1,9 +1,18 @@
---- intface.cpp.orig	Mon Sep  4 19:16:15 2006
-+++ intface.cpp	Fri Sep  8 06:57:45 2006
-@@ -517,7 +517,7 @@
-       thruster.pixel[y][x] = 'P';
+--- intface.cpp.orig	Wed May  2 02:41:32 2007
++++ intface.cpp	Thu Aug  9 03:04:09 2007
+@@ -45,7 +45,7 @@
+     SDL_Quit();
      }
-   
+ 
+-  if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 8000) != 0)
++  if (Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 8192) != 0)
+     printf("Failed to initialize audio.\n");
+   else {
+     Mix_AllocateChannels(16);
+@@ -653,7 +653,7 @@
+   Ic(icBazooka).fillWith("0", d.Res);
+   Ic(icBazooka).gradFill(d.Res*4/8-1, 0, d.Res*4/8, d.Res*3/4, 0x80FFFFFF, 0xFFFFFFFF);
+ 
 -  char buf[64];
 +  char buf[1024];
    sprintf(buf, "graph%d.unt", d.Res);
diff -ruN untahris.orig/pkg-message untahris/pkg-message
--- untahris.orig/pkg-message	Thu Jan  1 03:00:00 1970
+++ untahris/pkg-message	Thu Aug  9 03:29:38 2007
@@ -0,0 +1,5 @@
+ATTENTION!
+
+If, after being updated to version > 1.0, the game hangs after
+pressing <ENTER> in the main menu, please delete ~/.untahris.config
+file and restart the game.
diff -ruN untahris.orig/pkg-plist untahris/pkg-plist
--- untahris.orig/pkg-plist	Thu Jan  1 03:00:00 1970
+++ untahris/pkg-plist	Thu Aug  9 02:53:09 2007
@@ -0,0 +1,12 @@
+bin/untahris
+%%DATADIR%%/VeraBd.ttf
+%%DATADIR%%/birth.wav
+%%DATADIR%%/blue.wav
+%%DATADIR%%/death.wav
+%%DATADIR%%/graph16.unt
+%%DATADIR%%/green.wav
+%%DATADIR%%/hit.wav
+%%DATADIR%%/place.wav
+%%DATADIR%%/red.wav
+%%DATADIR%%/shoot.wav
+ at dirrm %%DATADIR%%
--- untahris-2.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: