4 files changed, 30 insertions, 29 deletions

diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index ddd4332c56f4..fe6e2f2a836a 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tecnoballz
-PORTVERSION=	0.92
-PORTREVISION=	15
+PORTVERSION=	0.93.1
 CATEGORIES=	games
 MASTER_SITES=	http://linux.tlk.fr/games/TecnoballZ/download/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -11,17 +10,16 @@ MASTER_SITES=	http://linux.tlk.fr/games/TecnoballZ/download/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Brick breaker (Arkanoid-like game)
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3 # or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libogg.so:${PORTSDIR}/audio/libogg \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+		libsmpeg.so:${PORTSDIR}/multimedia/smpeg \
+		libtinyxml.so:${PORTSDIR}/textproc/tinyxml
 
-USES=		gmake tar:tgz
-USE_AUTOTOOLS=	automake aclocal
-AUTOMAKE_ARGS=	--add-missing
+USES=		autoreconf gmake tar:tgz
 USE_SDL=	sdl mixer image
 GNU_CONFIGURE=	yes
 
@@ -35,20 +33,14 @@ DESKTOP_ENTRIES="TecnoballZ" \
 		false
 
 post-patch:
-	@${FIND} ${WRKSRC}/include -name '*.h' | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|SDL/||'
-	@${REINPLACE_CMD} -e '/^CXXFLAGS=[^$$]*$$/ s|^|#|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(prefix)/games|$$(prefix)/bin|' \
-		${WRKSRC}/Makefile.am ${WRKSRC}/src/Makefile.am
-	@${REINPLACE_CMD} -e '/chmod/ d; /chown/ d' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|supervisor.c|&c|' ${WRKSRC}/src/Makefile.am
+	@${REINPLACE_CMD} -e '/CXXFLAGS=[^$$]*$$/ s|^|#|' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|$$(prefix)/games|$$(prefix)/bin|; \
+		/chmod/ d; /chown/ d' ${WRKSRC}/src/Makefile.am
 .for f in tecnoballz.cc tiles_background.cc sprite_ship.cc controller_magnetic_eyes.cc
 	@${REINPLACE_CMD} -e '/rand/ s|(Sint32)|(intptr_t)|' ${WRKSRC}/src/${f}
 .endfor
 
 post-install:
-	@cd ${WRKSRC}/src/TecnoballZ && ${FIND} . -name "Makefile*" -delete
-	@cd ${WRKSRC}/src/TecnoballZ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 	${MV} ${STAGEDIR}/var/games/tecnoballz/tecnoballz.hi \
 		${STAGEDIR}/var/games/tecnoballz/tecnoballz.hi.sample
 
diff --git a/games/tecnoballz/distinfo b/games/tecnoballz/distinfo
index ca600adbe1a8..a6240911a915 100644
--- a/games/tecnoballz/distinfo
+++ b/games/tecnoballz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tecnoballz-0.92.tgz) = 3ae9d084d7a65af52ef8657c2adbeda0a0747825f9b3b58b8352b7403d5b95b5
-SIZE (tecnoballz-0.92.tgz) = 2763879
+SHA256 (tecnoballz-0.93.1.tgz) = 5915bbe9efbf79713f2b0bb23a3cd33c54272b03739db22b52bcf5e1f9ef82e8
+SIZE (tecnoballz-0.93.1.tgz) = 1992279
diff --git a/games/tecnoballz/files/patch-configure.ac b/games/tecnoballz/files/patch-configure.ac
new file mode 100644
index 000000000000..0fd065f42e3d
--- /dev/null
+++ b/games/tecnoballz/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2014-09-30 14:20:26.000000000 +0400
++++ configure.ac	2014-12-04 03:31:46.000000000 +0300
+@@ -40,6 +40,8 @@
+ AC_SUBST(MIKMOD_FLAGS)
+ AC_SUBST(MIKMOD_LIBS)
+ 
++AC_LANG_PUSH([C++])
++
+ AC_CHECK_LIB([tinyxml], [main], [
+   TINYXML_LIBS="-ltinyxml"
+ ],[
+@@ -47,6 +49,8 @@
+ ])
+ AC_SUBST(TINYXML_LIBS)
+ 
++AC_LANG_POP([C++])
++
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/time.h unistd.h])
+ 
diff --git a/games/tecnoballz/files/patch-include-surface__sdl.h b/games/tecnoballz/files/patch-include-surface__sdl.h
deleted file mode 100644
index f88b4644a4e9..000000000000
--- a/games/tecnoballz/files/patch-include-surface__sdl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/surface_sdl.h.orig	2013-05-30 22:00:54.478112221 +0400
-+++ include/surface_sdl.h	2013-05-30 22:02:18.114218658 +0400
-@@ -46,7 +46,7 @@
-   ~surface_sdl ();
-   SDL_Surface* get_surface ();
-   char* get_pixel_data ();
--  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-+  char* get_pixel_data (Uint32 coord_x, Uint32 coord_y);
-   Uint32 get_row_size ();
-   Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
-   void clear (Uint32 color = 0);