- Update to 3.1

6 files changed, 32 insertions, 44 deletions

diff --git a/games/untahris/Makefile b/games/untahris/Makefile
index e9ebd4623629..1651df5559ac 100644
--- a/games/untahris/Makefile
+++ b/games/untahris/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	untahris
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	3.1
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Play several classic fun, simple arcade games in multiplayer mode
 
 USE_SDL=	sdl net ttf mixer
+PORTDOCS=	*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -26,20 +25,20 @@ post-patch:
 	@${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 -lSDL_mixer untahris.cpp -o untahris
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/untahris ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/untahris ${PREFIX}/bin/
 	${MKDIR} ${DATADIR}
-.for f in VeraBd.ttf graph16.unt *.wav
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
+.for f in VeraBd.ttf graph16*.unt *.wav
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/
 .endfor
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}/
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/untahris/distinfo b/games/untahris/distinfo
index 44a52d1795e2..524ae86ff9bb 100644
--- a/games/untahris/distinfo
+++ b/games/untahris/distinfo
@@ -1,3 +1,3 @@
-MD5 (untahris-2.0-src.tgz) = 85af8afdbff12f347ec60f2d50fb899c
-SHA256 (untahris-2.0-src.tgz) = a1fbe980d2a4842c492bb23878ccaf2e6aa4fa9e46fde209306990942d89b17f
-SIZE (untahris-2.0-src.tgz) = 1102921
+MD5 (untahris-3.1-src.tgz) = 0526dd88cc83aafae85901d8d4fbbff7
+SHA256 (untahris-3.1-src.tgz) = 95f062a7bfd911a1d2216377eded5b2387af0dcc9c463c117f0220e03ab289f3
+SIZE (untahris-3.1-src.tgz) = 669518
diff --git a/games/untahris/files/patch-intface.cpp b/games/untahris/files/patch-intface.cpp
index 3b01833106c4..83c93315ab1e 100644
--- a/games/untahris/files/patch-intface.cpp
+++ b/games/untahris/files/patch-intface.cpp
@@ -1,20 +1,11 @@
---- 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);
-   FILE *f = fopen(buf, "rt");
-   if(f) {
+--- intface.cpp.orig	2009-05-20 01:41:32.000000000 +0400
++++ intface.cpp	2009-07-07 17:38:01.000000000 +0400
+@@ -834,7 +834,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%s.unt", d.Res, gtNames[c.graphicsType]);

+   FILE *f = fopen(buf, "rt");

+   if(f) {

diff --git a/games/untahris/files/patch-untahris.cpp b/games/untahris/files/patch-untahris.cpp
index 01b2da071e96..e24ee2ac2dce 100644
--- a/games/untahris/files/patch-untahris.cpp
+++ b/games/untahris/files/patch-untahris.cpp
@@ -1,5 +1,5 @@
---- untahris.cpp.orig	Tue Sep  5 16:50:04 2006
-+++ untahris.cpp	Fri Sep  8 06:54:50 2006
+--- untahris.cpp.orig	2009-05-20 01:54:16.000000000 +0400
++++ untahris.cpp	2009-07-07 17:39:06.000000000 +0400
 @@ -6,7 +6,7 @@
  
  #include "untahris.h"
@@ -9,11 +9,12 @@
  
  #include "tools.cpp"
  #include "intface.cpp"
-@@ -117,6 +117,7 @@
+@@ -291,6 +291,8 @@
    }
  
  int main(int argc, char **argv) {
-+	chdir(getenv("HOME"));
++  chdir(getenv("HOME"));
++
    g.sizeX = 0;
    g.sizeY = 0;
    d.ofsX = 0;
diff --git a/games/untahris/pkg-message b/games/untahris/pkg-message
deleted file mode 100644
index 3c7388da4b05..000000000000
--- a/games/untahris/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-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 --git a/games/untahris/pkg-plist b/games/untahris/pkg-plist
index 69f761701113..bb13b2ad853a 100644
--- a/games/untahris/pkg-plist
+++ b/games/untahris/pkg-plist
@@ -3,7 +3,9 @@ bin/untahris
 %%DATADIR%%/birth.wav
 %%DATADIR%%/blue.wav
 %%DATADIR%%/death.wav
-%%DATADIR%%/graph16.unt
+%%DATADIR%%/graph16gradient.unt
+%%DATADIR%%/graph16lines.unt
+%%DATADIR%%/graph16retro.unt
 %%DATADIR%%/green.wav
 %%DATADIR%%/hit.wav
 %%DATADIR%%/place.wav