summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2001-01-04 14:18:49 +0000
committerwiz <wiz>2001-01-04 14:18:49 +0000
commit6cd584dc159753a11d321a0165c321a8ea997456 (patch)
treec7b7ca99f6efd4dfb0202b831c83d9e9320d1c07
parentd93f8d9ca6fb985677271e228235c5a1084a4637 (diff)
downloadpkgsrc-6cd584dc159753a11d321a0165c321a8ea997456.tar.gz
USE_LIBINTL cleanup.
-rw-r--r--games/freeciv-client/Makefile4
-rw-r--r--games/freeciv-server/Makefile6
-rw-r--r--games/freeciv-share/Makefile5
-rw-r--r--games/freeciv-share/Makefile.common4
4 files changed, 7 insertions, 12 deletions
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index df449f9a15a..ccde6589e95 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2000/09/11 03:53:05 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2001/01/04 14:18:49 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share
-DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
CONFLICTS= freeciv-client-gtk-*
@@ -16,7 +15,6 @@ USE_XPM= YES
CONFIGURE_ARGS+= --disable-server
CONFIGURE_ARGS+= --disable-make-data
CONFIGURE_ARGS+= --enable-client=xaw
-CPPFLAGS+= -I${LOCALBASE}/include
.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d")
CONFIGURE_ARGS+= --with-xaw3d
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 61bf79e8049..50e24489ff9 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2000/08/12 06:34:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/04 14:18:50 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share
-DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
DEPENDS+= readline-*:../../devel/readline
CONFIGURE_ARGS+= --enable-client=no
CONFIGURE_ARGS+= --disable-make-data
CONFIGURE_ARGS+= --with-readline
-CONFIGURE_ENV+= LIBS="${LIBS}"
-CPPFLAGS+= -I${LOCALBASE}/include # libintl.h, readline.h
+CPPFLAGS+= -I${LOCALBASE}/include # readline.h
LIBS+= -ltermcap
do-install:
diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile
index 9c3da346235..598db37b7d1 100644
--- a/games/freeciv-share/Makefile
+++ b/games/freeciv-share/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2000/08/12 06:34:36 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/04 14:18:50 wiz Exp $
PKGNAME= ${DISTNAME:S/-/-share-/}
-BUILD_DEPENDS+= ${LOCALBASE}/include/libintl.h:../../devel/gettext
-
CONFIGURE_ARGS+= --disable-server
CONFIGURE_ARGS+= --enable-client=no
-CPPFLAGS+= -I${LOCALBASE}/include # libintl.h
.include "../../games/freeciv-share/Makefile.common"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 09ff4385e3f..f351e0c3fc1 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2000/08/12 06:34:38 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2001/01/04 14:18:50 wiz Exp $
DISTNAME= freeciv-${FC_VERS}
FC_VERS= 1.11.4
@@ -11,12 +11,14 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.freeciv.org/
BUILD_DEPENDS+= autoreconf:../../devel/autoconf
+BUILD_DEPENDS+= msgfmt:../../devel/gettext
FILESDIR= ${.CURDIR}/../../games/freeciv-share/files
PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches
GNU_CONFIGURE= # defined
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
+USE_LIBINTL= yes
pre-configure:
cd ${WRKSRC} && autoreconf