Use a more generic way of determining, on an opsys-dependent basis,

whether the gettext package should be used.

8 files changed, 16 insertions, 9 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 90a625e74fd..af5df6105fa 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1096 2002/12/03 19:11:30 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1097 2002/12/03 19:17:33 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -321,7 +321,7 @@ MAKE_ENV+=		LIBTOOL="${PKGLIBTOOL} ${LIBTOOL_FLAGS}"
 .endif
 
 .if defined(BUILD_USES_MSGFMT) && \
-    (!exists(/usr/bin/msgfmt) || ${OPSYS} == SunOS)
+    (!exists(/usr/bin/msgfmt) || ${_USE_GNU_GETTEXT} == "yes")
 BUILD_DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 .endif
 
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 97e1581b93f..ed2412e89ab 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.Darwin.mk,v 1.35 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -86,6 +86,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=		# no name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG=	-V simple -b -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		no	# don't add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 39f0139f4e8..2c4e2b2d672 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.5 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.6 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -98,6 +98,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb10 # base version of libtool required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index d122e513212..52a039851c7 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.3 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.IRIX.mk,v 1.4 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -97,6 +97,7 @@ _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=	-path,		# name of symbol in rpath directive to linker 
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
+_USE_GNU_GETTEXT=	no		# Don't use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index b53202367d0..2723c0f3772 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.35 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -88,6 +88,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG= 	-b -V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index f7659e60054..a3d9db36c93 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.34 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.35 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -98,6 +98,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 5b940fc1b47..a023d911431 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.3 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.4 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -98,6 +98,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
+_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 025ba12cf51..d9052182644 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.37 2002/12/03 19:11:31 agc Exp $
+# $NetBSD: defs.SunOS.mk,v 1.38 2002/12/03 19:17:34 agc Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -102,6 +102,7 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb9 # base version of libtool required
 _OPSYS_RPATH_NAME=	-R		# name of symbol in rpath directive to linker 
 _PATCH_BACKUP_ARG= 	-V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
+_USE_GNU_GETTEXT=	yes		# Use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
 .if !defined(DEBUG_FLAGS)