Update to 1.9.5.4.

5 files changed, 18 insertions, 46 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 41ac186759c5..4e2e440e387a 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	asc-hq
diff --git a/games/asc/distinfo b/games/asc/distinfo
index a5baf58c09af..f8c9aaedeac6 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1 +1 @@
-MD5 (asc-source-1.9.4.tar.gz) = 5fec58752593ac2867702fb0e3aad4fa
+MD5 (asc-source-1.9.5.4.tar.gz) = ca60d279765f1c2d64b2141a222642cc
diff --git a/games/asc/files/patch-configure b/games/asc/files/patch-configure
index fbb1cd727031..9c27bc2cd084 100644
--- a/games/asc/files/patch-configure
+++ b/games/asc/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Oct 22 12:26:35 2001
-+++ configure	Mon Oct 22 13:58:39 2001
-@@ -1710,7 +1710,7 @@
+--- configure.orig	Tue Dec 11 12:50:51 2001
++++ configure	Tue Dec 11 12:52:36 2001
+@@ -1709,7 +1709,7 @@
  
  
  
@@ -12,53 +12,24 @@ $FreeBSD$
                  game_datadir=`(
                       test "x$prefix" = xNONE && prefix="$ac_default_prefix"
                       test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-@@ -1722,16 +1722,16 @@
- EOF
+@@ -1729,16 +1729,16 @@
+ fi
  
  
 -ac_safe=`echo "SDL/SDL.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for SDL/SDL.h""... $ac_c" 1>&6
--echo "configure:1728: checking for SDL/SDL.h" >&5
+-echo "configure:1735: checking for SDL/SDL.h" >&5
 +ac_safe=`echo "SDL.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for SDL.h""... $ac_c" 1>&6
-+echo "configure:1728: checking for SDL.h" >&5
++echo "configure:1735: checking for SDL.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 1733 "configure"
+ #line 1740 "configure"
  #include "confdefs.h"
 -#include <SDL/SDL.h>
 +#include <SDL.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -2646,7 +2646,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "Makefile source/Makefile source/docs/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile source/Makefile source/docs/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile  doc/manpages/Makefile source/Makefile source/docs/Makefile source/clparser/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile source/unix/mapeditor/Makefile source/tools/Makefile source/tools/linux/Makefile data/Makefile data/moredata/Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -2744,7 +2744,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile source/Makefile source/docs/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile "}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile source/Makefile source/docs/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile doc/manpages/Makefile source/Makefile source/docs/Makefile source/clparser/Makefile source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile source/libs/Makefile source/ai/Makefile source/unix/Makefile source/unix/mapeditor/Makefile source/tools/Makefile source/tools/linux/Makefile data/Makefile data/moredata/Makefile doc/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-@@ -2923,10 +2923,4 @@
- chmod +x $CONFIG_STATUS
- rm -fr confdefs* $ac_clean_files
- test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
--
--doc/manpages/Makefile \
--source/Makefile source/docs/Makefile source/clparser/Makefile \
--source/docs/en/Makefile source/sdl/Makefile source/libs/triangul/Makefile \
--source/libs/Makefile source/ai/Makefile source/unix/Makefile \
--source/unix/mapeditor/Makefile source/tools/Makefile source/tools/linux/Makefile)
- 
+ { (eval echo configure:1745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/games/asc/files/patch-source::Makefile.in b/games/asc/files/patch-source::Makefile.in
index c4fd1a8e60df..4d9c5b22fd77 100644
--- a/games/asc/files/patch-source::Makefile.in
+++ b/games/asc/files/patch-source::Makefile.in
@@ -1,12 +1,12 @@
 
 $FreeBSD$
 
---- source/Makefile.in.orig	Mon May 21 13:35:14 2001
-+++ source/Makefile.in	Tue May 22 22:28:23 2001
-@@ -68,7 +68,7 @@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
+--- source/Makefile.in.orig	Thu Nov 29 20:30:42 2001
++++ source/Makefile.in	Tue Dec 11 12:54:01 2001
+@@ -71,7 +71,7 @@
+ SDLMM_CONFIG = @SDLMM_CONFIG@
+ SDLMM_CXXFLAGS = @SDLMM_CXXFLAGS@
+ SDLMM_LIBS = @SDLMM_LIBS@
 -SDL_CFLAGS = @SDL_CFLAGS@
 +SDL_CFLAGS = @SDL_CFLAGS@ -DPREFIX=\"$(prefix)\"
  SDL_CONFIG = @SDL_CONFIG@
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index 743e3546363c..4b770dc27dda 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -13,4 +13,5 @@ share/asc/buildings.con
 share/asc/main.con
 share/asc/mk1.con
 share/asc/trrobj.con
+share/asc/trrobj2.con
 @dirrm share/asc