Update to 1.5.13.

9 files changed, 49 insertions, 90 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 953dd6c56455..849a066ae5b2 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.3.21
+PORTVERSION=	1.5.13
 CATEGORIES=	games
 MASTER_SITES=	ftp://asc-hq.sourceforge.net/pub/asc-hq/develop/ \
 		http://www.asc-hq.org/develop/
@@ -16,7 +16,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		SDLmm.8:${PORTSDIR}/devel/sdlmm
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
diff --git a/games/asc/distinfo b/games/asc/distinfo
index fe55f17ac7f8..4cf32202fa36 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1 +1 @@
-MD5 (asc-1.3.21-beta.src.tar.gz) = 21c62e6762803e832b55c4adfbabdd5f
+MD5 (asc-1.5.13-beta.src.tar.gz) = 1c4aa01b6e53f968c9ca68ad102f00b3
diff --git a/games/asc/files/patch-source::sdl::sound.cpp b/games/asc/files/patch-source::sdl::sound.cpp
deleted file mode 100644
index 9b76e5b32115..000000000000
--- a/games/asc/files/patch-source::sdl::sound.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- source/sdl/sound.cpp	2001/02/16 21:38:57	1.1
-+++ source/sdl/sound.cpp	2001/02/16 21:39:17
-@@ -21,8 +21,8 @@
- #include <string.h>
- #include <stdlib.h>
- //#include <unistd.h>
--//#include <SDL/SDL_audio.h>
--//#include <SDL/SDL_error.h>
-+//#include <SDL_audio.h>
-+//#include <SDL_error.h>
- 
- #include "../global.h"
- #include sdlheader
diff --git a/games/asc/files/patch-source::sg.cpp b/games/asc/files/patch-source::sg.cpp
deleted file mode 100644
index d84987dbc767..000000000000
--- a/games/asc/files/patch-source::sg.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- source/sg.cpp	2001/02/17 16:28:29	1.1
-+++ source/sg.cpp	2001/02/17 16:28:40
-@@ -1262,7 +1259,7 @@
-                else {
-                   delete actmap;
-                   actmap = NULL;
--                  throw NoMapLoaded();
-+                  goto except1;
-                }
-             }
-          } else
-@@ -1273,7 +1270,7 @@
-          if (choice_dlg("Do you want to continue playing ?","~y~es","~n~o") == 2) {
-             delete actmap;
-             actmap = NULL;
--            throw NoMapLoaded();
-+            goto except1;
-          } else {
-             actmap->continueplaying = 1;
-             if ( actmap->replayinfo ) {
-@@ -1283,6 +1280,10 @@
-          }
-       }
-    }
-+   return;
-+
-+except1:
-+   throw NoMapLoaded();
- }
- 
- 
diff --git a/games/asc/files/patch-source::tools::linux::Makefile.in b/games/asc/files/patch-source::tools::linux::Makefile.in
index 94087c7fc049..5f9822b2929b 100644
--- a/games/asc/files/patch-source::tools::linux::Makefile.in
+++ b/games/asc/files/patch-source::tools::linux::Makefile.in
@@ -1,30 +1,34 @@
 
 $FreeBSD$
 
---- source/tools/linux/Makefile.in.orig	Mon Jul  9 00:38:22 2001
-+++ source/tools/linux/Makefile.in	Mon Jul  9 13:58:41 2001
-@@ -88,13 +88,13 @@
- asc_viewid_SOURCES = viewid.cpp    basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp strtmesg.cpp
- asc_tank2pcx_SOURCES = pcxtank.cpp   basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp strtmesg.cpp
+--- source/tools/linux/Makefile.in.orig	Tue Aug 28 16:26:40 2001
++++ source/tools/linux/Makefile.in	Mon Sep  3 17:29:36 2001
+@@ -91,15 +91,15 @@
+ asc_bin2text_SOURCES = bin2text.cpp     basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp strtmesg.cpp textfileparser.cpp terraintype.cpp objecttype.cpp textfiletags.cpp itemrepository.cpp 
+ asc_weaponguide_SOURCES = weaponguide.cpp  basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp strtmesg.cpp textfileparser.cpp terraintype.cpp objecttype.cpp textfiletags.cpp itemrepository.cpp
  
--asc_mount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
--asc_demount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
--asc_gfx2pcx_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
--asc_makegfx_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
--asc_mntgraph_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
--asc_viewid_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
--asc_tank2pcx_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
-+asc_mount_LDADD = @LDADDLIBBZ2@
-+asc_demount_LDADD = @LDADDLIBBZ2@
-+asc_gfx2pcx_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
-+asc_makegfx_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
-+asc_mntgraph_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
-+asc_viewid_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
-+asc_tank2pcx_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
+-asc_mount_LDADD = -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_demount_LDADD = -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_gfx2pcx_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_makegfx_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_mntgraph_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_viewid_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_tank2pcx_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_bin2text_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
+-asc_weaponguide_LDADD = ../../sdl/libsdl.a -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
++asc_mount_LDADD = -lSDLmm @LDADDLIBBZ2@
++asc_demount_LDADD = -lSDLmm @LDADDLIBBZ2@
++asc_gfx2pcx_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_makegfx_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_mntgraph_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_viewid_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_tank2pcx_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_bin2text_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
++asc_weaponguide_LDADD = ../../sdl/libsdl.a -lSDLmm @LDADDLIBBZ2@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
-@@ -102,7 +102,7 @@
+@@ -107,7 +107,7 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
diff --git a/games/asc/files/patch-source::unix::Makefile.in b/games/asc/files/patch-source::unix::Makefile.in
index 35941f7b97c2..53fd5aec8e57 100644
--- a/games/asc/files/patch-source::unix::Makefile.in
+++ b/games/asc/files/patch-source::unix::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- source/unix/Makefile.in	2001/05/22 19:36:17	1.1
-+++ source/unix/Makefile.in	2001/05/22 19:47:11
+--- source/unix/Makefile.in.orig	Tue Aug 28 16:26:40 2001
++++ source/unix/Makefile.in	Mon Sep  3 17:31:54 2001
 @@ -78,12 +78,12 @@
- asc_SOURCES = unitctrl.cpp soundList.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp sg.cpp pd.cpp palette.cpp newfont.cpp network.cpp missions.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp gui.cpp gamedlg.cpp dlg_box.cpp dialog.cpp controls.cpp building.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp astar2.cpp vehicletype.cpp buildingtype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp replay.cpp research.cpp mapdisplay.cpp resourcenet.cpp dashboard.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp 
+ asc_SOURCES = unitctrl.cpp soundList.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp sg.cpp pd.cpp palette.cpp newfont.cpp network.cpp missions.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp gui.cpp gamedlg.cpp dlg_box.cpp dialog.cpp controls.cpp building.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp astar2.cpp vehicletype.cpp buildingtype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp replay.cpp research.cpp mapdisplay.cpp resourcenet.cpp dashboard.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp textfileparser.cpp terraintype.cpp objecttype.cpp textfiletags.cpp itemrepository.cpp
  
  
--asc_LDADD = ../ai/libai.a ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@
-+asc_LDADD = ../ai/libai.a ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@
+-asc_LDADD = ../ai/libai.a ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image -lSDL_mixer -lSDLmm @LDADDLIBBZ2@
++asc_LDADD = ../ai/libai.a ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL_image -lSDL_mixer -lSDLmm @LDADDLIBBZ2@
  
  
  SUBDIRS = mapeditor
diff --git a/games/asc/files/patch-source::unix::global_os.h b/games/asc/files/patch-source::unix::global_os.h
index 972d582ed214..477e2318671e 100644
--- a/games/asc/files/patch-source::unix::global_os.h
+++ b/games/asc/files/patch-source::unix::global_os.h
@@ -1,18 +1,20 @@
 
 $FreeBSD$
 
---- source/unix/global_os.h	2001/05/22 19:32:32	1.1
-+++ source/unix/global_os.h	2001/05/22 19:33:06
-@@ -43,7 +43,7 @@
+--- source/unix/global_os.h.orig	Mon Sep  3 17:26:45 2001
++++ source/unix/global_os.h	Mon Sep  3 17:32:50 2001
+@@ -53,8 +53,8 @@
   #define global_os_h_included
  
    #ifndef minimalIO
 -   #define sdlheader "SDL/SDL.h"
+-   #define sdlmixerheader "SDL/SDL_mixer.h"
 +   #define sdlheader "SDL.h"
++   #define sdlmixerheader "SDL_mixer.h"
     #include sdlheader
    #endif 
  
-@@ -60,7 +60,7 @@
+@@ -77,7 +77,7 @@
    #endif
  
    #define CASE_SENSITIVE_FILE_NAMES 1
diff --git a/games/asc/files/patch-source::unix::mapeditor::Makefile.in b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
index 2f7ab092a15d..cb6ccd30af76 100644
--- a/games/asc/files/patch-source::unix::mapeditor::Makefile.in
+++ b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- source/unix/mapeditor/Makefile.in	2001/05/22 19:36:17	1.1
-+++ source/unix/mapeditor/Makefile.in	2001/05/22 19:39:11
+--- source/unix/mapeditor/Makefile.in.orig	Tue Aug 28 16:26:40 2001
++++ source/unix/mapeditor/Makefile.in	Mon Sep  3 17:34:12 2001
 @@ -76,15 +76,15 @@
  SGML2MAN = @SGML2MAN@
  VERSION = @VERSION@
@@ -12,13 +12,13 @@ $FreeBSD$
  
  bin_PROGRAMS = asc_mapedit asc_map2pcx
  
- asc_mapedit_SOURCES = edevents.cpp edgen.cpp edglobal.cpp edmain.cpp edselfnt.cpp edmisc.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp resourcenet.cpp
--asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread @LDADDLIBBZ2@
-+asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a @LDADDLIBBZ2@
+ asc_mapedit_SOURCES = edevents.cpp edgen.cpp edglobal.cpp edmain.cpp edselfnt.cpp edmisc.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp resourcenet.cpp textfileparser.cpp terraintype.cpp objecttype.cpp textfiletags.cpp itemrepository.cpp
+-asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image -lSDLmm @LDADDLIBBZ2@
++asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL_image -lSDLmm @LDADDLIBBZ2@
  
- asc_map2pcx_SOURCES = map2pcx.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp resourcenet.cpp
--asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@
-+asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@
+ asc_map2pcx_SOURCES = map2pcx.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp resourcenet.cpp textfileparser.cpp terraintype.cpp objecttype.cpp textfiletags.cpp itemrepository.cpp
+-asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image -lSDLmm @LDADDLIBBZ2@
++asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL_image -lSDLmm @LDADDLIBBZ2@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index 97811ccfac4b..983718679c95 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -1,4 +1,5 @@
 bin/asc
+bin/asc_bin2text
 bin/asc_demount
 bin/asc_gfx2pcx
 bin/asc_makegfx
@@ -8,5 +9,6 @@ bin/asc_mntgraph
 bin/asc_mount
 bin/asc_tank2pcx
 bin/asc_viewid
+bin/asc_weaponguide
 share/asc/main.con
 @dirrm share/asc