- Update to version 1.1.10.r2

PR:		ports/64995
Submitted by:	maintainer

7 files changed, 48 insertions, 56 deletions

diff --git a/games/exult/Makefile b/games/exult/Makefile
index 65faad4f7bc8..6073e51b208e 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	exult
-PORTVERSION=	1.00
-PORTREVISION=	3
+PORTVERSION=	1.1.10.r2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-1.1.10rc2
 
 MAINTAINER=	tiamat@comset.net
 COMMENT=	Ultima VII engine
@@ -18,35 +18,25 @@ COMMENT=	Ultima VII engine
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
 USE_XLIB=	yes
-USE_SDL=	sdl
+USE_SDL=	sdl mixer
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${X11BASE}/include \
-		LDFLAGS="-L${X11BASE}/lib"
-CONFIGURE_ARGS=	--with-x \
-		--disable-tools \
-		--disable-sdltest
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN6=		exult.6
+MAN1=	expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1
+MAN6=	exult.6
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^DEBUG_FLAGS|#DEBUG_FLAGS|g'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/exult ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/docs/exult.6 ${MANPREFIX}/man/man6
-	@${MKDIR} ${DATADIR}
-.for file in exult.flx exult_bg.flx exult_si.flx midisfx.flx
-	${INSTALL_DATA} ${WRKSRC}/data/${file} ${DATADIR}
-.endfor
-.if !defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|desktop||' ${WRKSRC}/Makefile.in
+
+post-install:
+.ifndef	(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in FAQ NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in FAQ NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-	@${SED} 's:/usr/local:${PREFIX}:g' ${PKGMESSAGE}
+	@${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|' <${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/exult/distinfo b/games/exult/distinfo
index 4ddb591ed9ed..ba1d7a71a5d5 100644
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,2 +1,3 @@
-MD5 (exult-1.00.tar.gz) = f560b5f98ffcbb003a79d7989a612551
+MD5 (exult-1.1.10rc2.tar.gz) = 7f53d976a9448cf59dcec447f291bfb5
+SIZE (exult-1.1.10rc2.tar.gz) = 1813283
 SIZE (exult-1.00.tar.gz) = 1475870
diff --git a/games/exult/files/patch-files-databuf.h b/games/exult/files/patch-files-databuf.h
index bcd234e9eef0..fc5f7f6183a9 100644
--- a/games/exult/files/patch-files-databuf.h
+++ b/games/exult/files/patch-files-databuf.h
@@ -1,11 +1,11 @@
---- files/databuf.h.orig	Thu May 23 07:24:04 2002
-+++ files/databuf.h	Sat Aug 16 17:54:30 2003
-@@ -24,6 +24,9 @@
- #ifdef MACOS
- #  include <cassert>
+--- files/databuf.h.orig	Sun Aug 31 21:32:25 2003
++++ files/databuf.h	Wed Mar 31 13:37:08 2004
+@@ -21,7 +21,9 @@
+ #  include <cstdio>
+ #  include <cstring>
  #endif
 +#if defined(__GNUC__) && __GNUC__ >= 3
-+#  include <cassert>
+ #include <cassert>
 +#endif
  #include <fstream>
  #include <iomanip>
diff --git a/games/exult/files/patch-files-rwregress.cc b/games/exult/files/patch-files-rwregress.cc
index ea6ad1a6f25a..37bacb7b66c4 100644
--- a/games/exult/files/patch-files-rwregress.cc
+++ b/games/exult/files/patch-files-rwregress.cc
@@ -1,10 +1,12 @@
---- files/rwregress.cc.orig	Tue Feb  5 06:01:24 2002
-+++ files/rwregress.cc	Sat Aug 16 17:30:00 2003
-@@ -6,6 +6,7 @@
+--- files/rwregress.cc.orig	Tue Jun 24 21:20:55 2003
++++ files/rwregress.cc	Wed Mar 31 13:39:13 2004
+@@ -5,7 +5,9 @@
+ 
  #include <iostream>
- #include "utils.h"
  #include <strstream>
-+#include <cassert>
++#if defined(__GNUC__) && __GNUC__ >= 3
+ #include <cassert>
++#endif
+ #include "utils.h"
  
  using std::cout;
- using std::endl;
diff --git a/games/exult/files/patch-gumps-gump_utils.h b/games/exult/files/patch-gumps-gump_utils.h
deleted file mode 100644
index 678d414e601a..000000000000
--- a/games/exult/files/patch-gumps-gump_utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
-*** gumps/gump_utils.h~	Mon Feb 18 12:30:14 2002
---- gumps/gump_utils.h	Mon Feb 18 12:28:58 2002
-***************
-*** 27,32 ****
---- 27,36 ----
-  #include <sys/types.h>
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ #include <string.h>
-+ #endif
-+ 
-  #include <unistd.h>
-  #include "mouse.h"
diff --git a/games/exult/pkg-message b/games/exult/pkg-message
index 585cd6867074..d5bbe7da09a2 100644
--- a/games/exult/pkg-message
+++ b/games/exult/pkg-message
@@ -1,4 +1,4 @@
 ******************************************************************************
-* Original Ultima VII data is required to run Exult
-* Please, read ${PREFIX}/share/doc/exult/README for additional information
+* Run Exult from directory, containing original Ultima VII data.
+* Please, read %%DOCSDIR%%/README for additional information.
 ******************************************************************************
diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist
index aa40dfa2bb9a..f98cbf67de65 100644
--- a/games/exult/pkg-plist
+++ b/games/exult/pkg-plist
@@ -1,10 +1,23 @@
+bin/expack
 bin/exult
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+bin/shp2pcx
+bin/splitshp
+bin/textpack
+bin/ucc
+bin/ucxt
 %%DATADIR%%/exult.flx
 %%DATADIR%%/exult_bg.flx
 %%DATADIR%%/exult_si.flx
+%%DATADIR%%/exultmsg.txt
 %%DATADIR%%/midisfx.flx
-@dirrm %%DATADIR%%
+%%DATADIR%%/u7bgintrinsics.data
+%%DATADIR%%/u7misc.data
+%%DATADIR%%/u7opcodes.data
+%%DATADIR%%/u7siintrinsics.data
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/estudio/new
+@dirrm %%DATADIR%%/estudio
+@dirrm %%DATADIR%%