Update to 1.3.21.

5 files changed, 13 insertions, 25 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 905a3c2e065f..40d16fa4b502 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.3.16
+PORTVERSION=	1.3.21
 CATEGORIES=	games
 MASTER_SITES=	ftp://asc-hq.sourceforge.net/pub/asc-hq/develop/ \
-		ftp://asc-hq.sourceforge.net/pub/asc-hq/ \
-		http://www.asc-hq.org/develop/ \
-		http://www.asc-hq.org/
+		http://www.asc-hq.org/develop/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-beta.src
 
 MAINTAINER=	sobomax@FreeBSD.org
diff --git a/games/asc/distinfo b/games/asc/distinfo
index 99afa0abb11a..fe55f17ac7f8 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1 +1 @@
-MD5 (asc-1.3.16-beta.src.tar.gz) = 053f4b8f6bc65c2f75422648663b6c1c
+MD5 (asc-1.3.21-beta.src.tar.gz) = 21c62e6762803e832b55c4adfbabdd5f
diff --git a/games/asc/files/patch-source::ai::ai_common.h b/games/asc/files/patch-source::ai::ai_common.h
deleted file mode 100644
index 8ca11460c2a7..000000000000
--- a/games/asc/files/patch-source::ai::ai_common.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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::tools::linux::Makefile.in b/games/asc/files/patch-source::tools::linux::Makefile.in
index 3eb3fe9ebafd..94087c7fc049 100644
--- a/games/asc/files/patch-source::tools::linux::Makefile.in
+++ b/games/asc/files/patch-source::tools::linux::Makefile.in
@@ -1,11 +1,11 @@
 
 $FreeBSD$
 
---- 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
+--- 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
  
 -asc_mount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
 -asc_demount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
@@ -13,16 +13,18 @@ $FreeBSD$
 -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@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
-@@ -95,7 +95,7 @@
+@@ -102,7 +102,7 @@
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
@@ -30,4 +32,4 @@ $FreeBSD$
 +CPPFLAGS = @CPPFLAGS@ -DPREFIX=\"$(prefix)\"
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
- asc_demount_OBJECTS =  demount.o basestrm.o misc.o ascstring.o
+ asc_demount_OBJECTS =  demount.o basestrm.o misc.o ascstring.o \
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index 7b1ff4c8dc85..97811ccfac4b 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -6,6 +6,7 @@ bin/asc_map2pcx
 bin/asc_mapedit
 bin/asc_mntgraph
 bin/asc_mount
+bin/asc_tank2pcx
 bin/asc_viewid
 share/asc/main.con
 @dirrm share/asc