Attachment 164061 Details for Bug 205205 – games_asc.diff

[patch] games_asc.diff

games_asc.diff (text/plain), 5.06 KB, created by tkato432 on 2015-12-10 18:33:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-12-10 18:33:37 UTC

Size: 5.06 KB

patch

obsolete

>diff -urN /usr/ports/games/asc/Makefile games/asc/Makefile
>--- /usr/ports/games/asc/Makefile	2015-08-24 04:04:59.376415000 +0900
>+++ games/asc/Makefile	2015-12-11 00:00:00.000000000 +0900
>@@ -2,42 +2,36 @@
> # $FreeBSD: head/games/asc/Makefile 383834 2015-04-12 00:25:13Z amdmi3 $
> 
> PORTNAME=	asc
>-PORTVERSION=	2.6.0.0
>-PORTREVISION=	6
>+PORTVERSION=	2.6.1.0
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
> 		http://www.asc-hq.org/music/:music
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS:S/$/:music/}
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> DIST_SUBDIR=	${PORTNAME}
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Turn based, multiplayer strategic game with nice graphics
> 
>-LICENSE=	GPLv2 # or later
>+LICENSE=	GPLv2 # (or later)
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
>-RUN_DEPENDS:=	${BUILD_DEPENDS}
> LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
> 		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
>-		libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 \
>-		libexpat.so:${PORTSDIR}/textproc/expat2 \
>-		libloki.so:${PORTSDIR}/devel/loki
>-
>-OPTIONS_DEFINE=	MUSIC XVID
>-MUSIC_DESC=	Install extra music files
>+		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
>+		libloki.so:${PORTSDIR}/devel/loki \
>+		libexpat.so:${PORTSDIR}/textproc/expat2
>+RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		compiler:c++11-lib gmake libtool lua:51 perl5 pkgconfig tar:bzip2
>+USES=		compiler:c++11-lib gmake libtool lua perl5 pkgconfig tar:bzip2 
> USE_CXXSTD=	c++11
>+USE_PERL5=	build
> USE_SDL=	image mixer sound sdl
> USE_WX=		3.0
>-WX_UNICODE=	yes
> WX_CONF_ARGS=	absolute
>-USE_PERL5=	build
> GNU_CONFIGURE=	yes
> 
>-CFLAGS+=	-D_UNICODE_BROKEN_
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>@@ -51,38 +45,38 @@
> 		man/man6/asc_mapedit.6.gz \
> 		man/man6/asc_mount.6.gz \
> 		man/man6/asc_weaponguide.6.gz \
>-		share/appdata/asc.appdata.xml
>-PORTDATA=	*
>+		share/appdata/asc.appdata.xml \
>+		%%DATADIR%%/asc2_dlg.zip \
>+		%%DATADIR%%/main.ascdat
> 
> DESKTOP_ENTRIES="Advanced Strategic Command" "Turn based strategic game" "" \
> 		"${PORTNAME}" "" ""
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=		MUSIC XVID
> 
>-.if ${PORT_OPTIONS:MXVID}
>-LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
>-.else
>-CONFIGURE_ENV+=	ac_cv_lib_xvidcore_xvid_encore=no
>-.endif
>-
>-.if ${PORT_OPTIONS:MMUSIC}
>-ASC_MUSICS=	frontiers.ogg time_to_strike.ogg machine_wars.ogg
>-
>-post-extract:
>-.for i in ${ASC_MUSICS}
>-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/data/music
>-.endfor
>-.endif
>+MUSIC_DESC=		Install extra music files
>+MUSIC_DISTFILES=	${ASC_MUSICS:S,$,:music,}
>+MUSIC_PLIST_FILES=	${ASC_MUSICS:S,^,%%DATADIR%%/music/,}
>+XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
>+XVID_CONFIGURE_ENV_OFF=	ac_cv_lib_xvidcore_xvid_encore=no
>+
>+ASC_MUSICS=		frontiers.ogg time_to_strike.ogg machine_wars.ogg
>+
>+post-extract-MUSIC-on:
>+	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw ${ASC_MUSICS} \
>+		${WRKSRC}/data/music)
> 
> post-patch:
> 	@${FIND} ${WRKSRC} -name "Makefile.in" -print0 | ${XARGS} -0 \
> 		${REINPLACE_CMD} -e \
> 		's|/games/|/|g'
> 	@${REINPLACE_CMD} -e \
>-		's|/games/|/|g ; \
>-		 s|lua >=|lua-5.1 >=|g ; \
>+		's|lua >= 5.1 |lua-${LUA_VER}|g ; \
>+		 s|/games/|/|g ; \
> 		 /if test/s|==|=|g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e \
> 		's|? 0 :|? (void)0 :|' ${WRKSRC}/source/errors.h
>+	@${REINPLACE_CMD} -e \
>+		's|tAttackH|AttackH|' ${WRKSRC}/source/actions/vehicleattack.h
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/asc/distinfo games/asc/distinfo
>--- /usr/ports/games/asc/distinfo	2015-08-24 04:04:59.322659000 +0900
>+++ games/asc/distinfo	2015-12-11 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>-SHA256 (asc/asc-2.6.0.0.tar.bz2) = e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb
>-SIZE (asc/asc-2.6.0.0.tar.bz2) = 42280527
>+SHA256 (asc/asc-2.6.1.0.tar.bz2) = 9a1e58e73ba8fdf5d5ac85cdb66804bf688dce2940a8a9c26796de6b6d4f8ddb
>+SIZE (asc/asc-2.6.1.0.tar.bz2) = 42569531
> SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff
> SIZE (asc/frontiers.ogg) = 4691844
> SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05
>diff -urN /usr/ports/games/asc/files/patch-source_libs_paragui_src_widgets_pgbutton.cpp games/asc/files/patch-source_libs_paragui_src_widgets_pgbutton.cpp
>--- /usr/ports/games/asc/files/patch-source_libs_paragui_src_widgets_pgbutton.cpp	2015-08-24 04:04:59.340084000 +0900
>+++ games/asc/files/patch-source_libs_paragui_src_widgets_pgbutton.cpp	2015-12-11 00:00:00.000000000 +0900
>@@ -1,7 +1,6 @@
>---- source/libs/paragui/src/widgets/pgbutton.cpp.orig	2015-04-11 02:43:58.716405000 +0300
>-+++ source/libs/paragui/src/widgets/pgbutton.cpp	2015-04-11 02:44:38.509415000 +0300
>-@@ -101,32 +101,32 @@
>- 	t->GetColor(widgettype, objectname, PG_PropStr::textcolor, fontcolor);
>+--- source/libs/paragui/src/widgets/pgbutton.cpp.orig	2015-11-29 10:40:16 UTC
>++++ source/libs/paragui/src/widgets/pgbutton.cpp
>+@@ -102,31 +102,31 @@ void PG_Button::LoadThemeStyle(const std
>  	SetFontColor(fontcolor);
>  
>  	switch (GetID()) {

Actions: View | Diff

Attachments on bug 205205: 164061