diff -urN /usr/ports/games/lgeneral/Makefile games/lgeneral/Makefile --- /usr/ports/games/lgeneral/Makefile 2014-12-09 05:00:32.000000000 +0900 +++ games/lgeneral/Makefile 2015-03-03 18:00:00.000000000 +0900 @@ -2,8 +2,7 @@ # $FreeBSD: head/games/lgeneral/Makefile 374303 2014-12-08 16:48:38Z tijl $ PORTNAME= lgeneral -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.2.5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME} \ SF/${PORTNAME}/${PORTNAME}-data:data @@ -13,52 +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 +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 post-install: - ${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 diff -urN /usr/ports/games/lgeneral/distinfo games/lgeneral/distinfo --- /usr/ports/games/lgeneral/distinfo 2014-06-21 17:44:26.000000000 +0900 +++ games/lgeneral/distinfo 2015-03-03 18:00:00.000000000 +0900 @@ -1,4 +1,4 @@ -SHA256 (lgeneral-1.2.3.tar.gz) = 55d17bb173c956c705b94bc8a6399d5311b3ec82c9f1821a97fe9ec45da0d9a1 -SIZE (lgeneral-1.2.3.tar.gz) = 1630400 +SHA256 (lgeneral-1.2.5.tar.gz) = 1df5a730820699a3244b626e51ef1d84f7fa3e3868a202da83b21dd8c1c6c90d +SIZE (lgeneral-1.2.5.tar.gz) = 1684984 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 2014-11-29 01:19:35.000000000 +0900 +++ games/lgeneral/pkg-plist 2015-03-03 18:00:00.000000000 +0900 @@ -24,7 +24,6 @@ %%DATADIR%%/convdata/mapnames %%DATADIR%%/convdata/move.bmp %%DATADIR%%/convdata/reinf -%%DATADIR%%/convdata/road2.bmp %%DATADIR%%/convdata/sea.wav %%DATADIR%%/convdata/select.wav %%DATADIR%%/convdata/select_frame.bmp @@ -37,6 +36,9 @@ %%DATADIR%%/gfx/terrain/pg/airfield.bmp %%DATADIR%%/gfx/terrain/pg/airfield_rain.bmp %%DATADIR%%/gfx/terrain/pg/airfield_snow.bmp +%%DATADIR%%/gfx/terrain/pg/bridge.bmp +%%DATADIR%%/gfx/terrain/pg/bridge_rain.bmp +%%DATADIR%%/gfx/terrain/pg/bridge_snow.bmp %%DATADIR%%/gfx/terrain/pg/clear.bmp %%DATADIR%%/gfx/terrain/pg/clear_rain.bmp %%DATADIR%%/gfx/terrain/pg/clear_snow.bmp