Update freeciv to 1.8.1. Work done by Jon Buller with some fixes and

minor hacks by myself.

5 files changed, 43 insertions, 53 deletions

diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 5dcbe062d0a..8711f5e7fe0 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,31 +1,18 @@
-# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/07/22 23:35:40 garbled Exp $
 #
 
-DISTNAME=		freeciv-1.7.2
-CATEGORIES=		games x11
-MASTER_SITES=		ftp://www.freeciv.org/pub/freeciv/
+DISTNAME=	freeciv-1.8.1
+CATEGORIES=	games
+MASTER_SITES=	ftp://ftp.freeciv.org/freeciv/stable_version/
 
-MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://www.freeciv.org/index.html
+MAINTAINER=	tech-pkg@netbsd.org
+HOMEPAGE=	http://www.freeciv.org/
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
+DEPENDS+=	gtk+-1.2.2:../../x11/gtk
+DEPENDS+=	imlib-1.9.4:../../graphics/imlib
 
-USE_IMAKE=		YES
-NO_INSTALL_MANPAGES=	YES
-
-pre-patch:
-	${TOUCH} ${WRKSRC}/civclient.man
-	${TOUCH} ${WRKSRC}/civserver.man
-
-post-patch:
-	${MV} ${WRKSRC}/client/climisc.c ${WRKSRC}/client/climisc.c.bak
-	${SED} -e 's|@X11BASE@|${X11BASE}|g' < ${WRKSRC}/client/climisc.c.bak \
-		> ${WRKSRC}/client/climisc.c
-
-post-install:
-	${MKDIR} ${X11BASE}/share/freeciv/data
-	${INSTALL_DATA} ${WRKSRC}/data/*.txt ${X11BASE}/share/freeciv/data
-	${INSTALL_DATA} ${WRKSRC}/data/*.xpm ${X11BASE}/share/freeciv/data
-	${INSTALL_DATA} ${WRKSRC}/data/Freeciv ${X11BASE}/lib/X11/app-defaults
+GNU_CONFIGURE=	YES
+USE_X11BASE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv/files/md5 b/games/freeciv/files/md5
index 38c7fbec665..af12400fc84 100644
--- a/games/freeciv/files/md5
+++ b/games/freeciv/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/12/26 21:33:32 frueauf Exp $
+$NetBSD: md5,v 1.6 1999/07/22 23:35:40 garbled Exp $
 
-MD5 (freeciv-1.7.2.tar.gz) = 2058dd135c5eaa4f9a83e0ab6f228d03
+MD5 (freeciv-1.8.1.tar.gz) = 01f7a1d046f89269e74cdca44a52e064
diff --git a/games/freeciv/files/patch-sum b/games/freeciv/files/patch-sum
deleted file mode 100644
index 9fd3a308766..00000000000
--- a/games/freeciv/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:53 agc Exp $
-
-MD5 (patch-aa) = a3fffe6564bb5358d184541d55f72eeb
diff --git a/games/freeciv/patches/patch-aa b/games/freeciv/patches/patch-aa
deleted file mode 100644
index 17d44a6a8d2..00000000000
--- a/games/freeciv/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1998/12/26 21:33:33 frueauf Exp $
-
---- client/climisc.c.orig	Thu Dec  3 11:48:49 1998
-+++ client/climisc.c	Sat Dec 26 22:10:54 1998
-@@ -33,7 +33,7 @@
- #include <chatline.h>
- 
- #ifndef FREECIV_DATADIR
--#define FREECIV_DATADIR "data"
-+#define FREECIV_DATADIR "@X11BASE@/share/freeciv/data"
- #endif
- 
- 
diff --git a/games/freeciv/pkg/PLIST b/games/freeciv/pkg/PLIST
index eed6e9ace80..7d8d3cae001 100644
--- a/games/freeciv/pkg/PLIST
+++ b/games/freeciv/pkg/PLIST
@@ -1,13 +1,32 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/12 12:59:44 frueauf Exp $
-bin/civclient
+@comment $NetBSD: PLIST,v 1.2 1999/07/22 23:35:40 garbled Exp $
+share/freeciv/default/techs.ruleset
+share/freeciv/default/units.ruleset
+share/freeciv/default/buildings.ruleset
+share/freeciv/default/flags.xpm
+share/freeciv/default/roads.xpm
+share/freeciv/default/small.xpm
+share/freeciv/default/space.xpm
+share/freeciv/default/tiles.xpm
+share/freeciv/default/treaty.xpm
+share/freeciv/default/units.xpm
+share/freeciv/civ1/techs.ruleset
+share/freeciv/civ1/units.ruleset
+share/freeciv/civ1/buildings.ruleset
+share/freeciv/trident/flags.xpm
+share/freeciv/trident/roads.xpm
+share/freeciv/trident/tiles.xpm
+share/freeciv/trident/units.xpm
+share/freeciv/Freeciv
+share/freeciv/helpdata.txt
+share/freeciv/earth-80x50.sav
+share/freeciv/earth-160x90.sav
+share/freeciv/europe.sav
+share/freeciv/civ1.serv
+share/freeciv/intro.xpm
+share/freeciv/radar.xpm
 bin/civserver
-lib/X11/app-defaults/Freeciv
-share/freeciv/data/helpdata.txt
-share/freeciv/data/intro.xpm
-share/freeciv/data/radar.xpm
-share/freeciv/data/small.xpm
-share/freeciv/data/tiles.xpm
-share/freeciv/data/treaty.xpm
-share/freeciv/data/units.xpm
-@dirrm share/freeciv/data
+bin/civclient
+@dirrm share/freeciv/trident
+@dirrm share/freeciv/default
+@dirrm share/freeciv/civ1
 @dirrm share/freeciv