svn commit: r301171 - in head/games/tuxmath: . files

[Armin Pirkovitsch]

Author: sperber
Date: Thu Jul 19 17:33:43 2012
New Revision: 301171
URL: http://svn.freebsd.org/changeset/ports/301171

Log:
  - Fix build
  - Remove trailing spaces
  
  PR:           ports/169415
  Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
  Approved by:  beat (mentor)

Added:
  head/games/tuxmath/files/
  head/games/tuxmath/files/patch-t4k_loaders.c   (contents, props changed)
Modified:
  head/games/tuxmath/Makefile   (contents, props changed)

Modified: head/games/tuxmath/Makefile
==============================================================================
--- head/games/tuxmath/Makefile	Thu Jul 19 17:29:30 2012	(r301170)
+++ head/games/tuxmath/Makefile	Thu Jul 19 17:33:43 2012	(r301171)
@@ -20,8 +20,6 @@ COMMENT=	Educational arcade game starrin
 
 LICENSE=	GPLv3 # (or later)
 
-BROKEN=		does not compile
-
 OPTIONS_DEFINE=	NLS SVG DOCS
 OPTIONS_DEFAULT=	SVG
 
@@ -39,7 +37,7 @@ CONFIGURE_ENV=	T4K_COMMON_CFLAGS="-I${T4
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	$$(pkg-config --cflags SDL_Pango) -I${LOCALBASE}/include \
-		-DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST="" 
+		-DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST=""
 LDFLAGS+=	$$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib
 
 T4K_NAME=	t4k_common
@@ -50,6 +48,7 @@ T4K_WRKSRC=	${WRKDIR}/${T4K_NAME}-${T4K_
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls

Added: head/games/tuxmath/files/patch-t4k_loaders.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/tuxmath/files/patch-t4k_loaders.c	Thu Jul 19 17:33:43 2012	(r301171)
@@ -0,0 +1,18 @@
+--- ../t4k_common/src/t4k_loaders.c.orig	2011-04-08 11:46:07.000000000 +0900
++++ ../t4k_common/src/t4k_loaders.c	2012-06-17 18:57:09.000000000 +0900
+@@ -1028,12 +1028,9 @@
+       {
+         png_init_io(png_ptr, fi);
+ 
+-        info_ptr->width = surf->w;
+-        info_ptr->height = surf->h;
+-        info_ptr->bit_depth = 8;
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-        info_ptr->interlace_type = 1;
+-        info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8,
++                       PNG_COLOR_TYPE_RGB_ALPHA, 1,
++                       PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+         png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+                        PNG_sRGB_INTENT_PERCEPTUAL);