Attachment 223915 Details for Bug 254801 – Revised patch

[patch] Revised patch

exult_update_1.7.0.diff (text/plain), 7.76 KB, created by Gian-Simon Purkert on 2021-04-08 10:03:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gian-Simon Purkert

Created: 2021-04-08 10:03:00 UTC

Size: 7.76 KB

patch

obsolete

>diff -ruN /usr/ports/games/exult/Makefile ./exult/Makefile
>--- /usr/ports/games/exult/Makefile	2021-04-06 17:02:47.303779000 +0200
>+++ ./exult/Makefile	2021-04-08 11:56:12.722937000 +0200
>@@ -1,8 +1,8 @@
> # Created by: Igor Pokrovsky <tiamat@telegraph.spb.ru>
>+# $FreeBSD: head/games/exult/Makefile 517046 2019-11-08 10:47:01Z tobik $
> 
> PORTNAME=	exult
>-PORTVERSION=	1.5.0.20160514
>-PORTREVISION=	9
>+PORTVERSION=	1.7.0.20210405
> CATEGORIES=	games
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -12,50 +12,43 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
>-		libpng.so:graphics/png
>+		libpng.so:graphics/png \
>+		libogg.so:audio/libogg \
>+		libfreetype.so:print/freetype2
> 
>+USES=		autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig \
>+		xorg sdl
>+
> USE_GITHUB=	yes
>-GH_TAGNAME=	b15afba
>+GH_TAGNAME=	6150ae4
> 
>-USES=		autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig \
>-		xorg
>-USE_CXXSTD=	c++98
>-USE_XORG=	xext
>+USE_CXXSTD=	c++17
>+USE_XORG=	x11 xext
>+USE_SDL=	mixer2
>+USE_GNOME=	gtk30 cairo gdkpixbuf2
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-alsa \
>+CONFIGURE_ARGS=	--disable-alsa --with-sdl=sdl2 \
> 		--with-icondir=${PREFIX}/share/pixmaps
> SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=		DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER
>-OPTIONS_SINGLE=		SDL
>-OPTIONS_SINGLE_SDL=	SDL1 SDL2
>-OPTIONS_DEFAULT=	SDL1 STUDIO
>+OPTIONS_DEFAULT=	STUDIO
> OPTIONS_SUB=		yes
> 
> FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
>-FLUIDSYNTH_CONFIGURE_ENABLE=\
>-			fluidsynth
>+FLUIDSYNTH_CONFIGURE_ENABLE=	fluidsynth
> GIMP_DESC=		GIMP plugin support
> GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
> GIMP_CONFIGURE_ENABLE=	gimp-plugin
>-SDL1_DESC=		Simple Direct Media Layer 1 support
>-SDL1_USES=		sdl
>-SDL1_USE=		sdl=mixer
>-SDL1_CONFIGURE_ON=	--with-sdl=sdl12
>-SDL2_DESC=		Simple Direct Media Layer 2 support
>-SDL2_USES=		sdl
>-SDL2_USE=		sdl=mixer2
>-SDL2_CONFIGURE_ON=	--with-sdl=sdl2
>+
> STUDIO_DESC=		Install Exult Studio
>-STUDIO_CONFIGURE_ENABLE=\
>-			exult-studio exult-studio-support
>+STUDIO_CONFIGURE_ENABLE=	exult-studio exult-studio-support
> STUDIO_USES=		gnome
> STUDIO_USE=		gnome=libglade2
> THUMBNAILER_DESC=	Gnome SHP thumbnailer support
> THUMBNAILER_USES=	gnome shared-mime-info
> THUMBNAILER_USE=	gnome=libgnomeui
>-THUMBNAILER_CONFIGURE_ENABLE=\
>-			gnome-shp-thumbnailer
>+THUMBNAILER_CONFIGURE_ENABLE=	gnome-shp-thumbnailer
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff -ruN /usr/ports/games/exult/distinfo ./exult/distinfo
>--- /usr/ports/games/exult/distinfo	2021-04-06 15:51:49.846613000 +0200
>+++ ./exult/distinfo	2021-04-05 18:41:00.160460000 +0200
>@@ -1,2 +1,3 @@
>-SHA256 (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = f517470ff132fbe114c47c996c2f8775693fca8a4a8bc3caf479ed7580d2cc2a
>-SIZE (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = 4941781
>+TIMESTAMP = 1617640860
>+SHA256 (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = d124a8bc548d62dfbe034496d186b87aea4f29063febe28d92d7cf7be7148bd4
>+SIZE (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = 18460223
>diff -ruN /usr/ports/games/exult/files/patch-configure.ac ./exult/files/patch-configure.ac
>--- /usr/ports/games/exult/files/patch-configure.ac	2021-04-06 15:51:49.846741000 +0200
>+++ ./exult/files/patch-configure.ac	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- configure.ac.orig	2016-05-14 01:04:00 UTC
>-+++ configure.ac
>-@@ -71,7 +71,7 @@ case "$host_os" in
>- 		WINDOWING_SYSTEM="-DXWIN"
>- 		AC_DEFINE(NETBSD, 1, [Using NetBSD])
>- 		AC_MSG_RESULT([X11 (FreeBSD)])
>--		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
>-+		CXXFLAGS="$CXXFLAGS "
>- 		;;
>- 	netbsd* )
>- 		WINDOWING_SYSTEM="-DXWIN"
>-@@ -665,7 +665,7 @@ if test x$enable_debug = xyes; then
>- 	DEBUG_FLAGS="-g"
>- else
>- 	AC_MSG_RESULT(no)
>--	DEBUG_FLAGS="-O2"
>-+	DEBUG_FLAGS=
>- fi
>- 
>- # optimized debugging mode
>diff -ruN /usr/ports/games/exult/files/pkg-message.in ./exult/files/pkg-message.in
>--- /usr/ports/games/exult/files/pkg-message.in	2021-04-06 15:51:49.846994000 +0200
>+++ ./exult/files/pkg-message.in	2021-04-05 20:39:22.311448000 +0200
>@@ -1,7 +1,6 @@
> [
> { type: install
>   message: <<EOM
>- Run Exult from directory containing original Ultima VII data.
>  Please, read %%DOCSDIR%%/README for additional information.
> EOM
> }
>diff -ruN /usr/ports/games/exult/pkg-descr ./exult/pkg-descr
>--- /usr/ports/games/exult/pkg-descr	2021-04-06 15:51:49.847083000 +0200
>+++ ./exult/pkg-descr	2021-04-05 20:19:56.384645000 +0200
>@@ -3,4 +3,4 @@
> However, the original ORIGIN's Ultima VII data is required as Exult is
> just the engine. Refer to README file for details.
> 
>-WWW: http://exult.sourceforge.net
>+WWW: http://exult.info
>diff -ruN /usr/ports/games/exult/pkg-plist ./exult/pkg-plist
>--- /usr/ports/games/exult/pkg-plist	2021-04-06 15:51:49.847167000 +0200
>+++ ./exult/pkg-plist	2021-04-05 19:30:35.012585000 +0200
>@@ -1,12 +1,16 @@
>+bin/cmanip
> bin/expack
> bin/exult
>-%%STUDIO%%bin/exult_studio
>-%%THUMBNAILER%%bin/gnome_shp_thumbnailer
>+bin/exult_studio
> bin/ipack
>+bin/mklink
>+bin/rip
> bin/shp2pcx
> bin/splitshp
> bin/textpack
>+bin/u7voice2syx
> bin/ucxt
>+bin/wuc
> man/man1/expack.1.gz
> man/man1/exult_studio.1.gz
> man/man1/ipack.1.gz
>@@ -15,35 +19,54 @@
> man/man1/textpack.1.gz
> man/man1/ucc.1.gz
> man/man6/exult.6.gz
>-%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
> share/applications/exult.desktop
> %%PORTDOCS%%%%DOCSDIR%%/FAQ
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%DATADIR%%/bg_mr_faces.vga
>-%%DATADIR%%/bg_paperdol.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/blends.dat
>-%%STUDIO%%%%DATADIR%%/estudio/new/combos.flx
>-%%STUDIO%%%%DATADIR%%/estudio/new/faces.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx
>-%%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp
>-%%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga
>-%%STUDIO%%%%DATADIR%%/estudio/new/text.flx
>+%%PORTDOCS%%%%DOCSDIR%%/ReadMe.html
>+%%PORTDOCS%%%%DOCSDIR%%/exult_studio.html
>+%%PORTDOCS%%%%DOCSDIR%%/faq.html
>+%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs01.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs02.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs03.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs04.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs05.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/docs06.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/exult_logo.gif
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio01.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio02.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio03.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio04.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio05.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio06.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio07.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio08.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio09.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studio10.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studiobgiregs.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/studiosiiregs.png
>+%%DATADIR%%/estudio/new/avatar_data.txt
>+%%DATADIR%%/estudio/new/blends.dat
>+%%DATADIR%%/estudio/new/combos.flx
>+%%DATADIR%%/estudio/new/faces.vga
>+%%DATADIR%%/estudio/new/fonts.vga
>+%%DATADIR%%/estudio/new/gumps.vga
>+%%DATADIR%%/estudio/new/palettes.flx
>+%%DATADIR%%/estudio/new/paperdol.vga
>+%%DATADIR%%/estudio/new/pointers.shp
>+%%DATADIR%%/estudio/new/shapes.vga
>+%%DATADIR%%/estudio/new/sprites.vga
>+%%DATADIR%%/estudio/new/text.flx
> %%DATADIR%%/exult.flx
> %%DATADIR%%/exult_bg.flx
>-%%DATADIR%%/exult_iphone.flx
> %%DATADIR%%/exult_si.flx
>-%%STUDIO%%%%DATADIR%%/exult_studio.glade
>+%%DATADIR%%/exult_studio.glade
> %%DATADIR%%/exultmsg.txt
> %%DATADIR%%/midisfx.flx
> %%DATADIR%%/u7bgintrinsics.data
> %%DATADIR%%/u7misc.data
> %%DATADIR%%/u7opcodes.data
>+%%DATADIR%%/u7sibetaintrinsics.data
> %%DATADIR%%/u7siintrinsics.data
>-%%THUMBNAILER%%share/mime/packages/x-shapefile.xml
> share/pixmaps/exult.png
>-%%THUMBNAILER%%share/thumbnailers/gnome_u7shapes.thumbnailer

Actions: View | Diff

Attachments on bug 254801: 223838 | 223915 | 223916 | 223987 | 223988 | 223989 | 224006