Share the distinfo file in freeciv-share. Remove unnecessary patch

and remove build dependency on autoconf: we now install the locale files
properly under ${PKGLOCALEDIR}.

7 files changed, 18 insertions, 54 deletions

diff --git a/games/freeciv-client-gtk/distinfo b/games/freeciv-client-gtk/distinfo
deleted file mode 100644
index 268f0b1e1a8..00000000000
--- a/games/freeciv-client-gtk/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:23 wiz Exp $
-
-SHA1 (freeciv-1.11.4.tar.bz2) = 7460fe54cfee3223621b632e446ed340eacbe874
-Size (freeciv-1.11.4.tar.bz2) = 2599232 bytes
-SHA1 (patch-aa) = 989be2bf58f9e83fca20c56629d37783f21298a9
diff --git a/games/freeciv-client/distinfo b/games/freeciv-client/distinfo
deleted file mode 100644
index 268f0b1e1a8..00000000000
--- a/games/freeciv-client/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:23 wiz Exp $
-
-SHA1 (freeciv-1.11.4.tar.bz2) = 7460fe54cfee3223621b632e446ed340eacbe874
-Size (freeciv-1.11.4.tar.bz2) = 2599232 bytes
-SHA1 (patch-aa) = 989be2bf58f9e83fca20c56629d37783f21298a9
diff --git a/games/freeciv-server/distinfo b/games/freeciv-server/distinfo
deleted file mode 100644
index dada9a4c93a..00000000000
--- a/games/freeciv-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:24 wiz Exp $
-
-SHA1 (freeciv-1.11.4.tar.bz2) = 7460fe54cfee3223621b632e446ed340eacbe874
-Size (freeciv-1.11.4.tar.bz2) = 2599232 bytes
-SHA1 (patch-aa) = 989be2bf58f9e83fca20c56629d37783f21298a9
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 4159a3156f3..8a628b6042b 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:19:57 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.7 2001/05/02 16:34:58 jlam Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
 FC_VERS=		1.11.4
@@ -10,17 +10,13 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	# defined
 
-FILESDIR=		${.CURDIR}/../../games/freeciv-share/files
+DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-USE_LIBINTL=		yes
-
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+USE_LIBINTL=		# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo
index dada9a4c93a..d8fac429174 100644
--- a/games/freeciv-share/distinfo
+++ b/games/freeciv-share/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:24 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 16:34:58 jlam Exp $
 
 SHA1 (freeciv-1.11.4.tar.bz2) = 7460fe54cfee3223621b632e446ed340eacbe874
 Size (freeciv-1.11.4.tar.bz2) = 2599232 bytes
-SHA1 (patch-aa) = 989be2bf58f9e83fca20c56629d37783f21298a9
diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa
deleted file mode 100644
index 151351c9924..00000000000
--- a/games/freeciv-share/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/08/12 06:34:41 jlam Exp $
-
---- configure.in.orig	Thu Jul 20 13:26:32 2000
-+++ configure.in	Fri Aug 11 21:39:28 2000
-@@ -164,6 +164,11 @@
-     LIBS="-lintl  $LIBS"
- fi
- 
-+dnl NetBSD: set DATADIRNAME to "share"
-+DATADIRNAME="share"
-+INTLDEPS=
-+INTLLIBS="-lintl"
-+
- dnl DATADIRNAME is generated by AM_GNU_GETTEXT; 
- dnl note this has to match the path installed by po/Makefile
- FC_EXPAND_DIR(LOCALEDIR, '${prefix}/${DATADIRNAME}/locale')
diff --git a/games/freeciv-share/pkg/PLIST b/games/freeciv-share/pkg/PLIST
index 264d82c05ab..a0159cd708c 100644
--- a/games/freeciv-share/pkg/PLIST
+++ b/games/freeciv-share/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/12 06:34:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/05/02 16:34:59 jlam Exp $
 share/freeciv/Freeciv
 share/freeciv/civ1.serv
 share/freeciv/civ1/buildings.ruleset
@@ -131,18 +131,18 @@ share/freeciv/trident/tiles.xpm
 share/freeciv/trident/units.spec
 share/freeciv/trident/units.xpm
 share/freeciv/trident_shields.tilespec
-share/locale/de/LC_MESSAGES/freeciv.mo
-share/locale/en_GB/LC_MESSAGES/freeciv.mo
-share/locale/es/LC_MESSAGES/freeciv.mo
-share/locale/fr/LC_MESSAGES/freeciv.mo
-share/locale/hu/LC_MESSAGES/freeciv.mo
-share/locale/ja/LC_MESSAGES/freeciv.mo
-share/locale/nl/LC_MESSAGES/freeciv.mo
-share/locale/no/LC_MESSAGES/freeciv.mo
-share/locale/pl/LC_MESSAGES/freeciv.mo
-share/locale/pt/LC_MESSAGES/freeciv.mo
-share/locale/pt_BR/LC_MESSAGES/freeciv.mo
-share/locale/ru/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/freeciv.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/freeciv.mo
 @dirrm share/freeciv/trident
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation