7 files changed, 111 insertions, 47 deletions

diff --git a/games/exult/Makefile b/games/exult/Makefile
index a603fd0715f8..0c23025d1eb8 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -2,50 +2,58 @@
 # $FreeBSD$
 
 PORTNAME=	exult
-PORTVERSION=	1.5.0.20130315
-PORTREVISION=	3
+PORTVERSION=	1.5.0.20160514
 CATEGORIES=	games
-MASTER_SITES=	http://www.math.leidenuniv.nl/~wpalenst/cvs/
-DISTNAME=	exult-20130315-0400
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ultima VII engine
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	timidity:audio/timidity
-RUN_DEPENDS=	timidity:audio/timidity
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libpng.so:graphics/png
 
-USE_SDL=	sdl mixer
-USE_XORG=	x11
-USES=		autoreconf gmake libtool pkgconfig
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GITHUB=	yes
+GH_TAGNAME=	b15afba
 
-WRKSRC=		${WRKDIR}/exult
+USES=		autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig
+USE_XORG=	xext
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--with-icondir=${PREFIX}/share/pixmaps
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	STUDIO
-OPTIONS_DEFAULT=STUDIO
-OPTIONS_SUB=	yes
-STUDIO_DESC=	Install Exult Studio
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSTUDIO}
-CONFIGURE_ARGS+=--enable-exult-studio \
-		--enable-exult-studio-support
-USE_GNOME+=	libglade2
-.endif
-
-post-install:
+OPTIONS_DEFINE=		DOCS FLUIDSYNTH GIMP STUDIO THUMBNAILER
+OPTIONS_SINGLE=		SDL
+OPTIONS_SINGLE_SDL=	SDL1 SDL2
+OPTIONS_DEFAULT=	SDL1 STUDIO
+OPTIONS_SUB=		yes
+
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/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_USE=		sdl=mixer
+SDL1_CONFIGURE_ARGS=	--with-sdl=sdl12
+SDL2_DESC=		Simple Direct Media Layer 2 support
+SDL2_USE=		sdl=mixer2
+SDL2_CONFIGURE_ARGS=	--with-sdl=sdl2
+STUDIO_DESC=		Install Exult Studio
+STUDIO_CONFIGURE_ENABLE=\
+			exult-studio exult-studio-support
+STUDIO_USE=		gnome=libglade2
+THUMBNAILER_DESC=	Gnome SHP thumbnailer support
+THUMBNAILER_USES=	shared-mime-info
+THUMBNAILER_USE=	gnome=libgnomeui
+THUMBNAILER_CONFIGURE_ENABLE=\
+			gnome-shp-thumbnailer
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in FAQ NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
diff --git a/games/exult/distinfo b/games/exult/distinfo
index 1038840f198a..88cd8e643f06 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,2 +1,2 @@
-SHA256 (exult-20130315-0400.tar.gz) = 368dc28016d56c5251531e4cff463d9ffcaa151d74bad65bdc5366c213e12fcc
-SIZE (exult-20130315-0400.tar.gz) = 4784001
+SHA256 (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = f517470ff132fbe114c47c996c2f8775693fca8a4a8bc3caf479ed7580d2cc2a
+SIZE (exult-exult-1.5.0.20160514-b15afba_GH0.tar.gz) = 4941781
diff --git a/games/exult/files/patch-configure.ac b/games/exult/files/patch-configure.ac
new file mode 100644
index 000000000000..a3094952482d
--- /dev/null
+++ b/games/exult/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- 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 --git a/games/exult/files/patch-mapedit_Makefile.am b/games/exult/files/patch-mapedit_Makefile.am
new file mode 100644
index 000000000000..41d91341084f
--- /dev/null
+++ b/games/exult/files/patch-mapedit_Makefile.am
@@ -0,0 +1,13 @@
+--- mapedit/Makefile.am.orig	2016-05-14 01:04:00 UTC
++++ mapedit/Makefile.am
+@@ -92,8 +92,8 @@ EXTRA_DIST=	\
+ 
+ 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-shapes_pngio.cc b/games/exult/files/patch-shapes_pngio.cc
deleted file mode 100644
index 7df562761b89..000000000000
--- a/games/exult/files/patch-shapes_pngio.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- shapes/pngio.cc.orig	2013-01-27 03:00:25 UTC
-+++ shapes/pngio.cc
-@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #include <png.h>
- #include <setjmp.h>
-+#include <string.h>
- 
- 
- /*
diff --git a/games/exult/files/patch-tools_Makefile.am b/games/exult/files/patch-tools_Makefile.am
new file mode 100644
index 000000000000..3ee110dcfe29
--- /dev/null
+++ b/games/exult/files/patch-tools_Makefile.am
@@ -0,0 +1,29 @@
+--- tools/Makefile.am.orig	2016-05-14 01:04:00 UTC
++++ tools/Makefile.am
+@@ -56,11 +56,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_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)
+@@ -99,10 +99,10 @@ cmanip_LDADD = \
+ 
+ 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/pkg-plist b/games/exult/pkg-plist
index 80777ffe11bc..e8958340278a 100644
--- a/games/exult/pkg-plist
+++ b/games/exult/pkg-plist
@@ -1,6 +1,7 @@
 bin/expack
 bin/exult
 %%STUDIO%%bin/exult_studio
+%%THUMBNAILER%%bin/gnome_shp_thumbnailer
 bin/ipack
 bin/shp2pcx
 bin/splitshp
@@ -14,7 +15,11 @@ man/man1/splitshp.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
 %%DATADIR%%/bg_mr_faces.vga
 %%DATADIR%%/bg_paperdol.vga
 %%STUDIO%%%%DATADIR%%/estudio/new/blends.dat
@@ -39,7 +44,6 @@ share/applications/exult.desktop
 %%DATADIR%%/u7misc.data
 %%DATADIR%%/u7opcodes.data
 %%DATADIR%%/u7siintrinsics.data
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-share/icons/exult.png
+%%THUMBNAILER%%share/mime/packages/x-shapefile.xml
+share/pixmaps/exult.png
+%%THUMBNAILER%%share/thumbnailers/gnome_u7shapes.thumbnailer