Attachment 172073 Details for Bug 210791 – games_tuxmath.diff

[patch] games_tuxmath.diff

games_tuxmath.diff (text/plain), 4.25 KB, created by tkato432 on 2016-07-03 19:31:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-07-03 19:31:36 UTC

Size: 4.25 KB

patch

obsolete

>diff -urN /usr/ports/games/tuxmath/Makefile games/tuxmath/Makefile
>--- /usr/ports/games/tuxmath/Makefile	2016-06-04 03:44:58.590316000 +0900
>+++ games/tuxmath/Makefile	2016-07-04 00:00:00.000000000 +0900
>@@ -6,53 +6,45 @@
> PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	games
>-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3571/ \
>-		http://alioth.debian.org/frs/download.php/3540/:t4k_common
>-DISTFILES=	${PORTNAME}_w_fonts-${PORTVERSION}${EXTRACT_SUFX} \
>+MASTER_SITES=	DEBIAN_POOL \
>+		DEBIAN/pool/main/t/t4kcommon:t4k_common
>+DISTFILES=	${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX} \
> 		${T4K_DISTFILE}:t4k_common
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Educational arcade game starring Tux
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2016-07-04
>-
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/doc/COPYING_GPL3
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
> 
>+USES=		gmake iconv localbase perl5 pkgconfig
> USE_GNOME=	libxml2
> USE_SDL=	image mixer net pango sdl
>-USES=		iconv gmake perl5 pkgconfig
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \
> 		T4K_COMMON_LIBS="${T4K_WRKSRC}/src/.libs/libt4k_common.a" \
> 		ac_cv_lib_m_csin=yes
> 
>-CPPFLAGS+=	$$(pkg-config --cflags SDL_Pango) -I${LOCALBASE}/include \
>+CPPFLAGS+=	$$(pkg-config --cflags SDL_Pango libpng) \
> 		-DHAVE_ALPHASORT -DHAVE_SCANDIR -DHAVE_FSYNC -DICONV_CONST=""
>-LDFLAGS+=	$$(pkg-config --libs SDL_Pango) -L${LOCALBASE}/lib ${ICONV_LIB} -lpng
>+LDFLAGS+=	$$(pkg-config --libs SDL_Pango libpng) ${ICONV_LIB}
> 
> T4K_NAME=	t4k_common
> T4K_VERSION=	0.1.1
>-T4K_DISTFILE=	${T4K_NAME}-${T4K_VERSION}${EXTRACT_SUFX}
>+T4K_DISTFILE=	${T4K_NAME:S/_//}_${T4K_VERSION}.orig${EXTRACT_SUFX}
> T4K_WRKSRC=	${WRKDIR}/${T4K_NAME}-${T4K_VERSION}
> 
>-OPTIONS_DEFINE=	NLS SVG DOCS
>+OPTIONS_DEFINE=		DOCS NLS SVG
> OPTIONS_DEFAULT=	SVG
>-OPTIONS_SUB=	yes
>+OPTIONS_SUB=		yes
> 
>+NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_USES=	gettext
>-NLS_LDFLAGS=	-lintl
>-
>+NLS_LDFLAGS=		-lintl
>+SVG_USE=		gnome=librsvg2
> SVG_CONFIGURE_WITH=	rsvg
>-SVG_USE=	GNOME=librsvg2
>-
>-# use multiple make jobs for T4K_WRKSRC
>-_make_jobs=	-j${MAKE_JOBS_NUMBER}
> 
> post-extract:
> 	@${LN} -sf ${T4K_WRKSRC} ${WRKDIR}/${T4K_NAME}
>@@ -71,14 +63,15 @@
> 		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}")
> 
> pre-build:
>-	@(cd ${T4K_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
>-		${MAKEFILE} ${_make_jobs} ${ALL_TARGET})
>+	@(cd ${T4K_WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
> 
> post-install:
> 	${LN} -s ${DATADIR}/images/status ${STAGEDIR}${DATADIR}/images/menu
>+
>+post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for file in OFL README README_DATA_LICENSES TODO changelog
>-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${STAGEDIR}${DOCSDIR}
>+.for i in OFL README README_DATA_LICENSES TODO changelog
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
> .endfor
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/tuxmath/distinfo games/tuxmath/distinfo
>--- /usr/ports/games/tuxmath/distinfo	2015-08-24 04:04:29.276338000 +0900
>+++ games/tuxmath/distinfo	2016-07-04 00:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>-SHA256 (tuxmath_w_fonts-2.0.3.tar.gz) = eec49c296d41df39a6474d94ba4e3334e4c16dc180d3ea4a6defc2debfc39887
>-SIZE (tuxmath_w_fonts-2.0.3.tar.gz) = 10396696
>-SHA256 (t4k_common-0.1.1.tar.gz) = 42c155816dae2c5dad560faa50edaa1ca84536530283d37859c4b91e82675110
>-SIZE (t4k_common-0.1.1.tar.gz) = 629215
>+SHA256 (tuxmath_2.0.3.orig.tar.gz) = eec49c296d41df39a6474d94ba4e3334e4c16dc180d3ea4a6defc2debfc39887
>+SIZE (tuxmath_2.0.3.orig.tar.gz) = 10396696
>+SHA256 (t4kcommon_0.1.1.orig.tar.gz) = 42c155816dae2c5dad560faa50edaa1ca84536530283d37859c4b91e82675110
>+SIZE (t4kcommon_0.1.1.orig.tar.gz) = 629215
>diff -urN /usr/ports/games/tuxmath/files/patch-t4k_loaders.c games/tuxmath/files/patch-t4k_loaders.c
>--- /usr/ports/games/tuxmath/files/patch-t4k_loaders.c	2015-08-24 04:04:29.284540000 +0900
>+++ games/tuxmath/files/patch-t4k_loaders.c	2016-07-04 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- ../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
>+--- ../t4k_common/src/t4k_loaders.c.orig	2011-04-08 02:46:07 UTC
>++++ ../t4k_common/src/t4k_loaders.c
> @@ -1028,12 +1028,9 @@
>        {
>          png_init_io(png_ptr, fi);

Actions: View | Diff

Attachments on bug 210791: 172073