Attachment 154541 Details for Bug 197433 – games_lgeneral.diff

[patch] games_lgeneral.diff

games_lgeneral.diff (text/plain), 3.90 KB, created by tkato432 on 2015-03-19 21:30:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-03-19 21:30:06 UTC

Size: 3.90 KB

patch

obsolete

>diff -urN /usr/ports/games/lgeneral/Makefile games/lgeneral/Makefile
>--- /usr/ports/games/lgeneral/Makefile	2015-03-07 05:01:52.310025000 +0900
>+++ games/lgeneral/Makefile	2015-03-20 06:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/games/lgeneral/Makefile 380601 2015-03-06 13:38:02Z lme $
> 
> PORTNAME=	lgeneral
>-PORTVERSION=	1.2.5
>+PORTVERSION=	1.2.6
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME} \
> 		SF/${PORTNAME}/${PORTNAME}-data:data
>@@ -12,55 +12,39 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Turn-based strategy engine inspired by Panzer General
> 
>-LICENSE=	GPLv2 # or later
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE=	GPLv2
> 
>-USE_SDL=	sdl
> USES=		gmake
>-GNU_CONFIGURE=	yes
> USE_CSTD=	gnu89
>+USE_SDL=	sdl
>+GNU_CONFIGURE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=	SOUND NLS DOCS
>-OPTIONS_DEFAULT=	SOUND
>-SOUND_DESC=	Enable sound support
>+BROKEN_powerpc=	Does not install on ${ARCH}
>+BROKEN_sparc64=	Does not install on ${ARCH}
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=		DOCS NLS SOUND
>+OPTIONS_DEFAULT=	SOUND
>+OPTIONS_SUB=		yes
> 
>-.if ${PORT_OPTIONS:MSOUND}
>-USE_SDL+=	mixer
>-.else
>-CONFIGURE_ARGS+=--disable-sound
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-.else
>-CONFIGURE_ENV+=	am_cv_func_iconv=no
>-CONFIGURE_ARGS+=--disable-nls
>-PLIST_SUB+=	NLS="@comment "
>-.endif
>-
>-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
>-BROKEN=		Does not install on ia64, powerpc, or sparc64
>-.endif
>+NLS_USES=		gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+NLS_CONFIGURE_ENV_OFF=	am_cv_func_iconv=no
>+SOUND_USE=		sdl=mixer
>+SOUND_CONFIGURE_ENABLE=	sound
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/icons|/pixmaps|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's|/icons.*|/pixmaps|' ${WRKSRC}/Makefile.in
> 
> post-install:
>-	${MKDIR} ${STAGEDIR}${DATADIR}/gfx/flags
>-	${MKDIR} ${STAGEDIR}${DATADIR}/gfx/units/
>-	${MKDIR} ${STAGEDIR}${DATADIR}/gfx/terrain/pg/
>-	${STAGEDIR}${PREFIX}/bin/lgc-pg -s ${WRKDIR}/pg-data -d ${STAGEDIR}${DATADIR}
>-	@${FIND} ${STAGEDIR}${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx
>-	@${FIND} ${STAGEDIR}${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
>-.if ${PORT_OPTIONS:MDOCS}
>+.for i in flags terrain units
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/gfx/${i}
>+.endfor
>+	(${STAGEDIR}${PREFIX}/bin/lgc-pg -s ${WRKDIR}/pg-data \
>+		-d ${STAGEDIR}${DATADIR})
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR}
>-.endif
>+	(cd ${WRKSRC} && ${INSTALL_DATA} README.* ${STAGEDIR}${DOCSDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/lgeneral/distinfo games/lgeneral/distinfo
>--- /usr/ports/games/lgeneral/distinfo	2015-03-07 05:01:52.310952000 +0900
>+++ games/lgeneral/distinfo	2015-03-20 06:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>-SHA256 (lgeneral-1.2.5.tar.gz) = 1df5a730820699a3244b626e51ef1d84f7fa3e3868a202da83b21dd8c1c6c90d
>-SIZE (lgeneral-1.2.5.tar.gz) = 1684984
>+SHA256 (lgeneral-1.2.6.tar.gz) = be85d63b718475dfc2ff48ac30e70fa020cac169e8b11bbd229cd2f4fe2570b4
>+SIZE (lgeneral-1.2.6.tar.gz) = 1676266
> SHA256 (pg-data.tar.gz) = cc6fa5d263d1d5824d706517958b1bb09b405ba0ed21e63e4a4d38e2727d7a04
> SIZE (pg-data.tar.gz) = 410476
>diff -urN /usr/ports/games/lgeneral/pkg-plist games/lgeneral/pkg-plist
>--- /usr/ports/games/lgeneral/pkg-plist	2015-03-07 05:01:52.308844000 +0900
>+++ games/lgeneral/pkg-plist	2015-03-20 06:00:00.000000000 +0900
>@@ -21,7 +21,6 @@
> %%DATADIR%%/convdata/grid.bmp
> %%DATADIR%%/convdata/guard.bmp
> %%DATADIR%%/convdata/leg.wav
>-%%DATADIR%%/convdata/mapnames
> %%DATADIR%%/convdata/move.bmp
> %%DATADIR%%/convdata/reinf
> %%DATADIR%%/convdata/sea.wav
>@@ -217,7 +216,7 @@
> %%NLS%%share/locale/de/LC_MESSAGES/pg.mo
> %%NLS%%share/locale/en/LC_MESSAGES/lgeneral.mo
> %%NLS%%share/locale/en/LC_MESSAGES/pg.mo
>-share/pixmaps/lgeneral48.png
>-@dir %%DATADIR%%/ai_modules
>-@dir %%DATADIR%%/music
>+share/pixmaps/lgeneral.png
> @dir %%DATADIR%%/terrain
>+@dir %%DATADIR%%/music
>+@dir %%DATADIR%%/ai_modules

Actions: View | Diff

Attachments on bug 197433: 152732 | 153705 | 154541