12 files changed, 104 insertions, 93 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index e977524fe6ad..905a3c2e065f 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.3.13
+PORTVERSION=	1.3.16
 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/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-beta.src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILE}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
-		bz2.1:${PORTSDIR}/archivers/bzip2
+		bz2.1:${PORTSDIR}/archivers/bzip2 \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-beta
 
@@ -30,9 +29,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		LIBS="`${SDL_CONFIG} --libs` -lm"
-
-DATAFILE=	main.con
+		LIBS="`${SDL_CONFIG} --libs` -lgnugetopt -lm"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -42,8 +39,4 @@ pre-patch:
 pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
 
-post-install:
-	${MKDIR} ${PREFIX}/share/asc
-	${INSTALL_DATA} ${DISTDIR}/${DATAFILE} ${PREFIX}/share/asc
-
 .include <bsd.port.mk>
diff --git a/games/asc/distinfo b/games/asc/distinfo
index 1f73a48709c8..99afa0abb11a 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1,2 +1 @@
-MD5 (asc-1.3.13-beta.src.tar.gz) = e4a2ea5030da7c541d4a7934f3ceec1a
-MD5 (main.con) = c9fee6c3e554742612dbeb02fd0700e3
+MD5 (asc-1.3.16-beta.src.tar.gz) = 053f4b8f6bc65c2f75422648663b6c1c
diff --git a/games/asc/files/patch-configure b/games/asc/files/patch-configure
index 3ca03d60571e..c21e755ebd68 100644
--- a/games/asc/files/patch-configure
+++ b/games/asc/files/patch-configure
@@ -1,26 +1,26 @@
 
 $FreeBSD$
 
---- configure	2001/02/16 21:42:44	1.1
-+++ configure	2001/02/16 21:43:07
-@@ -1624,16 +1624,16 @@
- 
+--- configure.orig	Tue May 22 22:24:17 2001
++++ configure	Tue May 22 22:26:04 2001
+@@ -1722,16 +1722,16 @@
+ EOF
  
  
 -ac_safe=`echo "SDL/SDL.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for SDL/SDL.h""... $ac_c" 1>&6
--echo "configure:1630: checking for SDL/SDL.h" >&5
+-echo "configure:1728: 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:1630: checking for SDL.h" >&5
++echo "configure:1728: 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 1635 "configure"
+ #line 1733 "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:1640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:1738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/games/asc/files/patch-data::Makefile.in b/games/asc/files/patch-data::Makefile.in
new file mode 100644
index 000000000000..7733a8345b3f
--- /dev/null
+++ b/games/asc/files/patch-data::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- data/Makefile.in	2001/05/22 19:52:06	1.1
++++ data/Makefile.in	2001/05/22 19:52:26
+@@ -76,7 +76,7 @@
+ 
+ pkgdata_DATA = main.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::Makefile.in b/games/asc/files/patch-source::Makefile.in
index 6797c105b726..c4fd1a8e60df 100644
--- a/games/asc/files/patch-source::Makefile.in
+++ b/games/asc/files/patch-source::Makefile.in
@@ -1,23 +1,14 @@
 
 $FreeBSD$
 
---- 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 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 = ./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 ai
-@@ -88,7 +88,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DPREFIX=\"$(prefix)\"
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- asc_OBJECTS =  unitctrl.o soundList.o weather.o typen.o strtmesg.o \
+--- 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@
+-SDL_CFLAGS = @SDL_CFLAGS@
++SDL_CFLAGS = @SDL_CFLAGS@ -DPREFIX=\"$(prefix)\"
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+ SGML2MAN = @SGML2MAN@
diff --git a/games/asc/files/patch-source::gameoptions.cpp b/games/asc/files/patch-source::gameoptions.cpp
index 7d5db8f24a1c..897f18b5c54c 100644
--- a/games/asc/files/patch-source::gameoptions.cpp
+++ b/games/asc/files/patch-source::gameoptions.cpp
@@ -1,18 +1,20 @@
 
 $FreeBSD$
 
---- source/gameoptions.cpp.orig	Sat Feb 17 20:16:39 2001
-+++ source/gameoptions.cpp	Sat Feb 17 20:18:31 2001
-@@ -96,13 +96,13 @@
- 
+--- source/gameoptions.cpp.orig	Tue May 22 22:28:53 2001
++++ source/gameoptions.cpp	Tue May 22 22:30:29 2001
+@@ -103,7 +103,7 @@
     defaultSuperVisorPassword.setName ( "" );
  
+ 
 -  #if USE_HOME_DIRECTORY == 0
-+  #ifndef _UNIX_
++  #if _UNIX_ == 0
     searchPath[0].setName ( ".\\" );
     for ( int i = 1; i < getSearchPathNum(); i++ )
        searchPath[i].setName ( NULL );
-   #else
+@@ -111,7 +111,7 @@
+    for ( int i = 0; i < getSearchPathNum(); i++ )
+       searchPath[i].setName ( NULL );
     searchPath[0].setName ( "~/.asc/" );
 -   searchPath[1].setName ( "/var/local/games/asc/" );
 +   searchPath[1].setName ( PREFIX "/share/asc/" );
diff --git a/games/asc/files/patch-source::mapedit::Makefile.in b/games/asc/files/patch-source::mapedit::Makefile.in
deleted file mode 100644
index e81303c41214..000000000000
--- a/games/asc/files/patch-source::mapedit::Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- 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 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 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
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
-@@ -87,7 +87,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DPREFIX=\"$(prefix)\"
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- ascmapedit_OBJECTS =  edevents.o edgen.o edglobal.o edmain.o edselfnt.o \
diff --git a/games/asc/files/patch-source::unix::Makefile.in b/games/asc/files/patch-source::unix::Makefile.in
new file mode 100644
index 000000000000..35941f7b97c2
--- /dev/null
+++ b/games/asc/files/patch-source::unix::Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- source/unix/Makefile.in	2001/05/22 19:36:17	1.1
++++ source/unix/Makefile.in	2001/05/22 19:47:11
+@@ -78,12 +78,12 @@
+ 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 = ../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 = mapeditor
+ 
+-CXXFLAGS = @CXXFLAGS@ -I./ -Dsgmain -DFREEMAPZOOM -DNEWKEYB
++CXXFLAGS = @CXXFLAGS@ -I./ -Dsgmain -DFREEMAPZOOM -DNEWKEYB -DPREFIX=\"$(prefix)\"
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/games/asc/files/patch-source::unix::fileio.h b/games/asc/files/patch-source::unix::fileio.h
deleted file mode 100644
index 79513435c5bb..000000000000
--- a/games/asc/files/patch-source::unix::fileio.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- source/unix/fileio.h	2001/02/17 17:39:14	1.1
-+++ source/unix/fileio.h	2001/02/17 17:39:23
-@@ -65,7 +65,7 @@
-  const char* pathdelimitterstring = "/";
- 
-  #define CASE_SENSITIVE_FILE_NAMES 1
-- #define USE_HOME_DIRECTORY 1
-+ #define USE_HOME_DIRECTORY 0
- 
-  const int maxfilenamelength = 255;
-  const char* asc_configurationfile = "~/.asc/ascrc";
diff --git a/games/asc/files/patch-source::unix::global_os.h b/games/asc/files/patch-source::unix::global_os.h
index 55eccfcfe756..972d582ed214 100644
--- a/games/asc/files/patch-source::unix::global_os.h
+++ b/games/asc/files/patch-source::unix::global_os.h
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- source/unix/global_os.h	2001/02/16 21:38:57	1.1
-+++ source/unix/global_os.h	2001/02/16 21:39:25
-@@ -38,7 +38,7 @@
+--- source/unix/global_os.h	2001/05/22 19:32:32	1.1
++++ source/unix/global_os.h	2001/05/22 19:33:06
+@@ -43,7 +43,7 @@
   #define global_os_h_included
  
    #ifndef minimalIO
@@ -12,3 +12,12 @@ $FreeBSD$
     #include sdlheader
    #endif 
  
+@@ -60,7 +60,7 @@
+   #endif
+ 
+   #define CASE_SENSITIVE_FILE_NAMES 1
+-  #define USE_HOME_DIRECTORY 1
++  #define USE_HOME_DIRECTORY 0
+ 
+ 
+ #endif
diff --git a/games/asc/files/patch-source::unix::mapeditor::Makefile.in b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
new file mode 100644
index 000000000000..2f7ab092a15d
--- /dev/null
+++ b/games/asc/files/patch-source::unix::mapeditor::Makefile.in
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- source/unix/mapeditor/Makefile.in	2001/05/22 19:36:17	1.1
++++ source/unix/mapeditor/Makefile.in	2001/05/22 19:39:11
+@@ -76,15 +76,15 @@
+ SGML2MAN = @SGML2MAN@
+ VERSION = @VERSION@
+ 
+-CXXFLAGS = @CXXFLAGS@ -Dkarteneditor -I./ -DFREEMAPZOOM -DNEWKEYB
++CXXFLAGS = @CXXFLAGS@ -Dkarteneditor -I./ -DFREEMAPZOOM -DNEWKEYB -DPREFIX=\"$(prefix)\"
+ 
+ bin_PROGRAMS = asc_mapedit asc_map2pcx
+ 
+ asc_mapedit_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
+-asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread @LDADDLIBBZ2@
++asc_mapedit_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a @LDADDLIBBZ2@
+ 
+ asc_map2pcx_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
+-asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@
++asc_map2pcx_LDADD = ../../sdl/libsdl.a ../../libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index bb79e1080597..7b1ff4c8dc85 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -2,10 +2,10 @@ bin/asc
 bin/asc_demount
 bin/asc_gfx2pcx
 bin/asc_makegfx
+bin/asc_map2pcx
+bin/asc_mapedit
 bin/asc_mntgraph
 bin/asc_mount
 bin/asc_viewid
-bin/ascmap2pcx
-bin/ascmapedit
 share/asc/main.con
 @dirrm share/asc