Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/games/4stAttack/Makefile
+++ b/games/4stAttack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/05/09 07:37:05 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2015/04/25 14:22:51 tnn Exp $

 DISTNAME=		4stAttack-2.1.4
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=forcedattack/}

--- a/games/InterLOGIC/Makefile
+++ b/games/InterLOGIC/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:29 asau Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/25 14:22:51 tnn Exp $
 #

 DISTNAME=		interLOGIC-src-0.30
 # authors' preferred casing
 PKGNAME=		InterLOGIC-0.30
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=interlogic/}

--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2012/10/06 11:54:29 asau Exp $
+# $NetBSD: Makefile,v 1.27 2015/04/25 14:22:51 tnn Exp $
 #

 DISTNAME=	KoboDeluxe-0.5.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://olofson.net/kobodl/download/
 EXTRACT_SUFX=	.tar.bz2
--- a/games/LostPixels/Makefile
+++ b/games/LostPixels/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2013/06/04 22:16:03 tron Exp $
+# $NetBSD: Makefile,v 1.13 2015/04/25 14:22:51 tnn Exp $
 #

 DISTNAME=	LostPixels-0.5.3-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blinkensisters/}

--- a/games/Makefile
+++ b/games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.380 2015/01/29 04:50:11 jnemeth Exp $
+# $NetBSD: Makefile,v 1.382 2015/04/19 19:36:11 wiz Exp $
 #

 COMMENT=	Games
@@ -82,6 +82,7 @@ SUBDIR+=	exchess
 SUBDIR+=	exchess-book-medium
 SUBDIR+=	exchess-book-small
 SUBDIR+=	exult
+SUBDIR+=	exult-audio
 SUBDIR+=	falcons-eye
 SUBDIR+=	fillets-ng
 SUBDIR+=	fillets-ng-data
@@ -335,6 +336,7 @@ SUBDIR+=	warmux
 SUBDIR+=	warzone2100
 SUBDIR+=	wesnoth
 SUBDIR+=	wormz
+SUBDIR+=	wtf
 SUBDIR+=	wxhugo
 SUBDIR+=	xarchon
 SUBDIR+=	xbat
--- a/games/REminiscence/Makefile
+++ b/games/REminiscence/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2015/02/09 20:22:55 snj Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/25 14:22:51 tnn Exp $

 DISTNAME=		REminiscence-0.2.1
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://cyxdown.free.fr/reminiscence/
 EXTRACT_SUFX=		.tar.bz2
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2015/01/25 13:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2015/04/25 14:22:51 tnn Exp $

 DISTNAME=	AlephOne-20120514
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=marathon/}
 EXTRACT_SUFX=	.tar.bz2
--- a/games/amor/Makefile
+++ b/games/amor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2014/11/14 08:49:41 markd Exp $
+# $NetBSD: Makefile,v 1.26 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	amor-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	games
 COMMENT=	KDE creature for your desktop

--- a/games/anise/Makefile
+++ b/games/anise/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/10/09 14:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/25 14:22:52 tnn Exp $
 #

 DISTNAME=	anise-beta10-20040307-linux
 PKGNAME=	anise-0beta10
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://kldp.net/download.php/1051/

--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2014/05/30 11:32:56 joerg Exp $
+# $NetBSD: Makefile,v 1.61 2015/06/12 10:50:06 wiz Exp $

 DISTNAME=	asc-source-1.16.4.0
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	15
+PKGREVISION=	17
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=	.tar.bz2
--- a/games/asciiquarium/Makefile
+++ b/games/asciiquarium/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/12/07 02:51:35 mef Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/12 10:50:06 wiz Exp $
 #

 DISTNAME=	asciiquarium_1.1
 PKGNAME=	asciiquarium-1.1
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://robobunny.com/projects/asciiquarium/

--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2014/05/05 00:47:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/25 14:22:52 tnn Exp $
 #

 DISTNAME=		atomix-2.14.0
-PKGREVISION=		36
+PKGREVISION=		37
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atomix/2.14/}

--- a/games/atque/Makefile
+++ b/games/atque/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/09/12 23:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	atque-1.1.2
+PKGREVISION=	1
 CATEGORIES=	games editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=igniferroque/}
 EXTRACT_SUFX=	.tar.bz2
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2015/01/04 02:59:11 dholland Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.evl.uic.edu/aej/BATTALION/
 DISTFILES=		battalionSource1.4.tar.Z battalionSUN4.tar.gz
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2012/10/06 11:54:31 asau Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	battleball.21.src
 PKGNAME=	battleball-2.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games x11
 MASTER_SITES=	#

--- a/games/billardgl/Makefile
+++ b/games/billardgl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/10/06 11:54:31 asau Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/25 14:22:52 tnn Exp $
 #

 DISTNAME=	BillardGL-1.75
 PKGNAME=	${DISTNAME:S/BillardGL/billardgl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=billardgl/}

--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/09 07:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	blindmine-0.3-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	games python
 MASTER_SITES=	http://kldp.net/frs/download.php/3097/
 EXTRACT_SUFX=	.zip
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/11/14 08:49:37 markd Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	blinken-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	games
 COMMENT=	Memory enhancement game

--- a/games/blokus/Makefile
+++ b/games/blokus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/06 11:54:31 asau Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/25 14:22:52 tnn Exp $
 #

 DISTNAME=	blokus-1.1
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.saschahlusiak.de/blokus/

--- a/games/bluemoon/Makefile
+++ b/games/bluemoon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2014/05/05 00:47:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2015/04/25 14:22:52 tnn Exp $
 #

 DISTNAME=	bluemoon-1.3.2
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	games
 MASTER_SITES=	http://keldon.net/bluemoon/

--- a/games/bomber/Makefile
+++ b/games/bomber/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/14 08:49:38 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=	bomber-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	games
 COMMENT=	bomber game

--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2015/02/03 20:54:19 snj Exp $
+# $NetBSD: Makefile,v 1.35 2015/04/25 14:22:52 tnn Exp $

 DISTNAME=		bomberclone-0.11.9
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bomberclone/}

--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.60 2014/08/22 11:24:30 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=		boson-all-0.8
 PKGNAME=		${DISTNAME:S/-all//}
-PKGREVISION=		45
+PKGREVISION=		46
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boson/}
 EXTRACT_SUFX=		.tar.bz2
--- a/games/bovo/Makefile
+++ b/games/bovo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/14 08:49:38 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:22:53 tnn Exp $

 DISTNAME=	bovo-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	games
 COMMENT=	Five-in-a-row Board Game

--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2014/05/29 23:36:35 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2015/06/12 10:50:06 wiz Exp $

 DISTNAME=	bzflag-2.4.2
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}

--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2014/09/25 13:47:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.54 2015/04/25 14:22:53 tnn Exp $

 DISTNAME=	ccgo-0.3.6.3
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	games
 MASTER_SITES=	http://ccdw.org/~cjj/prog/ccgo/src/

--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2015/02/04 08:01:49 snj Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/25 14:22:53 tnn Exp $

 DISTNAME=		chromium-bsu-0.9.15.1
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}

--- a/games/circuslinux/Makefile
+++ b/games/circuslinux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 11:54:32 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=		circuslinux-1.0.3
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.billsgames.com/unix/x/circus-linux/src/

--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2014/05/05 00:47:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:22:53 tnn Exp $

 DISTNAME=	crack-attack-1.1.14
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	games
 MASTER_SITES=	http://savannah.nongnu.org/download/crack-attack/

--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/09/13 07:30:15 dholland Exp $
+# $NetBSD: Makefile,v 1.33 2015/06/25 06:22:11 dholland Exp $

 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -7,8 +7,8 @@ CATEGORIES=	games x11
 MASTER_SITES=	http://ibiblio.org/pub/linux/games/strategy/
 EXTRACT_SUFX=	.tar.Z

-PATCHFILES=	craft-jumbo-patch-20140913.gz
 PATCH_SITES=	http://www.NetBSD.org/~dholland/patchkits/craft/
+PATCHFILES=	craft-jumbo-patch-20140913.gz
 PATCH_DIST_STRIP= -p1

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/games/craft/distinfo
+++ b/games/craft/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2014/09/13 07:30:15 dholland Exp $
+$NetBSD: distinfo,v 1.12 2015/06/25 06:22:11 dholland Exp $

 SHA1 (craft-jumbo-patch-20140913.gz) = 8bb0f2e67bda9e8e7cb093db3625958f0fd6ed39
 RMD160 (craft-jumbo-patch-20140913.gz) = 95d696f9ccd227f23f28cb898b9af54c7fbc18ad
@@ -6,3 +6,5 @@ Size (craft-jumbo-patch-20140913.gz) = 18684 bytes
 SHA1 (craftcc35.tar.Z) = 8862b9001aa7d752a597033ef45d38ebfcee533f
 RMD160 (craftcc35.tar.Z) = 402a2c2ca37df4d86381b434437395424199859e
 Size (craftcc35.tar.Z) = 3123677 bytes
+SHA1 (patch-craft.hc) = 21bfc32566d3f0ccee65fe52871704457ffaa1cc
+SHA1 (patch-object__handler.hc) = c5143b605d37aef793ffa07b9191d777a5b9c8f3
--- a/games/craft/patches/patch-craft.hc
+++ b/games/craft/patches/patch-craft.hc
@@ -0,0 +1,15 @@
+$NetBSD: patch-craft.hc,v 1.1 2015/06/25 06:22:11 dholland Exp $
+
+Cast sqrt argument to double to placate the Solaris compiler.
+
+--- craft.hc~	2015-06-25 06:13:03.000000000 +0000
+++ craft.hc
+@@ -221,7 +221,7 @@ double pdist (int x1, int y1, int x2, in
+   {int xx = x1 - x2;
+    int yy = y1 - y2;
+ 
+-   return sqrt (xx * xx + yy * yy);
+   return sqrt ((double)(xx * xx + yy * yy));
+   }
+ 
+ void init_speed (double factor)
--- a/games/craft/patches/patch-object__handler.hc
+++ b/games/craft/patches/patch-object__handler.hc
@@ -0,0 +1,15 @@
+$NetBSD: patch-object__handler.hc,v 1.1 2015/06/25 06:22:11 dholland Exp $
+
+Cast sqrt argument to double to placate the Solaris compiler.
+
+--- object_handler.hc~	2015-06-25 06:13:03.000000000 +0000
+++ object_handler.hc
+@@ -36,7 +36,7 @@ double dist (int x1, int y1, int x2, int
+   {int xx = x1 - x2;
+    int yy = y1 - y2;
+ 
+-   return sqrt (xx * xx + yy * yy);
+   return sqrt ((double)(xx * xx + yy * yy));
+   }
+ 
+ int stepdist (int x1, int y1, int x2, int y2)
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2013/06/04 22:16:04 tron Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=		crimson-0.5.2
 PKGNAME=		${DISTNAME:S/crimson/crimsonfields/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		games
 MASTER_SITES=		http://crimson.seul.org/files/
 EXTRACT_SUFX=		.tar.bz2
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/02/08 17:45:29 wiedi Exp $
+# $NetBSD: Makefile,v 1.37 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=	CriticalMass-1.0.2
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=criticalmass/}
 EXTRACT_SUFX=	.tar.bz2
--- a/games/crossfire-client-gtk/Makefile
+++ b/games/crossfire-client-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2014/02/12 23:17:54 tron Exp $
+# $NetBSD: Makefile,v 1.12 2015/04/25 14:22:53 tnn Exp $

 .include "../../games/crossfire-client/Makefile.common"

 PKGNAME=	crossfire-client-gtk-${CROSSFIRE_VERSION}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	Multi-player graphical arcade and adventure game; GTK client

 INSTALL_DIRS=	gtk
--- a/games/crossfire-client-gtk2/Makefile
+++ b/games/crossfire-client-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2014/05/05 00:47:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:22:53 tnn Exp $

 .include "../../games/crossfire-client/Makefile.common"

 PKGNAME=	crossfire-client-gtk2-${CROSSFIRE_VERSION}
-PKGREVISION=	24
+PKGREVISION=	25
 COMMENT=	Multi-player graphical arcade and adventure game; GTK2 client

 INSTALL_DIRS=	gtk-v2
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/05/29 23:36:35 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/06/12 10:50:06 wiz Exp $

 .include "../../games/crossfire-client/Makefile.common"
-PKGREVISION=	14
+PKGREVISION=	16

 COMMENT=	Multi-player graphical arcade and adventure game; X11 client

--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/12/11 22:08:53 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/12 10:50:07 wiz Exp $

 DISTNAME=	crossfire-1.11.0
 PKGNAME=	crossfire-server-1.11.0
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=crossfire/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/06 11:54:35 asau Exp $
+# $NetBSD: Makefile,v 1.22 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=	d2x-0.2.5
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	games x11
 MASTER_SITES=	http://icculus.org/d2x/src/

--- a/games/dd2/Makefile
+++ b/games/dd2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:35 asau Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/25 14:22:53 tnn Exp $
 #

 DISTNAME=		dd2-0.2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games
 MASTER_SITES=		http://www.usebox.net/jjm/dd2/releases/

--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2015/02/09 09:51:26 snj Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/25 14:22:54 tnn Exp $

 DISTNAME=	defendguin-0.0.12
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tuxpaint.org/unix/x/defendguin/src/

--- a/games/digger/Makefile
+++ b/games/digger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/01/09 14:50:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/25 14:22:54 tnn Exp $
 #

 DISTNAME=		digger-20020314
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		games
 MASTER_SITES=		http://www.digger.org/

--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2014/05/05 00:47:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2015/04/25 14:22:54 tnn Exp $

 DISTNAME=	dopewars-1.5.12
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dopewars/}

--- a/games/duckmaze/Makefile
+++ b/games/duckmaze/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2014/05/17 16:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:22:54 tnn Exp $
 #

 DISTNAME=	duckmaze-pc-0.2
 PKGNAME=	duckmaze-0.2
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=duckmaze/}
 EXTRACT_SUFX=	.zip
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2014/05/29 23:36:35 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2015/06/12 10:50:07 wiz Exp $
 #

 DISTNAME=		eboard-1.0.4
-PKGREVISION=		24
+PKGREVISION=		26
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=eboard/}
 EXTRACT_SUFX=		.tar.bz2
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/12/19 08:44:50 mef Exp $
+# $NetBSD: Makefile,v 1.35 2015/04/25 14:22:54 tnn Exp $

 DISTNAME=	enigma-1.01-r1914
 PKGNAME=	${DISTNAME:S/-r/./}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enigma-game/}

--- a/games/exult-audio/DESCR
+++ b/games/exult-audio/DESCR
@@ -0,0 +1 @@
+All-In-One Audio Data pack containing sfx and music for Exult.
--- a/games/exult-audio/MESSAGE
+++ b/games/exult-audio/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/04/19 19:35:53 wiz Exp $
+
+Don't forget to enable the beautiful music and sfx in Exult via the program
+menu or ~/.exult.cfg .
+
+===========================================================================
--- a/games/exult-audio/Makefile
+++ b/games/exult-audio/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2015/04/19 19:35:53 wiz Exp $
+
+DISTNAME=	exult_audio
+PKGNAME=	exultaudio-1.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=exult/exult-data/}
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	nikkohigashi@gmail.com
+HOMEPAGE=	http://exult.sourceforge.net/
+COMMENT=	Digital music and digital wave sound effects data for Exult
+LICENSE=	gnu-gpl-v2
+
+DEPENDS+=       exult>=1.4.9rc1:../../games/exult
+
+DIST_SUBDIR=	${PKGNAME_NOREV}
+
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
+
+EXTRACT_DIR=		${WRKDIR}/exult-data
+EXULTDIR=		${DESTDIR}/${PREFIX}/share/exult
+INSTALLATION_DIRS+=	share/exult/music
+
+do-install:
+	${INSTALL_DATA} ${EXTRACT_DIR}/*.flx ${EXULTDIR}/
+	${INSTALL_DATA} ${EXTRACT_DIR}/*.txt ${EXULTDIR}/
+	${INSTALL_DATA} ${EXTRACT_DIR}/music/*.ogg ${EXULTDIR}/music/
+	${INSTALL_DATA} ${EXTRACT_DIR}/music/*.txt ${EXULTDIR}/music/
+
+.include "../../mk/bsd.pkg.mk"
--- a/games/exult-audio/PLIST
+++ b/games/exult-audio/PLIST
@@ -0,0 +1,89 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/19 19:35:53 wiz Exp $
+@pkgdir share/exult/
+share/exult/jmsfx.flx
+share/exult/jmsisfx.flx
+share/exult/sqsfxbg.flx
+share/exult/sqsfxsi.flx
+share/exult/README_audiopack.txt
+share/exult/readme_jmsfx.txt
+share/exult/readme_jmsisfx.txt
+share/exult/readme_sqsfxbg.txt
+share/exult/readme_sqsfxsi.txt
+@pkgdir share/exult/music/
+share/exult/music/00bg.ogg
+share/exult/music/01bg.ogg
+share/exult/music/02bg.ogg
+share/exult/music/03bg.ogg
+share/exult/music/04bg.ogg
+share/exult/music/05bg.ogg
+share/exult/music/06bg.ogg
+share/exult/music/07bg.ogg
+share/exult/music/08bg.ogg
+share/exult/music/09bg.ogg
+share/exult/music/10bg.ogg
+share/exult/music/11bg.ogg
+share/exult/music/12bg.ogg
+share/exult/music/13bg.ogg
+share/exult/music/14bg.ogg
+share/exult/music/15bg.ogg
+share/exult/music/16bg.ogg
+share/exult/music/17bg.ogg
+share/exult/music/18bg.ogg
+share/exult/music/19bg.ogg
+share/exult/music/20bg.ogg
+share/exult/music/21bg.ogg
+share/exult/music/22bg.ogg
+share/exult/music/23bg.ogg
+share/exult/music/24bg.ogg
+share/exult/music/25bg.ogg
+share/exult/music/26bg.ogg
+share/exult/music/27bg.ogg
+share/exult/music/28bg.ogg
+share/exult/music/29bg.ogg
+share/exult/music/30bg.ogg
+share/exult/music/31bg.ogg
+share/exult/music/32bg.ogg
+share/exult/music/33bg.ogg
+share/exult/music/34bg.ogg
+share/exult/music/35bg.ogg
+share/exult/music/36bg.ogg
+share/exult/music/37bg.ogg
+share/exult/music/38bg.ogg
+share/exult/music/39bg.ogg
+share/exult/music/40bg.ogg
+share/exult/music/41bg.ogg
+share/exult/music/42bg.ogg
+share/exult/music/43bg.ogg
+share/exult/music/44bg.ogg
+share/exult/music/45bg.ogg
+share/exult/music/46bg.ogg
+share/exult/music/47bg.ogg
+share/exult/music/48bg.ogg
+share/exult/music/52bg.ogg
+share/exult/music/53bg.ogg
+share/exult/music/54bg.ogg
+share/exult/music/55bg.ogg
+share/exult/music/56bg.ogg
+share/exult/music/57bg.ogg
+share/exult/music/58bg.ogg
+share/exult/music/59bg.ogg
+share/exult/music/end01bg.ogg
+share/exult/music/end02bg.ogg
+share/exult/music/endcr01.ogg
+share/exult/music/endcr02.ogg
+share/exult/music/exult.ogg
+share/exult/music/si01.ogg
+share/exult/music/si02.ogg
+share/exult/music/si03.ogg
+share/exult/music/si04.ogg
+share/exult/music/si05.ogg
+share/exult/music/si06.ogg
+share/exult/music/si07.ogg
+share/exult/music/si08.ogg
+share/exult/music/si09.ogg
+share/exult/music/si10.ogg
+share/exult/music/si11.ogg
+share/exult/music/si12.ogg
+share/exult/music/si13.ogg
+share/exult/music/si14.ogg
+share/exult/music/readme.txt
--- a/games/exult-audio/distinfo
+++ b/games/exult-audio/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/19 19:35:53 wiz Exp $
+
+SHA1 (exultaudio-1.0/exult_audio.zip) = 13c094ef845c8dc0f2335777c75bbfb9fae81ce4
+RMD160 (exultaudio-1.0/exult_audio.zip) = 63e88ddc955cd8fe2c1df4a4197423924daecb42
+Size (exultaudio-1.0/exult_audio.zip) = 48439905 bytes
--- a/games/exult/DESCR
+++ b/games/exult/DESCR
@@ -1,22 +1,13 @@
-Ultima 7, an RPG from the early 1990's, still has a huge following.
-But, being a DOS game with a very nonstandard memory manager, it
-is difficult to run it on the latest computers. Exult is a project
-to create an Ultima 7 game engine that runs on modern operating
-systems, capable of using the data and graphics files that come
-with the game.
+As computers evolve, we risk losing classic games from the
+not-so-distant past. One of these, Ultima 7, an RPG from the early
+1990's, still has a huge following, and many consider it to be one of
+the most immersive games ever produced.

-Exult is written in C++ and runs on, at least, Linux, Mac OS X and
-Windows using the SDL library to make porting to other platforms
-relatively easy. The current version supports all of "Ultima 7:
-The Black Gate" and "Ultima 7 part 2: The Serpent Isle", allowing
-you to finish both games. This is only possible due to the work
-done by other fans who have decoded the various Ultima 7 data files,
-especially Gary Thompson, Maxim Shatskih, Jakob Shonberg, and Wouter
-Dijkslag.
+Exult is a project to recreate Ultima 7 for modern operating systems,
+using the game's original plot, data, and graphics files.  It enables
+play of Ultima VII: The Black Gate and Ultima VII Part Two: Serpent
+Isle, and their corresponding expansion disks Forge of Virtue and
+Silver Seed, on modern machines.

-Exult aims to let those people who own Ultima 7 (copyright 1993)
-play the game on modern hardware, in as close to (or perhaps even
-surpassing) its original splendor as is possible. You need to own
-"Ultima 7: The Black Gate" and/or "Ultima 7: Serpent Isle" and
-optionally the add-ons (not required to run) in order to use Exult,
-and we encourage you to buy a legal copy.
+In order to play these games, data files from the original games are
+needed.
--- a/games/exult/MESSAGE
+++ b/games/exult/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/04/25 23:05:11 wiz Exp $
+
+Original Ultima 7: The Black Gate or Ultima 7 part 2: The Serpent Isle
+game distributions should be copied from floppies or CDs to relevant
+subdirs in ${PREFIX}/share/exult .
+
+For example, after extraction the game distribution archive
+ultima-vii-the-black-gate.zip, you want to put the contents of U7
+directory in ${PREFIX}/share/exult/blackgate
+
+You may wish to download exult audio data files to enable SFX and music.
+
+===========================================================================
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -1,25 +1,27 @@
-# $NetBSD: Makefile,v 1.19 2013/06/04 22:16:04 tron Exp $
-#
+# $NetBSD: Makefile,v 1.21 2015/04/25 14:22:54 tnn Exp $

-DISTNAME=		exult-1.2
-PKGREVISION=		10
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=exult/}
+DISTNAME=	exult-1.4.9rc1
+PKGREVISION=	1
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=exult/exult-all-versions/}

-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://exult.sourceforge.net/
-COMMENT=		Open-source Ultima 7 engine
+MAINTAINER=	nikkohigashi@gmail.com
+HOMEPAGE=	http://exult.sourceforge.net/
+COMMENT=	Open-source Ultima 7 engine
+LICENSE=	gnu-gpl-v2

-MAKE_JOBS_SAFE=		no
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++

-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		yacc
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+CFLAGS+=	-fpermissive
+LDFLAGS+=	-lz
+CONFIGURE_ARGS+=	--disable-sdltest --disable-oggtest --disable-vorbistest

+.include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/games/exult/PLIST
+++ b/games/exult/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:30:12 wiz Exp $
 bin/expack
 bin/exult
 bin/shp2pcx
@@ -7,12 +7,16 @@ bin/textpack
 bin/ucc
 bin/ucxt
 man/man1/expack.1
+man/man1/exult_studio.1
 man/man1/ipack.1
 man/man1/shp2pcx.1
 man/man1/splitshp.1
 man/man1/textpack.1
+man/man1/ucc.1
 man/man6/exult.6
 share/applications/exult.desktop
+share/exult/bg_mr_faces.vga
+share/exult/bg_paperdol.vga
 share/exult/exult.flx
 share/exult/exult_bg.flx
 share/exult/exult_si.flx
--- a/games/exult/distinfo
+++ b/games/exult/distinfo
@@ -1,45 +1,9 @@
-$NetBSD: distinfo,v 1.7 2012/07/03 18:42:31 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/04/27 16:04:51 joerg Exp $

-SHA1 (exult-1.2.tar.gz) = 81f9d3d428c80990b8e970a4dee5c85a7236dace
-RMD160 (exult-1.2.tar.gz) = 339231edf84507f05115ab3189875cb15be9c04f
-Size (exult-1.2.tar.gz) = 1722259 bytes
-SHA1 (patch-aa) = 2acecb0c4e2da2769559d9603a08930c30b38c72
-SHA1 (patch-ab) = 039fd49b570ad5796a43d86fb679b517c4149f13
-SHA1 (patch-ac) = b92df8fa9c0663b8e37b25b7c3a59e5d58de051a
-SHA1 (patch-actions.cc) = 3844af60c445e8b1c88a59815daf164012175d3b
-SHA1 (patch-ad) = fbb34ab21468afd91caccc35354fbd23df800ca5
-SHA1 (patch-ae) = 3b863379cef2948ff92e9971ffbc37d6b1b0276f
-SHA1 (patch-af) = 43b2369d9dff1fc1aa387c174b3fe7c3e467c2e8
-SHA1 (patch-ag) = 2c8b385bb2346f0e7d11bd8e721a901ec361bb61
-SHA1 (patch-args.cc) = a6f66039c7fdf1396000078b1c28927c0cd0d5e0
-SHA1 (patch-audio_xmidi.cc) = 4b7944fad3fbc3685f0a3edbff013a03feff3f10
-SHA1 (patch-conf_Configuration.cc) = 4c49e9b3ee2f66d77fab32e8cb25c8bf3ac05c3e
-SHA1 (patch-conf_xmain.cc) = e1bc9f77f9642390795d2d8183578f508027a127
-SHA1 (patch-files_Flex.h) = 67c971321cab01286f7398d72274cc575fc39172
-SHA1 (patch-files_IFF.h) = 9dea7c166ebe48c8843be6a0114cb993e18dffb6
-SHA1 (patch-files_Table.cc) = b4379ee2be657c158c0b7d750ac1417d8343ab0a
-SHA1 (patch-files_U7file.cc) = 2147ee8cc5ead5cb06a9823cfb380006ae06a4ba
-SHA1 (patch-files_listfiles.cc) = 3c7ebeba5d64f3c9f758406c1b944e3a289a245e
-SHA1 (patch-files_msgfile.cc) = 8219ffe692b79cad2f9db19adc1e0591d404f315
-SHA1 (patch-files_utils.h) = d170f0afa05f7fb71166c7c01dd6d713411dd680
-SHA1 (patch-imagewin_ibuf8.cc) = d1172573e542e5d0f280049a6c31765005974dcd
-SHA1 (patch-objs_chunkter.cc) = d20c70fae5b61246defe26095113c85b62f9bf32
-SHA1 (patch-party.cc) = e0bba8a1ca0638cc885b2c6363d316feffe5c11b
-SHA1 (patch-server_objserial.cc) = 213b455a213ce538027d2501494c175ebe6dd9c5
-SHA1 (patch-server_server.cc) = 0bdd9e268fe7c87eb5e7abac783bc3c62514af28
-SHA1 (patch-shapes_shapeinf.cc) = a62f192f989c4be0d5d757dc74a5e268216c5a01
-SHA1 (patch-shapes_shapewrite.cc) = 30e33617e5f42b7794b523da1ac5817751f68fc6
-SHA1 (patch-tools_cmanip.cc) = 3bb7231dc1a4bddf430222888b7d83893b9efd1f
-SHA1 (patch-tools_splitshp.cc) = 1eb810b609c5ae5b0b4cae5e043e376c0d6ebd84
-SHA1 (patch-usecode_compiler_ucfun.cc) = aa7d0248b46685c1af42d1114a8f92637bab6b6d
-SHA1 (patch-usecode_compiler_uclex.ll) = 791e55539ebd09011ee5024f6f576bc3a50f87ab
-SHA1 (patch-usecode_compiler_ucloc.cc) = 28e27090fc9a161a49ffa0d570ea1d665d8c40fe
-SHA1 (patch-usecode_compiler_ucloc.h) = a2ed46a6ae96a6634bc5709bba14929a5774d98c
-SHA1 (patch-usecode_compiler_ucmain.cc) = 9f124c0113497f3132f66646aebc21a2e92fce38
-SHA1 (patch-usecode_compiler_ucparse.yy) = 4caa0927da5846b24df3a78af0ea5350064d6080
-SHA1 (patch-usecode_compiler_ucsym.cc) = a68b476a9aa1362051176ad4de5352b6ce610f55
-SHA1 (patch-usecode_ucmachine.cc) = 01db5ff3f6d9c23271dfbd15c50e1c78d9af28a1
-SHA1 (patch-usecode_ucxt_head2data.cc) = 1bb92845f2c7b2368ca6849031e0c9d35affc7e5
-SHA1 (patch-usecode_ucxt_include_ops.h) = aca520d3b8d0d72ae918935f11f164ca0e633a81
-SHA1 (patch-usecode_useval.h) = 101dfb391a00bd99bbdacd4f71f6b22b9c38a214
-SHA1 (patch-vec.h) = 368d369fada797f90ea22919c1410f5b726eae0c
+SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792
+RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914
+Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes
+SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093
+SHA1 (patch-imagewin_manip.h) = d9a90c7fbe046a4079618aeda4c428ef1672525e
+SHA1 (patch-istring.h) = 18e8b49932f7317e6c978c585e1dfe855ac05a51
+SHA1 (patch-usecode_compiler_ucstmt.cc) = 8aadf06c18f347d7de437709e44da86a0783bb1f
--- a/games/exult/patches/patch-aa
+++ b/games/exult/patches/patch-aa
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $
-
--- files/zip/unzip.h.orig	2003-09-20 17:02:02.000000000 +0200
-+++ files/zip/unzip.h
-@@ -54,6 +54,10 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(x)	x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
--- a/games/exult/patches/patch-ab
+++ b/games/exult/patches/patch-ab
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $
-
--- files/zip/zip.h.orig	2003-09-20 17:02:02.000000000 +0200
-+++ files/zip/zip.h
-@@ -58,6 +58,10 @@ extern "C" {
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(x)	x
-+#endif
-+
- #if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
--- a/games/exult/patches/patch-ac
+++ b/games/exult/patches/patch-ac
@@ -1,29 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/11/25 21:53:26 joerg Exp $
-
--- hash_utils.h.orig	2003-08-31 17:32:24.000000000 +0000
-+++ hash_utils.h
-@@ -20,13 +20,14 @@
- #define _HASH_UTILS_H_
- 
- #include "exult_types.h"
-+#include <cstring>
- 
- #ifdef DONT_HAVE_HASH_MAP
- #  include <map>
- #else
- #if HAVE_EXT_HASH_MAP
- #  include <ext/hash_map>
-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
-+#  if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
- using __gnu_cxx::hash_map;
- #  else
- using std::hash_map;
-@@ -44,7 +45,7 @@ using std::hash_map;
- #else
- #if HAVE_EXT_HASH_SET
- #  include <ext/hash_set>
-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
-+#  if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
- using __gnu_cxx::hash_set;
- #  else
- using std::hash_set;
--- a/games/exult/patches/patch-actions.cc
+++ b/games/exult/patches/patch-actions.cc
@@ -1,13 +0,0 @@
-$NetBSD: patch-actions.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- actions.cc.orig	2011-11-25 18:01:36.000000000 +0000
-+++ actions.cc
-@@ -21,6 +21,8 @@
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-+#include <cstring>
-+#include <cstdlib>
- 
- #include "gamewin.h"
- #include "actions.h"
--- a/games/exult/patches/patch-ad
+++ b/games/exult/patches/patch-ad
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/08/24 11:39:21 obache Exp $
-
--- mouse.h.orig	2003-08-31 17:32:24.000000000 +0000
-+++ mouse.h
-@@ -27,6 +27,8 @@
- #include "vgafile.h"
- #include "glshape.h"
- 
-+class Game_window;
-+
- /*
-  *	Handle custom mouse pointers.
-  */
--- a/games/exult/patches/patch-ae
+++ b/games/exult/patches/patch-ae
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/07/27 20:14:14 dholland Exp $
-
--- audio/midi_drivers/fmopldrv.h~	2002-08-06 14:10:31.000000000 -0400
-+++ audio/midi_drivers/fmopldrv.h	2008-07-27 14:03:16.000000000 -0400
-@@ -76,7 +76,7 @@
- 	/* output a packed midi command to the midi stream
- 	 * valid only if mode is MO_SIMPLE
- 	 */
-	void OplDriver::send(uint32 b);
-+	void send(uint32 b);
- 
- 	/* retrieve a string representation of an error code */
- 	static const char *get_error_name(int error_code);
--- a/games/exult/patches/patch-af
+++ b/games/exult/patches/patch-af
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/07/27 20:14:14 dholland Exp $
-
--- usecode/ucxt/include/ucfunc.h~	2003-08-31 13:32:28.000000000 -0400
-+++ usecode/ucxt/include/ucfunc.h	2008-07-27 14:07:35.000000000 -0400
-@@ -206,7 +206,7 @@
- 		bool output_list(std::ostream &o, unsigned int funcno, const UCOptions &options);
- 		
- 		bool output_ucs(std::ostream &o, const FuncMap &funcmap, const std::map<unsigned int, std::string> &intrinsics, const UCOptions &options);
-		std::ostream &UCFunc::output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
-+		std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
- 		std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap,
-                                     unsigned int funcid,
-                                     unsigned int numargs, bool return_var);
--- a/games/exult/patches/patch-ag
+++ b/games/exult/patches/patch-ag
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/07/27 20:14:14 dholland Exp $
-
--- usecode/useval.cc~	2004-05-23 01:07:11.000000000 -0400
-+++ usecode/useval.cc	2008-07-27 14:20:59.000000000 -0400
-@@ -464,7 +464,8 @@
- 		if (buflen < 5)
- 			return -1;
- 		*ptr++ = type;
-		Write4(ptr, (int)value.ptr);
-+		/* this may truncate the pointer! */
-+		Write4(ptr, (int32_t)(intptr_t)value.ptr);
- 		break;
- 	case string_type:
- 		{
--- a/games/exult/patches/patch-args.cc
+++ b/games/exult/patches/patch-args.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-args.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- args.cc.orig	2011-11-25 18:02:23.000000000 +0000
-+++ args.cc
-@@ -24,6 +24,7 @@
- #  include <iostream>
- #endif
- 
-+#include <cstdlib>
- #include "args.h"
- 
- #ifndef UNDER_CE
--- a/games/exult/patches/patch-audio_xmidi.cc
+++ b/games/exult/patches/patch-audio_xmidi.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-audio_xmidi.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- audio/xmidi.cc.orig	2011-11-25 17:44:45.000000000 +0000
-+++ audio/xmidi.cc
-@@ -26,6 +26,7 @@
- #ifndef ALPHA_LINUX_CXX
- #  include <cassert>
- #  include <cstdio>
-+#  include <cstdlib>
- #  include <cmath>
- #  include <iostream>
- #  include <cmath>
--- a/games/exult/patches/patch-conf_Configuration.cc
+++ b/games/exult/patches/patch-conf_Configuration.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-conf_Configuration.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- conf/Configuration.cc.orig	2011-11-25 17:32:44.000000000 +0000
-+++ conf/Configuration.cc
-@@ -28,6 +28,7 @@
- #ifndef ALPHA_LINUX_CXX
- #  include <cassert>
- #  include <cstdio>
-+#  include <cstdlib>
- #endif
- #include <stdio.h>
- #include <iostream>
--- a/games/exult/patches/patch-conf_xmain.cc
+++ b/games/exult/patches/patch-conf_xmain.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-conf_xmain.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- conf/xmain.cc.orig	2011-11-25 17:33:59.000000000 +0000
-+++ conf/xmain.cc
-@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #include "Configuration.h"
- #include <iostream>
- #include <string>
-+#include <cstring>
- #include <cassert>
- #include "common_types.h"
- 
--- a/games/exult/patches/patch-configure
+++ b/games/exult/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2015/04/19 19:30:13 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- configure.orig	2010-10-21 18:26:56.000000000 +0000
+++ configure
+@@ -21550,7 +21550,7 @@ fi
+ # ---------------------------------------------------------------------
+ # Black magic for static linking.
+ # ---------------------------------------------------------------------
+-if test x$ARCH == xmacosx; then
+if test x$ARCH = xmacosx; then
+ 
+ # Check whether --with-macosx-static-lib-path was given.
+ if test "${with_macosx_static_lib_path+set}" = set; then
+@@ -22170,7 +22170,7 @@ if test x$enable_zip_support = xyes ; th
+ 	# if test x$GCC = xyes ; then
+ 	#	ZLIB_LIBS="-Wl,-Bstatic -lz -Wl,-Bdynamic"
+ 	# else
+-	if test x$enable_static_libs == xno -o x$ARCH != xmacosx; then
+	if test x$enable_static_libs = xno -o x$ARCH != xmacosx; then
+ 		ZLIB_LIBS="-lz"
+ 	fi
+ 	# fi
--- a/games/exult/patches/patch-files_Flex.h
+++ b/games/exult/patches/patch-files_Flex.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_Flex.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/Flex.h.orig	2011-11-25 17:26:18.000000000 +0000
-+++ files/Flex.h
-@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #include <vector>
- #include <string>
- #include <iosfwd>
-+#include <cstring>
- #include "common_types.h"
- #include "U7file.h"
- 
--- a/games/exult/patches/patch-files_IFF.h
+++ b/games/exult/patches/patch-files_IFF.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_IFF.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/IFF.h.orig	2011-11-25 17:27:16.000000000 +0000
-+++ files/IFF.h
-@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #include <vector>
- #include <string>
-+#include <cstring>
- #include "common_types.h"
- #include "U7file.h"
- 
--- a/games/exult/patches/patch-files_Table.cc
+++ b/games/exult/patches/patch-files_Table.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_Table.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/Table.cc.orig	2011-11-25 17:26:41.000000000 +0000
-+++ files/Table.cc
-@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #endif
- #include <iostream>
- #include "exceptions.h"
-+#include <cstdlib>
- #include "utils.h"
- 
- using std::string;
--- a/games/exult/patches/patch-files_U7file.cc
+++ b/games/exult/patches/patch-files_U7file.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_U7file.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/U7file.cc.orig	2011-11-25 17:28:14.000000000 +0000
-+++ files/U7file.cc
-@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #  include <cstdio>
- #endif
- #include <iostream>
-+#include <cstdlib>
- 
- #include "U7file.h"
- #include "Flex.h"
--- a/games/exult/patches/patch-files_listfiles.cc
+++ b/games/exult/patches/patch-files_listfiles.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_listfiles.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/listfiles.cc.orig	2011-11-25 17:29:04.000000000 +0000
-+++ files/listfiles.cc
-@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #  include <cstdlib>
- #  include <cctype>
- #  include <cstdio>
-+#  include <cstring>
- #endif
- 
- #include <vector>
--- a/games/exult/patches/patch-files_msgfile.cc
+++ b/games/exult/patches/patch-files_msgfile.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-files_msgfile.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/msgfile.cc.orig	2011-11-25 17:32:19.000000000 +0000
-+++ files/msgfile.cc
-@@ -24,6 +24,7 @@
- 
- #include <iostream>
- #include <vector>
-+#include <cstdlib>
- #include "utils.h"
- 
- using std::istream;
--- a/games/exult/patches/patch-files_utils.h
+++ b/games/exult/patches/patch-files_utils.h
@@ -1,76 +0,0 @@
-$NetBSD: patch-files_utils.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- files/utils.h.orig	2011-11-25 17:29:26.000000000 +0000
-+++ files/utils.h
-@@ -22,6 +22,7 @@
- #ifndef _UTILS_H_
- #define _UTILS_H_
- 
-+#include <cstdio>
- #include <iostream>
- #include <string>
- #ifndef ALPHA_LINUX_CXX
-@@ -70,7 +71,6 @@ inline uint16 Read2
- 	return (b0 | (b1 << 8));
- 	}
- 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
- /*
-  *	Read a 2-byte value from a file.
-  */
-@@ -85,7 +85,6 @@ inline uint16 Read2
- 	std::fread(&b1,sizeof(uint8),1,in);
- 	return (b0 | (b1 << 8));
- 	}
-#endif
- 
- /*
-  *	Read a 2-byte value, hsb first.
-@@ -113,7 +112,6 @@ inline uint16 Read2high
- 	return ((b0 << 8) | b1);
- 	}
- 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
- /*
-  *	Read a 2-byte value from a file.
-  */
-@@ -128,7 +126,6 @@ inline uint16 Read2high
- 	std::fread(&b1,sizeof(uint8),1,in);
- 	return ((b0 << 8) | b1);
- 	}
-#endif
- 
- /*
-  *	Read a 4-byte long value, lsb first.
-@@ -160,7 +157,6 @@ inline uint32 Read4
- 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
- 	}
- 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
- /*
-  *	Read a 4-byte value from a file.
-  */
-@@ -177,7 +173,6 @@ inline uint32 Read4
- 	std::fread(&b3,sizeof(uint8),1,in);
- 	return (b0 | (b1<<8) | (b2<<16) | (b3<<24));
- 	}
-#endif
- /*
-  *	Read a 4-byte long value, hsb first.
-  */
-@@ -208,7 +203,6 @@ inline uint32 Read4high
- 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
- 	}
- 
-#ifdef BUFSIZ	/* Kludgy, but I don't want to include stdio.h all the time.*/
- /*
-  *	Read a 4-byte value from a file.
-  */
-@@ -225,7 +219,6 @@ inline uint32 Read4high
- 	std::fread(&b3,sizeof(uint8),1,in);
- 	return ((b0<<24) | (b1<<16) | (b2<<8) | b3);
- 	}
-#endif
- 
- /*
-  *	Write a 1-byte value.
--- a/games/exult/patches/patch-imagewin_ibuf8.cc
+++ b/games/exult/patches/patch-imagewin_ibuf8.cc
@@ -1,13 +0,0 @@
-$NetBSD: patch-imagewin_ibuf8.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- imagewin/ibuf8.cc.orig	2011-11-25 17:36:29.000000000 +0000
-+++ imagewin/ibuf8.cc
-@@ -25,6 +25,8 @@
- 
- #include "ibuf8.h"
- #ifndef ALPHA_LINUX_CXX
-+#  include <cstring>
-+#  include <cstdlib>
- #  include <string>
- #  include <iostream>
- #endif
--- a/games/exult/patches/patch-imagewin_manip.h
+++ b/games/exult/patches/patch-imagewin_manip.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-imagewin_manip.h,v 1.1 2015/04/25 00:56:04 joerg Exp $
+
+Reference to member of base class must be explicit.
+
+--- imagewin/manip.h.orig	2015-04-25 00:01:37.000000000 +0000
+++ imagewin/manip.h
+@@ -319,7 +319,7 @@ public:
+ 	static uintD copy(uintS src)
+ 	{
+ 		unsigned int r, g, b;
+-		split_source(src,r,g,b);
+		ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b);
+ 		return ManipBaseDest<color_d>::rgb(r,g,b);
+ 	}
+ 	static void copy(uintD& dest, uintS src)
--- a/games/exult/patches/patch-istring.h
+++ b/games/exult/patches/patch-istring.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-istring.h,v 1.1 2015/04/25 00:56:04 joerg Exp $
+
+append does not depend on the template, so make reference explicit.
+
+--- istring.h.orig	2015-04-24 23:56:35.000000000 +0000
+++ istring.h
+@@ -162,19 +162,19 @@ public:
+ 
+ 	_Myt& operator+=(const _Myt& _Right)
+ 		{	// append _Right
+-		append(_Right);
+		this->append(_Right);
+ 		return (*this);
+ 		}
+ 
+ 	_Myt& operator+=(const _Elem *_Ptr)
+ 		{	// append [_Ptr, <null>)
+-		append(_Ptr);
+		this->append(_Ptr);
+ 		return (*this);
+ 		}
+ 
+ 	_Myt& operator+=(_Elem _Ch)
+ 		{	// append 1 * _Ch
+-		append(static_cast<size_type>(1), _Ch);
+		this->append(static_cast<size_type>(1), _Ch);
+ 		return (*this);
+ 		}
+ 
--- a/games/exult/patches/patch-objs_chunkter.cc
+++ b/games/exult/patches/patch-objs_chunkter.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-objs_chunkter.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- objs/chunkter.cc.orig	2011-11-25 17:56:42.000000000 +0000
-+++ objs/chunkter.cc
-@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #ifdef INCL_OPENGL
- #include "glshape.h"
- #endif
-+#include <cstring>
- 
- Chunk_terrain *Chunk_terrain::render_queue = 0;
- int Chunk_terrain::queue_size = 0;
--- a/games/exult/patches/patch-party.cc
+++ b/games/exult/patches/patch-party.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-party.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- party.cc.orig	2011-11-25 18:04:22.000000000 +0000
-+++ party.cc
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstring>
- #include <string>
- #include "party.h"
- #include "actors.h"
--- a/games/exult/patches/patch-server_objserial.cc
+++ b/games/exult/patches/patch-server_objserial.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-server_objserial.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- server/objserial.cc.orig	2011-11-25 17:58:05.000000000 +0000
-+++ server/objserial.cc
-@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #include "objserial.h"
- #include "servemsg.h"
- #include <iostream>
-+#include <cstring>
- 
- using std::cout;
- using std::endl;
--- a/games/exult/patches/patch-server_server.cc
+++ b/games/exult/patches/patch-server_server.cc
@@ -1,13 +0,0 @@
-$NetBSD: patch-server_server.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- server/server.cc.orig	2011-11-25 18:01:01.000000000 +0000
-+++ server/server.cc
-@@ -45,6 +45,8 @@ Foundation, Inc., 59 Temple Place - Suit
- #endif
- 
- #include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- 
- #ifdef _AIX
- #include <strings.h>
--- a/games/exult/patches/patch-shapes_shapeinf.cc
+++ b/games/exult/patches/patch-shapes_shapeinf.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-shapes_shapeinf.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- shapes/shapeinf.cc.orig	2011-11-25 17:35:12.000000000 +0000
-+++ shapes/shapeinf.cc
-@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #include "utils.h"
- #include <iomanip>	/* Debugging */
-+#include <cstring>
- using std::cout;
- using std::endl;
- 
--- a/games/exult/patches/patch-shapes_shapewrite.cc
+++ b/games/exult/patches/patch-shapes_shapewrite.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-shapes_shapewrite.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- shapes/shapewrite.cc.orig	2011-11-25 17:35:49.000000000 +0000
-+++ shapes/shapewrite.cc
-@@ -24,6 +24,7 @@
- #  include <config.h>
- #endif
- 
-+#include <cstring>
- #include "shapevga.h"
- #include "shapeinf.h"
- #include "monstinf.h"
--- a/games/exult/patches/patch-tools_cmanip.cc
+++ b/games/exult/patches/patch-tools_cmanip.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-tools_cmanip.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- tools/cmanip.cc.orig	2011-11-25 17:39:15.000000000 +0000
-+++ tools/cmanip.cc
-@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #ifndef ALPHA_LINUX_CXX
- #  include <cstdio>
-+#  include <cstdlib>
- #endif
- #include "Configuration.h"
- #include <iostream>
--- a/games/exult/patches/patch-tools_splitshp.cc
+++ b/games/exult/patches/patch-tools_splitshp.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-tools_splitshp.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- tools/splitshp.cc.orig	2011-11-25 17:38:30.000000000 +0000
-+++ tools/splitshp.cc
-@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #ifndef ALPHA_LINUX_CXX
- #  include <cstdio>
-+#  include <cstdlib>
- #  include <cstring>
- #  include <string>
- #endif
--- a/games/exult/patches/patch-usecode_compiler_ucfun.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucfun.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucfun.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/compiler/ucfun.cc.orig	2011-11-25 17:50:25.000000000 +0000
-+++ usecode/compiler/ucfun.cc
-@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #include <stdio.h>
- #include <cassert>
-+#include <cstring>
- #include "ucfun.h"
- #include "ucstmt.h"
- #include "utils.h"
--- a/games/exult/patches/patch-usecode_compiler_uclex.ll
+++ b/games/exult/patches/patch-usecode_compiler_uclex.ll
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_compiler_uclex.ll,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/compiler/uclex.ll.orig	2011-11-25 17:49:15.000000000 +0000
-+++ usecode/compiler/uclex.ll
-@@ -23,6 +23,7 @@ along with this program; if not, write t
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
- 
-+#include <cstring>
- #include <string>
- #include <vector>
- #include "ucparse.h"
--- a/games/exult/patches/patch-usecode_compiler_ucloc.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucloc.cc
@@ -1,24 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucloc.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $
-
- use standard headers
- const correctness demanded by gcc 4.5
-
--- usecode/compiler/ucloc.cc.orig	2002-06-04 21:00:00.000000000 +0000
-+++ usecode/compiler/ucloc.cc
-@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #endif
- 
- #include <iostream>
-+#include <cstring>
- #include "ucloc.h"
- 
- using std::strcmp;
-@@ -88,7 +89,7 @@ void Uc_location::error
- 
- void Uc_location::yyerror
- 	(
-	char *s
-+	const char *s
- 	)
- 	{
- 	cout << cur_source << ':' << cur_line + 1 << ": " << s << endl;
--- a/games/exult/patches/patch-usecode_compiler_ucloc.h
+++ b/games/exult/patches/patch-usecode_compiler_ucloc.h
@@ -1,15 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucloc.h,v 1.1 2011/12/21 16:58:15 dholland Exp $
-
- const correctness demanded by gcc 4.5
-
--- usecode/compiler/ucloc.h~	2001-04-16 10:00:43.000000000 +0000
-+++ usecode/compiler/ucloc.h
-@@ -50,7 +50,7 @@ public:
- 	const char *get_source()
- 		{ return source; }
- 	void error(char *s);		// Print error.
-	static void yyerror(char *s);	// Print error at cur. location.
-+	static void yyerror(const char *s);	// Print error at cur. location.
- 	static int get_num_errors()
- 		{ return num_errors; }
- 	};
--- a/games/exult/patches/patch-usecode_compiler_ucmain.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucmain.cc
@@ -1,24 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucmain.cc,v 1.2 2011/12/21 16:58:15 dholland Exp $
-
- - use standard headers
- - const correctness demanded by gcc 4.5
-
--- usecode/compiler/ucmain.cc.orig	2003-09-18 06:37:05.000000000 +0000
-+++ usecode/compiler/ucmain.cc
-@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #include <fstream>
- #include <unistd.h>
- #include <stdio.h>
-+#include <cstring>
- #include <string>
- #include <vector>
- #include "ucloc.h"
-@@ -133,7 +134,7 @@ int main
-  */
- void yyerror
- 	(
-	char *s
-+	const char *s
- 	)
- 	{
- 	Uc_location::yyerror(s);
--- a/games/exult/patches/patch-usecode_compiler_ucparse.yy
+++ b/games/exult/patches/patch-usecode_compiler_ucparse.yy
@@ -1,25 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucparse.yy,v 1.2 2011/12/21 16:58:15 dholland Exp $
-
- - use standard headers
- - const correctness demanded by gcc 4.5
-
--- usecode/compiler/ucparse.yy.orig	2003-09-18 06:37:05.000000000 +0000
-+++ usecode/compiler/ucparse.yy
-@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
-#include <string.h>
-+#include <cstring>
- #include <vector>
- 
- #include "ucfun.h"
-@@ -42,7 +42,7 @@ using std::strcpy;
- using std::strcat;
- using std::strlen;
- 
-void yyerror(char *);
-+void yyerror(const char *);
- extern int yylex();
- static Uc_array_expression *Create_array(int, Uc_expression *);
- static Uc_array_expression *Create_array(int, Uc_expression *, 
--- a/games/exult/patches/patch-usecode_compiler_ucstmt.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucstmt.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-usecode_compiler_ucstmt.cc,v 1.1 2015/04/25 00:56:04 joerg Exp $
+
+Key function must not be inline, otherwise the vtable is not created.
+
+--- usecode/compiler/ucstmt.cc.orig	2015-04-25 00:38:04.000000000 +0000
+++ usecode/compiler/ucstmt.cc
+@@ -808,7 +808,7 @@ void Uc_converse_statement::gen
+  *	Delete.
+  */
+ 
+-inline Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement
+Uc_switch_expression_case_statement::~Uc_switch_expression_case_statement
+ 	(
+ 	)
+ 	{
--- a/games/exult/patches/patch-usecode_compiler_ucsym.cc
+++ b/games/exult/patches/patch-usecode_compiler_ucsym.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_compiler_ucsym.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/compiler/ucsym.cc.orig	2011-11-25 17:51:14.000000000 +0000
-+++ usecode/compiler/ucsym.cc
-@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suit
- #endif
- 
- 
-+#include <cstring>
- #include <stdio.h>
- #include "ucsym.h"
- #include "opcodes.h"
--- a/games/exult/patches/patch-usecode_ucmachine.cc
+++ b/games/exult/patches/patch-usecode_ucmachine.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_ucmachine.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/ucmachine.cc.orig	2011-11-25 17:54:27.000000000 +0000
-+++ usecode/ucmachine.cc
-@@ -23,6 +23,7 @@
- #  include <config.h>
- #endif
- 
-+#include <cstring>
- #include "ucmachine.h"
- #include "keyring.h"
- #include "conversation.h"
--- a/games/exult/patches/patch-usecode_ucxt_head2data.cc
+++ b/games/exult/patches/patch-usecode_ucxt_head2data.cc
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_ucxt_head2data.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/ucxt/head2data.cc.orig	2011-11-25 17:51:52.000000000 +0000
-+++ usecode/ucxt/head2data.cc
-@@ -8,6 +8,7 @@
- #include <iomanip>
- #include <vector>
- #include <fstream>
-+#include <cstdlib>
- 
- using std::cout;
- using std::cerr;
--- a/games/exult/patches/patch-usecode_ucxt_include_ops.h
+++ b/games/exult/patches/patch-usecode_ucxt_include_ops.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_ucxt_include_ops.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/ucxt/include/ops.h.orig	2011-11-25 17:52:40.000000000 +0000
-+++ usecode/ucxt/include/ops.h
-@@ -19,6 +19,7 @@
- #ifndef OPCODES_H
- #define OPCODES_H
- 
-+#include <cstdlib>
- #include <map>
- #include <string>
- #include <vector>
--- a/games/exult/patches/patch-usecode_useval.h
+++ b/games/exult/patches/patch-usecode_useval.h
@@ -1,12 +0,0 @@
-$NetBSD: patch-usecode_useval.h,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
--- usecode/useval.h.orig	2011-11-25 17:54:48.000000000 +0000
-+++ usecode/useval.h
-@@ -23,6 +23,7 @@
- #define USEVAL_H	1
- 
- #include <cassert>
-+#include <cstdlib>
- #include <iostream>
- 
- #include <vector>	// STL container
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`All-In-One Audio Data pack containing sfx and music for Exult.`