- Update to 1.13.5.1 and unbroke;

- drop maintainership.

17 files changed, 43 insertions, 205 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 22b6ddf0e7cd..353bf5f88fd9 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.10.2
+PORTVERSION=	1.13.5.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	asc-hq
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
-MAINTAINER=	sobomax@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A turn based, multiplayer strategic game with very nice graphics
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
@@ -25,15 +25,13 @@ LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
-BROKEN=		"Configure fails"
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
 		LIBS="`${SDL_CONFIG} --libs` -lgnugetopt -lm"
@@ -42,6 +40,8 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@find ${WRKSRC} \( -name "*.cpp" -or -name "*.h" \) | xargs \
 		${REINPLACE_CMD} -e 's|malloc[.]h|stdlib.h|g'
+	@find ${WRKSRC} -type f -name Makefile.in | xargs \
+		${REINPLACE_CMD} -e 's|[(]datadir[)]/games|(datadir)|g'
 
 pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
diff --git a/games/asc/distinfo b/games/asc/distinfo
index a149b164b466..8d2ffbb4de65 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1 +1 @@
-MD5 (asc-source-1.10.2.tar.gz) = 61aca2f50c851c440c7d76b356d3d28b
+MD5 (asc-source-1.13.5.1.tar.gz) = 1fc5b97a5ed12be9e24af74d8884c9e1
diff --git a/games/asc/files/patch-configure b/games/asc/files/patch-configure
index 2b933d3d34c4..0667504cdf32 100644
--- a/games/asc/files/patch-configure
+++ b/games/asc/files/patch-configure
@@ -1,29 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Oct 18 19:42:20 2002
-+++ configure	Fri Oct 18 19:52:51 2002
-@@ -2219,9 +2219,6 @@
-   cat > conftest.$ac_ext <<EOF
- #line 2221 "configure"
- #include "confdefs.h"
--#ifdef __cplusplus
--extern "C" void exit(int) throw();
--#endif
+--- configure.orig	Sun Jun  1 16:23:11 2003
++++ configure	Sun Jun  1 16:23:24 2003
+@@ -7381,6 +7381,7 @@
  
- #include <cstdio>
- #include <cstring>
-@@ -2466,9 +2463,6 @@
-   cat > conftest.$ac_ext <<EOF
- #line 2468 "configure"
- #include "confdefs.h"
--#ifdef __cplusplus
--extern "C" void exit(int) throw();
--#endif
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
- #include "paragui.h"
- #include "pgapplication.h"
-@@ -2992,7 +2986,7 @@
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -10523,7 +10524,7 @@
  
  
  
diff --git a/games/asc/files/patch-data::Makefile.in b/games/asc/files/patch-data::Makefile.in
index 2b81e0d92aee..4e1da2121c92 100644
--- a/games/asc/files/patch-data::Makefile.in
+++ b/games/asc/files/patch-data::Makefile.in
@@ -1,22 +1,14 @@
 
 $FreeBSD$
 
---- data/Makefile.in.orig	Sat Apr 27 23:06:17 2002
-+++ data/Makefile.in	Fri Oct 18 17:03:10 2002
-@@ -89,14 +89,14 @@
- VERSION = @VERSION@
+--- data/Makefile.in.orig	Thu Mar 27 13:13:56 2003
++++ data/Makefile.in	Sun Jun  1 15:10:04 2003
+@@ -104,7 +104,7 @@
+ am__quote = @am__quote@
  asc_version = @asc_version@
- 
+ install_sh = @install_sh@
 -SUBDIRS = dialog @MUSICDIR@
 +SUBDIRS = dialog
  
  MAINTAINERCLEANFILES = Makefile.in
- # main.con buildings.con mk1.con trrobj.con trrobj2.con
- 
- pkgdata_DATA = main.con buildings.con mk1.con trrobj.con trrobj2.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-data::dialog::Makefile.in b/games/asc/files/patch-data::dialog::Makefile.in
deleted file mode 100644
index 72f7561ef3c5..000000000000
--- a/games/asc/files/patch-data::dialog::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- data/dialog/Makefile.in	2002/10/01 12:21:59	1.1
-+++ data/dialog/Makefile.in	2002/10/01 12:23:35
-@@ -89,7 +89,7 @@
- VERSION = @VERSION@
- asc_version = @asc_version@
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@
-+pkgdatadir = $(datadir)/@PACKAGE@
- 
- pkgdata_DATA = asc_dlg.zip
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/games/asc/files/patch-data::music::Makefile.in b/games/asc/files/patch-data::music::Makefile.in
deleted file mode 100644
index 068f8ae07143..000000000000
--- a/games/asc/files/patch-data::music::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- data/music/Makefile.in	2002/10/01 12:21:59	1.1
-+++ data/music/Makefile.in	2002/10/01 12:22:47
-@@ -89,7 +89,7 @@
- VERSION = @VERSION@
- asc_version = @asc_version@
- 
--pkgdatadir = $(datadir)/games/@PACKAGE@/music
-+pkgdatadir = $(datadir)/@PACKAGE@/music
- 
- pkgdata_DATA = frontiers.mp3 time_to_strike.mp3
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/games/asc/files/patch-source::ai::misc.cpp b/games/asc/files/patch-source::ai::misc.cpp
deleted file mode 100644
index e16c1d738031..000000000000
--- a/games/asc/files/patch-source::ai::misc.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- source/ai/misc.cpp	2002/10/18 11:37:58	1.1
-+++ source/ai/misc.cpp	2002/10/18 11:41:35
-@@ -86,7 +86,7 @@
- 
-          float value = veh->aiparam[getPlayerNum()]->getValue();
-          if ( veh->typ->movement[j] )
--            value *=  log( veh->typ->movement[j] );
-+            value *=  log( (double)veh->typ->movement[j] );
- 
-          float threat = sec.avgFieldThreat.threat[ veh->aiparam[getPlayerNum()]->valueType ];
-          if ( minAvgFieldThreat > 0 ) {
-@@ -834,7 +834,7 @@
-                   danger = enemyThreat.threat[ typ->aiparam[getPlayerNum()]->valueType] / typ->aiparam[getPlayerNum()]->getValue();
-             }
- 
--            rating /= 1 + log ( danger );
-+            rating /= 1 + log ( (double)danger );
- 
-             int cost = 0;
-             for ( int j = 0; j < resourceTypeNum; j++ )
diff --git a/games/asc/files/patch-source::ai::tactics.cpp b/games/asc/files/patch-source::ai::tactics.cpp
deleted file mode 100644
index 767731e5f4f1..000000000000
--- a/games/asc/files/patch-source::ai::tactics.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/ai/tactics.cpp	2002/10/18 11:52:01	1.1
-+++ source/ai/tactics.cpp	2002/10/18 11:52:50
-@@ -330,7 +330,7 @@
-          int _dist = beeline ( x, y, veh->xpos, veh->ypos);
- 
-             // make fields far away a bit unattractive; we don't want to move the whole distance back again next turn
--         int t = int( ait.threat[ veh->aiparam[ getPlayerNum()]->valueType ] * log ( _dist )/log(10) );
-+         int t = int( ait.threat[ veh->aiparam[ getPlayerNum()]->valueType ] * log ( (double)_dist )/log((double)10) );
- 
-          if ( t < threat || ( t == threat && _dist < dist )) {
-             threat = t;
diff --git a/games/asc/files/patch-source::ai::valuation.cpp b/games/asc/files/patch-source::ai::valuation.cpp
deleted file mode 100644
index 9a65efa034df..000000000000
--- a/games/asc/files/patch-source::ai::valuation.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- source/ai/valuation.cpp	2002/10/18 11:44:39	1.1
-+++ source/ai/valuation.cpp	2002/10/18 11:46:45
-@@ -78,7 +78,7 @@
-                   for ( int e = (fzt->weapons.weapon[i].mindistance + maxmalq - 1)/ maxmalq; e <= fzt->weapons.weapon[i].maxdistance / maxmalq; e++ ) {    // the distance between two fields is maxmalq
-                      d++;
-                      int n = int( weapDist.getWeapStrength( &fzt->weapons.weapon[i], e*maxmalq ) * fzt->weapons.weapon[i].maxstrength * af.strength_damage(getdamage()) * ( 1 + af.strength_experience(getexpirience())) );
--                     m += int( n / log10(10*d));
-+                     m += int( n / log10((double)10*d));
-                   }
-                   if (getammunition(i) == 0)
-                      m /= 2;
-@@ -694,7 +694,7 @@
- 
-                 int dist = beeline ( veh->xpos, veh->ypos, sec.centerx, sec.centery ) + 3 * veh->maxMovement();
-                 if ( dist )
--                   f /= log(dist);
-+                   f /= log((double)dist);
- 
-                 if ( f > d ) {
-                    int ac  = 0;
diff --git a/games/asc/files/patch-source::basestrm.h b/games/asc/files/patch-source::basestrm.h
deleted file mode 100644
index 5fb5007c6215..000000000000
--- a/games/asc/files/patch-source::basestrm.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/basestrm.h	2002/10/18 12:10:03	1.1
-+++ source/basestrm.h	2002/10/18 12:10:30
-@@ -516,7 +516,7 @@
- 
- 
- 
--class tanycompression : public t_compressor_stream_interface, protected tlzwstreamcompression {
-+class tanycompression : public t_compressor_stream_interface, public tlzwstreamcompression {
- 
-                             typedef deque<char> CDQ;
-                             queue<char, CDQ> _queue;
diff --git a/games/asc/files/patch-source::building.cpp b/games/asc/files/patch-source::building.cpp
deleted file mode 100644
index 625d1a2da051..000000000000
--- a/games/asc/files/patch-source::building.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/building.cpp	2002/10/18 13:03:04	1.1
-+++ source/building.cpp	2002/10/18 13:03:22
-@@ -1022,7 +1022,7 @@
- 
- int getstepwidth ( int max )
- {
--   double ep = log10 ( max );
-+   double ep = log10 ( (double)max );
-    if ( ep > 2.0 )
-       ep -= 2.0;
-    else
diff --git a/games/asc/files/patch-source::gamedlg.cpp b/games/asc/files/patch-source::gamedlg.cpp
deleted file mode 100644
index 3550c33d7ec6..000000000000
--- a/games/asc/files/patch-source::gamedlg.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/gamedlg.cpp.orig	Fri Oct 18 19:39:24 2002
-+++ source/gamedlg.cpp	Fri Oct 18 19:40:48 2002
-@@ -3788,7 +3791,7 @@
-                             int step =  ( target->service[displayed[mp]].maxAmount - target->service[displayed[mp]].minAmount ) / 100;
-                             if ( step == 0 )
-                                step = 1;
--                            step = int( pow ( 10, int ( log10 ( step ))));
-+                            step = int( pow ( (double)10, int ( log10 ( (double)step ))));
- 
-                             oldpos[mp] = newpos[mp];
- 
diff --git a/games/asc/files/patch-source::mapalgorithms.cpp b/games/asc/files/patch-source::mapalgorithms.cpp
deleted file mode 100644
index ae7ac299398b..000000000000
--- a/games/asc/files/patch-source::mapalgorithms.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/mapalgorithms.cpp	2002/10/18 12:38:06	1.1
-+++ source/mapalgorithms.cpp	2002/10/18 12:38:23
-@@ -117,7 +117,7 @@
- 
-    int dx = xp2-xp1;
-    int dy = yp2-yp1;
--   double at = atan2 ( dy, dx );
-+   double at = atan2 ( (double)dy, (double)dx );
-    // printf("%d / %d / %f \n", dx, dy, at);
-    at -= offset;
-    while ( at < 0 )
diff --git a/games/asc/files/patch-source::tools::linux::Makefile.in b/games/asc/files/patch-source::tools::linux::Makefile.in
index ce823f7811bc..2e6dba56e2b8 100644
--- a/games/asc/files/patch-source::tools::linux::Makefile.in
+++ b/games/asc/files/patch-source::tools::linux::Makefile.in
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- source/tools/linux/Makefile.in.orig	Sat Apr 27 23:06:16 2002
-+++ source/tools/linux/Makefile.in	Tue Oct  1 15:36:31 2002
-@@ -111,7 +111,7 @@
- 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 stringtokenizer.cpp itemrepository.cpp
- asc_raw2pcx_SOURCES = raw2pcx.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 stringtokenizer.cpp
+--- source/tools/linux/Makefile.in.orig	Sun Jun  1 15:19:15 2003
++++ source/tools/linux/Makefile.in	Sun Jun  1 15:19:37 2003
+@@ -131,7 +131,7 @@
+ 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 containerbasetype.cpp terraintype.cpp objecttype.cpp textfiletags.cpp textfile_evaluation.cpp stringtokenizer.cpp itemrepository.cpp
+ asc_raw2pcx_SOURCES = raw2pcx.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 containerbasetype.cpp terraintype.cpp objecttype.cpp textfiletags.cpp textfile_evaluation.cpp stringtokenizer.cpp
  
 -asc_mount_LDADD = @SDL_LIBS@ @SDLMM_LIBS@ -lpthread @LDADDLIBBZ2@ $(top_builddir)/source/tools/lib/libasc_cmd.la
 +asc_mount_LDADD = @SDL_LIBS@ @SDLMM_LIBS@ @LDADDLIBBZ2@ $(top_builddir)/source/tools/lib/libasc_cmd.la
  asc_demount_LDADD = @SDL_LIBS@ @SDLMM_LIBS@ @LDADDLIBBZ2@ $(top_builddir)/source/tools/lib/libasc_cmd.la
  asc_makegfx_LDADD = $(top_builddir)/source/sdl/libsdl.la @LDADDLIBBZ2@ $(top_builddir)/source/tools/lib/libasc_cmd.la
  asc_viewid_LDADD = $(top_builddir)/source/sdl/libsdl.la @LDADDLIBBZ2@ $(top_builddir)/source/tools/lib/libasc_cmd.la
-@@ -125,7 +125,7 @@
+@@ -241,7 +241,7 @@
  
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
+ DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 -CPPFLAGS = @CPPFLAGS@
 +CPPFLAGS = @CPPFLAGS@ -DPREFIX=\"$(prefix)\"
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
- asc_demount_OBJECTS =  demount.o basestrm.o misc.o ascstring.o \
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/games/asc/files/patch-source::unix::Makefile.in b/games/asc/files/patch-source::unix::Makefile.in
index 666f4eb6d57a..f13df9334d7a 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.orig	Sat Apr 27 23:06:16 2002
-+++ source/unix/Makefile.in	Tue Oct  1 15:39:29 2002
-@@ -98,7 +98,7 @@
- 
+--- source/unix/Makefile.in.orig	Sun Jun  1 15:19:57 2003
++++ source/unix/Makefile.in	Sun Jun  1 15:20:45 2003
+@@ -113,7 +113,7 @@
  SUBDIRS = mapeditor
  
--CXXFLAGS = @CXXFLAGS@ @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ -Dsgmain -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@
-+CXXFLAGS = @CXXFLAGS@ @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ -Dsgmain -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@ -DPREFIX=\"$(prefix)\"
+ AM_CXXFLAGS = @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ \
+--Dsgmain -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@
++-Dsgmain -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@ -DPREFIX=\"$(prefix)\"
  
  
  bin_PROGRAMS = asc
diff --git a/games/asc/files/patch-source::unix::mapeditor::Makefile.in b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
index 61d189ec50eb..85f53687f13e 100644
--- a/games/asc/files/patch-source::unix::mapeditor::Makefile.in
+++ b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- source/unix/mapeditor/Makefile.in.orig	Sat Apr 27 23:06:16 2002
-+++ source/unix/mapeditor/Makefile.in	Tue Oct  1 15:41:13 2002
-@@ -98,7 +98,7 @@
- INCLUDES = -I$(top_builddir) -I$(top_src_dir) 			  -I$(top_builddir)/source -I$(top_src_dir)/source
+--- source/unix/mapeditor/Makefile.in.orig	Sun Jun  1 15:21:07 2003
++++ source/unix/mapeditor/Makefile.in	Sun Jun  1 15:21:34 2003
+@@ -113,7 +113,7 @@
  
  
--CXXFLAGS = @CXXFLAGS@ @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ -Dkarteneditor -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@
-+CXXFLAGS = @CXXFLAGS@ @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ -Dkarteneditor -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@ -DPREFIX=\"$(prefix)\"
+ AM_CXXFLAGS = @SDL_CFLAGS@ @SDLMM_CXXFLAGS@ \
+--Dkarteneditor -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@
++-Dkarteneditor -DFREEMAPZOOM -DNEWKEYB @PARAGUI_CFLAGS@ -DPREFIX=\"$(prefix)\"
  
  
  bin_PROGRAMS = asc_mapedit asc_map2pcx
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index c65f3a664726..6538ac5e6ec1 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -8,10 +8,12 @@ bin/asc_mount
 bin/asc_raw2pcx
 bin/asc_viewid
 bin/asc_weaponguide
+share/asc/asc.gfx
 share/asc/asc_dlg.zip
 share/asc/buildings.con
 share/asc/main.con
 share/asc/mk1.con
 share/asc/trrobj.con
 share/asc/trrobj2.con
+share/asc/units-mk3.con
 @dirrm share/asc