Attachment #223916 for bug #254801

Lines 1-8 Link Here

(-)./exult/Makefile (-26 / +18 lines)
1	# Created by: Igor Pokrovsky <tiamat@telegraph.spb.ru>	1	# Created by: Igor Pokrovsky <tiamat@telegraph.spb.ru>
2		2
3	PORTNAME= exult	3	PORTNAME= exult
4	PORTVERSION= 1.5.0.20160514	4	PORTVERSION= 1.7.0.20210405
5	PORTREVISION= 9
6	CATEGORIES= games	5	CATEGORIES= games
7		6
8	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= ports@FreeBSD.org
Lines 12-61 Link Here
12	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
13		12
14	LIB_DEPENDS= libvorbis.so:audio/libvorbis \	13	LIB_DEPENDS= libvorbis.so:audio/libvorbis \
15	libpng.so:graphics/png	14	libpng.so:graphics/png \
		15	libogg.so:audio/libogg \
		16	libfreetype.so:print/freetype2
16		17
		18	USES= autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig \
		19	xorg sdl
		20
17	USE_GITHUB= yes	21	USE_GITHUB= yes
18	GH_TAGNAME= b15afba	22	GH_TAGNAME= 6150ae4
19		23
20	USES= autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig \	24	USE_CXXSTD= c++17
21	xorg	25	USE_XORG= x11 xext
22	USE_CXXSTD= c++98	26	USE_SDL= mixer2
23	USE_XORG= xext	27	USE_GNOME= gtk30 cairo gdkpixbuf2
24	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --disable-alsa \	29	CONFIGURE_ARGS= --disable-alsa --with-sdl=sdl2 \
26	--with-icondir=${PREFIX}/share/pixmaps	30	--with-icondir=${PREFIX}/share/pixmaps
27	SUB_FILES= pkg-message	31	SUB_FILES= pkg-message
28		32
29	OPTIONS_DEFINE= DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER	33	OPTIONS_DEFINE= DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER
30	OPTIONS_SINGLE= SDL	34	OPTIONS_DEFAULT= STUDIO
31	OPTIONS_SINGLE_SDL= SDL1 SDL2
32	OPTIONS_DEFAULT= SDL1 STUDIO
33	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
34		36
35	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth	37	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
36	FLUIDSYNTH_CONFIGURE_ENABLE=\	38	FLUIDSYNTH_CONFIGURE_ENABLE= fluidsynth
37	fluidsynth
38	GIMP_DESC= GIMP plugin support	39	GIMP_DESC= GIMP plugin support
39	GIMP_LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app	40	GIMP_LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app
40	GIMP_CONFIGURE_ENABLE= gimp-plugin	41	GIMP_CONFIGURE_ENABLE= gimp-plugin
41	SDL1_DESC= Simple Direct Media Layer 1 support	42
42	SDL1_USES= sdl
43	SDL1_USE= sdl=mixer
44	SDL1_CONFIGURE_ON= --with-sdl=sdl12
45	SDL2_DESC= Simple Direct Media Layer 2 support
46	SDL2_USES= sdl
47	SDL2_USE= sdl=mixer2
48	SDL2_CONFIGURE_ON= --with-sdl=sdl2
49	STUDIO_DESC= Install Exult Studio	43	STUDIO_DESC= Install Exult Studio
50	STUDIO_CONFIGURE_ENABLE=\	44	STUDIO_CONFIGURE_ENABLE= exult-studio exult-studio-support
51	exult-studio exult-studio-support
52	STUDIO_USES= gnome	45	STUDIO_USES= gnome
53	STUDIO_USE= gnome=libglade2	46	STUDIO_USE= gnome=libglade2
54	THUMBNAILER_DESC= Gnome SHP thumbnailer support	47	THUMBNAILER_DESC= Gnome SHP thumbnailer support
55	THUMBNAILER_USES= gnome shared-mime-info	48	THUMBNAILER_USES= gnome shared-mime-info
56	THUMBNAILER_USE= gnome=libgnomeui	49	THUMBNAILER_USE= gnome=libgnomeui
57	THUMBNAILER_CONFIGURE_ENABLE=\	50	THUMBNAILER_CONFIGURE_ENABLE= gnome-shp-thumbnailer
58	gnome-shp-thumbnailer
59		51
60	post-install-DOCS-on:	52	post-install-DOCS-on:
61	@${MKDIR} ${STAGEDIR}${DOCSDIR}	53	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)./exult/distinfo (-2 / +3 lines)
1	SHA256 (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = f517470ff132fbe114c47c996c2f8775693fca8a4a8bc3caf479ed7580d2cc2a	1	TIMESTAMP = 1617640860
2	SIZE (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = 4941781	2	SHA256 (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = d124a8bc548d62dfbe034496d186b87aea4f29063febe28d92d7cf7be7148bd4
		3	SIZE (exult-exult-1.7.0.20210405-6150ae4_GH0.tar.gz) = 18460223




--- 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

Lines 1-7 Link Here

(-)./exult/files/pkg-message.in (-1 lines)
1	[	1	[
2	{ type: install	2	{ type: install
3	message: <<EOM	3	message: <<EOM
4	Run Exult from directory containing original Ultima VII data.
5	Please, read %%DOCSDIR%%/README for additional information.	4	Please, read %%DOCSDIR%%/README for additional information.
6	EOM	5	EOM
7	}	6	}

Lines 3-6 Link Here

(-)./exult/pkg-descr (-1 / +1 lines)
3	However, the original ORIGIN's Ultima VII data is required as Exult is	3	However, the original ORIGIN's Ultima VII data is required as Exult is
4	just the engine. Refer to README file for details.	4	just the engine. Refer to README file for details.
5		5
6	WWW: http://exult.sourceforge.net	6	WWW: http://exult.info




bin/cmanip
bin/expack
bin/exult
bin/exult_studio
%%THUMBNAILER%%bin/gnome_shp_thumbnailer
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

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
%%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
%%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

Return to bug 254801

Lines 1-20 Link Here

(-)./exult/files/patch-configure.ac (-20 lines)
1	--- configure.ac.orig 2016-05-14 01:04:00 UTC
2	+++ configure.ac
3	@@ -71,7 +71,7 @@ case "$host_os" in
4	WINDOWING_SYSTEM="-DXWIN"
5	AC_DEFINE(NETBSD, 1, [Using NetBSD])
6	AC_MSG_RESULT([X11 (FreeBSD)])
7	- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
8	+ CXXFLAGS="$CXXFLAGS "
9	;;
10	netbsd* )
11	WINDOWING_SYSTEM="-DXWIN"
12	@@ -665,7 +665,7 @@ if test x$enable_debug = xyes; then
13	DEBUG_FLAGS="-g"
14	else
15	AC_MSG_RESULT(no)
16	- DEBUG_FLAGS="-O2"
17	+ DEBUG_FLAGS=
18	fi
19
20	# optimized debugging mode

Lines 1-12 Link Here

(-)./exult/pkg-plist (-20 / +43 lines)
		1	bin/cmanip
1	bin/expack	2	bin/expack
2	bin/exult	3	bin/exult
3	%%STUDIO%%bin/exult_studio	4	bin/exult_studio
4	%%THUMBNAILER%%bin/gnome_shp_thumbnailer
5	bin/ipack	5	bin/ipack
		6	bin/mklink
		7	bin/rip
6	bin/shp2pcx	8	bin/shp2pcx
7	bin/splitshp	9	bin/splitshp
8	bin/textpack	10	bin/textpack
		11	bin/u7voice2syx
9	bin/ucxt	12	bin/ucxt
		13	bin/wuc
10	man/man1/expack.1.gz	14	man/man1/expack.1.gz
11	man/man1/exult_studio.1.gz	15	man/man1/exult_studio.1.gz
12	man/man1/ipack.1.gz	16	man/man1/ipack.1.gz
Lines 15-49 Link Here
15	man/man1/textpack.1.gz	19	man/man1/textpack.1.gz
16	man/man1/ucc.1.gz	20	man/man1/ucc.1.gz
17	man/man6/exult.6.gz	21	man/man6/exult.6.gz
18	%%GIMP%%libexec/gimp/2.2/plug-ins/u7shp
19	share/applications/exult.desktop	22	share/applications/exult.desktop
20	%%PORTDOCS%%%%DOCSDIR%%/FAQ	23	%%PORTDOCS%%%%DOCSDIR%%/FAQ
21	%%PORTDOCS%%%%DOCSDIR%%/NEWS	24	%%PORTDOCS%%%%DOCSDIR%%/NEWS
22	%%PORTDOCS%%%%DOCSDIR%%/README	25	%%PORTDOCS%%%%DOCSDIR%%/README
23	%%DATADIR%%/bg_mr_faces.vga	26	%%PORTDOCS%%%%DOCSDIR%%/ReadMe.html
24	%%DATADIR%%/bg_paperdol.vga	27	%%PORTDOCS%%%%DOCSDIR%%/exult_studio.html
25	%%STUDIO%%%%DATADIR%%/estudio/new/blends.dat	28	%%PORTDOCS%%%%DOCSDIR%%/faq.html
26	%%STUDIO%%%%DATADIR%%/estudio/new/combos.flx	29	%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
27	%%STUDIO%%%%DATADIR%%/estudio/new/faces.vga	30	%%PORTDOCS%%%%DOCSDIR%%/images/docs01.png
28	%%STUDIO%%%%DATADIR%%/estudio/new/fonts.vga	31	%%PORTDOCS%%%%DOCSDIR%%/images/docs02.png
29	%%STUDIO%%%%DATADIR%%/estudio/new/gumps.vga	32	%%PORTDOCS%%%%DOCSDIR%%/images/docs03.png
30	%%STUDIO%%%%DATADIR%%/estudio/new/palettes.flx	33	%%PORTDOCS%%%%DOCSDIR%%/images/docs04.png
31	%%STUDIO%%%%DATADIR%%/estudio/new/paperdol.vga	34	%%PORTDOCS%%%%DOCSDIR%%/images/docs05.png
32	%%STUDIO%%%%DATADIR%%/estudio/new/pointers.shp	35	%%PORTDOCS%%%%DOCSDIR%%/images/docs06.png
33	%%STUDIO%%%%DATADIR%%/estudio/new/shapes.vga	36	%%PORTDOCS%%%%DOCSDIR%%/images/exult_logo.gif
34	%%STUDIO%%%%DATADIR%%/estudio/new/sprites.vga	37	%%PORTDOCS%%%%DOCSDIR%%/images/studio01.png
35	%%STUDIO%%%%DATADIR%%/estudio/new/text.flx	38	%%PORTDOCS%%%%DOCSDIR%%/images/studio02.png
		39	%%PORTDOCS%%%%DOCSDIR%%/images/studio03.png
		40	%%PORTDOCS%%%%DOCSDIR%%/images/studio04.png
		41	%%PORTDOCS%%%%DOCSDIR%%/images/studio05.png
		42	%%PORTDOCS%%%%DOCSDIR%%/images/studio06.png
		43	%%PORTDOCS%%%%DOCSDIR%%/images/studio07.png
		44	%%PORTDOCS%%%%DOCSDIR%%/images/studio08.png
		45	%%PORTDOCS%%%%DOCSDIR%%/images/studio09.png
		46	%%PORTDOCS%%%%DOCSDIR%%/images/studio10.png
		47	%%PORTDOCS%%%%DOCSDIR%%/images/studiobgiregs.png
		48	%%PORTDOCS%%%%DOCSDIR%%/images/studiosiiregs.png
		49	%%DATADIR%%/estudio/new/avatar_data.txt
		50	%%DATADIR%%/estudio/new/blends.dat
		51	%%DATADIR%%/estudio/new/combos.flx
		52	%%DATADIR%%/estudio/new/faces.vga
		53	%%DATADIR%%/estudio/new/fonts.vga
		54	%%DATADIR%%/estudio/new/gumps.vga
		55	%%DATADIR%%/estudio/new/palettes.flx
		56	%%DATADIR%%/estudio/new/paperdol.vga
		57	%%DATADIR%%/estudio/new/pointers.shp
		58	%%DATADIR%%/estudio/new/shapes.vga
		59	%%DATADIR%%/estudio/new/sprites.vga
		60	%%DATADIR%%/estudio/new/text.flx
36	%%DATADIR%%/exult.flx	61	%%DATADIR%%/exult.flx
37	%%DATADIR%%/exult_bg.flx	62	%%DATADIR%%/exult_bg.flx
38	%%DATADIR%%/exult_iphone.flx
39	%%DATADIR%%/exult_si.flx	63	%%DATADIR%%/exult_si.flx
40	%%STUDIO%%%%DATADIR%%/exult_studio.glade	64	%%DATADIR%%/exult_studio.glade
41	%%DATADIR%%/exultmsg.txt	65	%%DATADIR%%/exultmsg.txt
42	%%DATADIR%%/midisfx.flx	66	%%DATADIR%%/midisfx.flx
43	%%DATADIR%%/u7bgintrinsics.data	67	%%DATADIR%%/u7bgintrinsics.data
44	%%DATADIR%%/u7misc.data	68	%%DATADIR%%/u7misc.data
45	%%DATADIR%%/u7opcodes.data	69	%%DATADIR%%/u7opcodes.data
		70	%%DATADIR%%/u7sibetaintrinsics.data
46	%%DATADIR%%/u7siintrinsics.data	71	%%DATADIR%%/u7siintrinsics.data
47	%%THUMBNAILER%%share/mime/packages/x-shapefile.xml
48	share/pixmaps/exult.png	72	share/pixmaps/exult.png
49	%%THUMBNAILER%%share/thumbnailers/gnome_u7shapes.thumbnailer