diff --git a/games/exult/Makefile b/games/exult/Makefile index 131a9868b4a4..4eb7b8c3fc06 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -1,88 +1,84 @@ PORTNAME= exult -DISTVERSION?= 1.8 -PORTREVISION?= 6 +DISTVERSION?= 1.10.0 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= games MAINTAINER= eduardo@FreeBSD.org COMMENT= Engine for Ultima VII (BG, FOV, SI, SS) WWW= http://exult.info LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libogg.so:audio/libogg \ libpng16.so:graphics/png \ libvorbis.so:audio/libvorbis +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive USES= autoreconf compiler:c++17-lang gmake libtool localbase \ pkgconfig sdl xorg USE_GNOME= cairo gdkpixbuf2 USE_SDL= sdl2 USE_XORG= x11 xext GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static \ --enable-shared \ --with-icondir=${PREFIX}/share/pixmaps CONFLICTS_INSTALL= exult-devel SUB_FILES= pkg-message PLIST?= ${.CURDIR}/pkg-plist .if !defined(MASTERDIR) MASTER_SITES= http://prdownloads.sourceforge.net/exult/ +NO_WRKSUBDIR= yes .else USE_GITHUB= yes .endif OPTIONS_DEFINE= ALSA DEBUG DOCS FLUIDSYNTH GIMP STUDIO OPTIONS_DEFAULT= STUDIO OPTIONS_SUB= yes GIMP_DESC= GIMP plugin support STUDIO_DESC= Install Exult Studio ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa DEBUG_CONFIGURE_ON= --with-debug=full \ --with-optimization=none DEBUG_CONFIGURE_OFF= --with-debug=no FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CONFIGURE_ENABLE= fluidsynth GIMP_LIB_DEPENDS= libbabl-0.1.so:x11/babl \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgegl-0.4.so:graphics/gegl \ libgegl-npd-0.4.so:graphics/gegl \ libgimp-2.0.so:graphics/gimp-app \ libharfbuzz.so:print/harfbuzz \ libjson-glib-1.0.so:devel/json-glib GIMP_USES= gnome GIMP_USE= GNOME=gtk20,pango GIMP_CONFIGURE_ENABLE= gimp-plugin -STUDIO_LIB_DEPENDS?= libharfbuzz.so:print/harfbuzz +STUDIO_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ + libicuuc.so:devel/icu STUDIO_USES= gnome STUDIO_USE= GNOME=gtk30 STUDIO_CONFIGURE_ENABLE= exult-studio exult-studio-support post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in FAQ NEWS README ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include - -# Silence cast warnings from GTK callbacks in clang >=16 -# https://github.com/exult/exult/issues/416 -.if !defined(PKGNAMESUFFIX) && ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))) -CFLAGS+= -Wno-cast-function-type-strict -.endif - .include diff --git a/games/exult/distinfo b/games/exult/distinfo index 20ad1041b9a7..8c09667f02dd 100644 --- a/games/exult/distinfo +++ b/games/exult/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659184424 -SHA256 (exult-1.8.tar.gz) = dae6b7b08925d3db1dda3aca612bdc08d934ca04de817a008f305320e667faf9 -SIZE (exult-1.8.tar.gz) = 19104130 +TIMESTAMP = 1725906914 +SHA256 (exult-1.10.0.tar.gz) = 3c8b2b66142f783b2e49e157957c7ec463595645ae8fdee8996f9baeb7b3693c +SIZE (exult-1.10.0.tar.gz) = 18205771 diff --git a/games/exult/files/patch-configure.ac b/games/exult/files/patch-configure.ac deleted file mode 100644 index bda440166ff1..000000000000 --- a/games/exult/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2022-09-03 11:46:03 UTC -+++ configure.ac -@@ -79,7 +79,7 @@ case "$host_os" in - ;; - freebsd* ) - WINDOWING_SYSTEM="-DXWIN" -- AC_DEFINE(NETBSD, 1, [Using NetBSD]) -+ AC_DEFINE(FREEBSD, 1, [Using FreeBSD]) - AC_MSG_RESULT([X11 (FreeBSD)]) - CXXFLAGS="$CXXFLAGS -I/usr/local/include" - ;; diff --git a/games/exult/files/patch-mapedit_Makefile.am b/games/exult/files/patch-mapedit_Makefile.am index 119c02a9df74..a05690e7520e 100644 --- a/games/exult/files/patch-mapedit_Makefile.am +++ b/games/exult/files/patch-mapedit_Makefile.am @@ -1,13 +1,13 @@ ---- mapedit/Makefile.am.orig 2022-04-12 16:34:45 UTC +--- mapedit/Makefile.am.orig 2024-05-30 10:27:11 UTC +++ mapedit/Makefile.am -@@ -101,8 +101,8 @@ install-exec-local: +@@ -103,8 +103,8 @@ install-exec-local: if GIMP_PLUGIN install-exec-local: - install -d $(DESTDIR)$(GIMP_PLUGIN_PREFIX) - install -c $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) + $(MKDIR_P) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) + $(INSTALL_PROGRAM) $(GIMP_PLUGINS) $(DESTDIR)$(GIMP_PLUGIN_PREFIX) else install-exec-local: endif diff --git a/games/exult/files/patch-tools_Makefile.am b/games/exult/files/patch-tools_Makefile.am index 2416cc2caa8b..5c4f64ac46d2 100644 --- a/games/exult/files/patch-tools_Makefile.am +++ b/games/exult/files/patch-tools_Makefile.am @@ -1,29 +1,29 @@ ---- tools/Makefile.am.orig 2022-04-12 16:34:45 UTC +--- tools/Makefile.am.orig 2024-05-30 10:27:11 UTC +++ tools/Makefile.am -@@ -56,11 +56,11 @@ if BUILD_GTHUMB +@@ -68,11 +68,11 @@ if BUILD_GTHUMB ## Does not work: #thumbnailerdir=$(datadir)/thumbnailers ## Needs to be in /usr/share/thumbnailers -thumbnailerdir=/usr/share/thumbnailers +thumbnailerdir=$(datadir)/thumbnailers - thumbnailer_in_files=gnome_u7shapes.thumbnailer.in + thumbnailer_in_files=$(top_srcdir)/tools/gnome_u7shapes.thumbnailer.in thumbnailer_DATA=$(thumbnailer_in_files:.thumbnailer.in=.thumbnailer) gnome_shp_thumbnailer_DATA=x-shapefile.xml -gnome_shp_thumbnailerdir=$(DESTDIR)$(datadir)/mime/packages +gnome_shp_thumbnailerdir=$(datadir)/mime/packages # Rule to make the service file with bindir expanded $(thumbnailer_DATA): $(thumbnailer_in_files) -@@ -105,10 +105,10 @@ install-data-hook: +@@ -117,10 +117,10 @@ install-data-hook: if BUILD_GTHUMB install-data-hook: - update-mime-database $(DESTDIR)$(datadir)/mime || : + : uninstall-hook: - update-mime-database $(DESTDIR)$(datadir)/mime || : + : else install-data-hook: uninstall-hook: diff --git a/games/exult/files/patch-version.cc b/games/exult/files/patch-version.cc deleted file mode 100644 index c48ff501c171..000000000000 --- a/games/exult/files/patch-version.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- version.cc.orig 2022-09-03 11:51:13 UTC -+++ version.cc -@@ -210,6 +210,8 @@ void getVersionInfo(std::ostream &out) { - - out << " Version " << info.dwMajorVersion << "." << info.dwMinorVersion << " Build " << LOWORD(info.dwBuildNumber & 0xFFFF); - } -+#elif (defined(FREEBSD)) -+ out << "FreeBSD"; - #elif (defined(MACOSX)) - out << "Mac OS X"; - #elif (defined(__IPHONEOS__)) diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist index 3880274d620c..747732d349cc 100644 --- a/games/exult/pkg-plist +++ b/games/exult/pkg-plist @@ -1,73 +1,72 @@ bin/cmanip bin/expack bin/exult %%STUDIO%%bin/exult_studio bin/ipack bin/mklink bin/rip bin/shp2pcx bin/splitshp bin/textpack bin/u7voice2syx bin/ucxt bin/wuc %%GIMP%%libexec/gimp/2.2/plug-ins/u7shp share/man/man1/expack.1.gz share/man/man1/exult_studio.1.gz share/man/man1/ipack.1.gz share/man/man1/shp2pcx.1.gz share/man/man1/splitshp.1.gz share/man/man1/textpack.1.gz share/man/man1/ucc.1.gz share/man/man6/exult.6.gz 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 %%STUDIO%%%%DATADIR%%/estudio/new/avatar_data.txt %%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 %%DATADIR%%/exult.flx %%DATADIR%%/exult_bg.flx %%DATADIR%%/exult_si.flx %%STUDIO%%%%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 share/pixmaps/exult.png