Update to 1.9.4.

6 files changed, 67 insertions, 13 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index ea11b10dddf0..41ac186759c5 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.5.15
+PORTVERSION=	1.9.4
 CATEGORIES=	games
-MASTER_SITES=	ftp://asc-hq.sourceforge.net/pub/asc-hq/develop/ \
-		http://www.asc-hq.org/develop/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta.src
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	asc-hq
+DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-beta
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
diff --git a/games/asc/distinfo b/games/asc/distinfo
index d8dbcd511f4f..a5baf58c09af 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1 +1 @@
-MD5 (asc-1.5.15-beta.src.tar.gz) = 542d2f3294e1bd1001b9d05f8c6aa71d
+MD5 (asc-source-1.9.4.tar.gz) = 5fec58752593ac2867702fb0e3aad4fa
diff --git a/games/asc/files/patch-configure b/games/asc/files/patch-configure
index c21e755ebd68..fbb1cd727031 100644
--- a/games/asc/files/patch-configure
+++ b/games/asc/files/patch-configure
@@ -1,8 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Tue May 22 22:24:17 2001
-+++ configure	Tue May 22 22:26:04 2001
+--- configure.orig	Mon Oct 22 12:26:35 2001
++++ configure	Mon Oct 22 13:58:39 2001
+@@ -1710,7 +1710,7 @@
+ 
+ 
+ 
+-                game_datadir="$datadir/games/$PACKAGE"
++                game_datadir="$datadir/$PACKAGE"
+                 game_datadir=`(
+                      test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+                      test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
 @@ -1722,16 +1722,16 @@
  EOF
  
@@ -24,3 +33,32 @@ $FreeBSD$
  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)
+ 
diff --git a/games/asc/files/patch-data::moredata::Makefile.in b/games/asc/files/patch-data::moredata::Makefile.in
new file mode 100644
index 000000000000..a357eb5dd387
--- /dev/null
+++ b/games/asc/files/patch-data::moredata::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- data/moredata/Makefile.in	2001/10/22 10:49:12	1.1
++++ data/moredata/Makefile.in	2001/10/22 10:49:23
+@@ -76,7 +76,7 @@
+ 
+ pkgdata_DATA = buildings.con  mk1.con  trrobj.con
+ 
+-pkgdatadir = $(datadir)/games/@PACKAGE@
++pkgdatadir = $(datadir)/@PACKAGE@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/games/asc/files/patch-source::tools::linux::Makefile.in b/games/asc/files/patch-source::tools::linux::Makefile.in
index 5f9822b2929b..7146f93c9f34 100644
--- a/games/asc/files/patch-source::tools::linux::Makefile.in
+++ b/games/asc/files/patch-source::tools::linux::Makefile.in
@@ -1,15 +1,15 @@
 
 $FreeBSD$
 
---- 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
+--- source/tools/linux/Makefile.in.orig	Fri Oct 12 03:37:29 2001
++++ source/tools/linux/Makefile.in	Mon Oct 22 11:57:55 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 -lSDLmm -lpthread @LDADDLIBBZ2@
 -asc_demount_LDADD = -lSDL -lSDLmm -lpthread @LDADDLIBBZ2@
--asc_gfx2pcx_LDADD = ../../sdl/libsdl.a -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@
@@ -18,7 +18,7 @@ $FreeBSD$
 -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_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@
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index 983718679c95..743e3546363c 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -1,7 +1,6 @@
 bin/asc
 bin/asc_bin2text
 bin/asc_demount
-bin/asc_gfx2pcx
 bin/asc_makegfx
 bin/asc_map2pcx
 bin/asc_mapedit
@@ -10,5 +9,8 @@ bin/asc_mount
 bin/asc_tank2pcx
 bin/asc_viewid
 bin/asc_weaponguide
+share/asc/buildings.con
 share/asc/main.con
+share/asc/mk1.con
+share/asc/trrobj.con
 @dirrm share/asc