diff options
Diffstat (limited to 'games/asc')
| -rw-r--r-- | games/asc/Makefile | 2 | ||||
| -rw-r--r-- | games/asc/distinfo | 2 | ||||
| -rw-r--r-- | games/asc/files/patch-source::Makefile.in | 12 | ||||
| -rw-r--r-- | games/asc/files/patch-source::ai::ai_common.h | 13 | ||||
| -rw-r--r-- | games/asc/files/patch-source::artint.cpp | 13 | ||||
| -rw-r--r-- | games/asc/files/patch-source::mapedit::Makefile.in | 8 | ||||
| -rw-r--r-- | games/asc/files/patch-source::tools::linux::Makefile.in | 12 | ||||
| -rw-r--r-- | games/asc/pkg-plist | 1 |
8 files changed, 33 insertions, 30 deletions
diff --git a/games/asc/Makefile b/games/asc/Makefile index be58e01255d6..e977524fe6ad 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= asc -PORTVERSION= 1.3.12 +PORTVERSION= 1.3.13 CATEGORIES= games MASTER_SITES= ftp://asc-hq.sourceforge.net/pub/asc-hq/develop/ \ ftp://asc-hq.sourceforge.net/pub/asc-hq/ \ diff --git a/games/asc/distinfo b/games/asc/distinfo index b67429d72556..1f73a48709c8 100644 --- a/games/asc/distinfo +++ b/games/asc/distinfo @@ -1,2 +1,2 @@ -MD5 (asc-1.3.12-beta.src.tar.gz) = 9663bd7a9d1b6533551fb0fc0e10cea8 +MD5 (asc-1.3.13-beta.src.tar.gz) = e4a2ea5030da7c541d4a7934f3ceec1a MD5 (main.con) = c9fee6c3e554742612dbeb02fd0700e3 diff --git a/games/asc/files/patch-source::Makefile.in b/games/asc/files/patch-source::Makefile.in index e24655b5e827..6797c105b726 100644 --- a/games/asc/files/patch-source::Makefile.in +++ b/games/asc/files/patch-source::Makefile.in @@ -1,17 +1,17 @@ $FreeBSD$ ---- source/Makefile.in 2001/02/17 15:51:24 1.1 -+++ source/Makefile.in 2001/02/17 16:16:56 +--- source/Makefile.in.orig Mon Apr 2 11:30:54 2001 ++++ source/Makefile.in Wed Apr 11 11:36:32 2001 @@ -73,7 +73,7 @@ - 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 artint.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 + 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_LDADD = ./sdl/libsdl.a ./libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@ -+asc_LDADD = ./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 @LDADDLIBBZ2@ ++asc_LDADD = ./ai/libai.a ./sdl/libsdl.a ./libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@ - SUBDIRS = docs sdl libs mapedit tools + SUBDIRS = docs sdl libs mapedit tools ai @@ -88,7 +88,7 @@ diff --git a/games/asc/files/patch-source::ai::ai_common.h b/games/asc/files/patch-source::ai::ai_common.h new file mode 100644 index 000000000000..8ca11460c2a7 --- /dev/null +++ b/games/asc/files/patch-source::ai::ai_common.h @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- source/ai/ai_common.h 2001/04/11 09:18:02 1.1 ++++ source/ai/ai_common.h 2001/04/11 09:18:09 +@@ -25,6 +25,7 @@ + #include <math.h> + #include <algorithm> + #include <memory> ++#include <machine/float.h> + + #include "ai.h" + diff --git a/games/asc/files/patch-source::artint.cpp b/games/asc/files/patch-source::artint.cpp deleted file mode 100644 index 3ac998e0de9b..000000000000 --- a/games/asc/files/patch-source::artint.cpp +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- source/artint.cpp 2001/02/17 15:35:48 1.1 -+++ source/artint.cpp 2001/02/17 15:36:28 -@@ -136,6 +136,7 @@ - #include <math.h> - #include <algorithm> - #include <memory> -+#include <machine/float.h> - - #include "artint.h" - diff --git a/games/asc/files/patch-source::mapedit::Makefile.in b/games/asc/files/patch-source::mapedit::Makefile.in index c9482f477620..e81303c41214 100644 --- a/games/asc/files/patch-source::mapedit::Makefile.in +++ b/games/asc/files/patch-source::mapedit::Makefile.in @@ -1,16 +1,16 @@ $FreeBSD$ ---- source/mapedit/Makefile.in.orig Mon Feb 26 14:37:52 2001 -+++ source/mapedit/Makefile.in Sat Mar 10 15:32:13 2001 +--- source/mapedit/Makefile.in.orig Tue Apr 3 15:57:37 2001 ++++ source/mapedit/Makefile.in Wed Apr 11 11:40:53 2001 @@ -76,10 +76,10 @@ bin_PROGRAMS = ascmapedit ascmap2pcx - ascmapedit_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 + ascmapedit_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 -ascmapedit_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread @LDADDLIBBZ2@ +ascmapedit_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a @LDADDLIBBZ2@ - ascmap2pcx_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 + ascmap2pcx_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 -ascmap2pcx_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@ +ascmap2pcx_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/games/asc/files/patch-source::tools::linux::Makefile.in b/games/asc/files/patch-source::tools::linux::Makefile.in index 843d615067f7..3eb3fe9ebafd 100644 --- a/games/asc/files/patch-source::tools::linux::Makefile.in +++ b/games/asc/files/patch-source::tools::linux::Makefile.in @@ -1,26 +1,28 @@ $FreeBSD$ ---- source/tools/linux/Makefile.in 2001/03/10 14:10:17 1.1 -+++ source/tools/linux/Makefile.in 2001/03/10 14:19:07 -@@ -81,11 +81,11 @@ - asc_makegfx_SOURCES = makegfx.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 +--- source/tools/linux/Makefile.in.orig Tue Apr 3 15:57:52 2001 ++++ source/tools/linux/Makefile.in Wed Apr 11 11:42:46 2001 +@@ -82,12 +82,12 @@ asc_mntgraph_SOURCES = mntgraph.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 + 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 -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_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@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = -@@ -93,7 +93,7 @@ +@@ -95,7 +95,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../../.. diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist index 9ac5e34f0edb..bb79e1080597 100644 --- a/games/asc/pkg-plist +++ b/games/asc/pkg-plist @@ -4,6 +4,7 @@ bin/asc_gfx2pcx bin/asc_makegfx bin/asc_mntgraph bin/asc_mount +bin/asc_viewid bin/ascmap2pcx bin/ascmapedit share/asc/main.con |