Remove USE_GNU_GETTEXT from pkgsrc. Packages generally only needed

it for plurals support, but that is already handled correctly (FSVO
"correctly") by the pkgsrc/mk/tools/msgfmt.sh script.

Also remove _USE_GNU_GETTEXT definitions from pkgsrc/mk/platform/*.mk
files as that value has been unused by pkgsrc for quite some time
(going back several branches).

15 files changed, 16 insertions, 37 deletions

diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 781b69613be..5230219d6ef 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.32 2006/04/13 16:35:58 jlam Exp $
+# $NetBSD: builtin.mk,v 1.33 2006/07/20 20:02:23 jlam Exp $
 
 BUILTIN_PKG:=	gettext
 
@@ -101,15 +101,6 @@ USE_BUILTIN.gettext=	no
 .endif
 MAKEVARS+=	USE_BUILTIN.gettext
 
-# If USE_GNU_GETTEXT is defined, then force the use of a GNU gettext
-# implementation.
-#
-.if defined(USE_GNU_GETTEXT)
-.  if !empty(IS_BUILTIN.gettext:M[nN][oO])
-USE_BUILTIN.gettext=	no
-.  endif
-.endif
-
 ###
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 7198bb190d9..be60433bdea 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: AIX.mk,v 1.25 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -57,7 +57,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	aixlib	# type of shared lib
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 0ebdf6f7869..fbead83bbb4 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.19 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: BSDOS.mk,v 1.20 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -64,7 +64,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index efc456d13a2..4fea746d23e 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.19 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: Darwin.mk,v 1.20 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -72,7 +72,6 @@ _OPSYS_COMPILER_RPATH_FLAG=	-L	# compiler flag to pass rpaths to linker
 _OPSYS_SHLIB_TYPE=	dylib	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		no	# don't add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 76d61797431..9299261a3f7 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.27 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.28 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -64,7 +64,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 779b842e2b6..ff7350c9905 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.18 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: FreeBSD.mk,v 1.19 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -59,7 +59,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 85296040171..16bc9193cac 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.25 2006/07/10 22:17:58 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.26 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -83,7 +83,6 @@ _PATCH_BACKUP_ARG?=	-b -V simple -z # switch to patch(1) for backup suffix
 .else
 _PATCH_CAN_BACKUP=	no		# native patch(1) can make backups
 .endif
-_USE_GNU_GETTEXT=	no		# Don't use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index c9ae7298192..3defde3c3b7 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.50 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: Interix.mk,v 1.51 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -141,7 +141,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type - not exactly true, but near enough
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	yes	# gettext not in base system
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # Ensure that USE_X11BASE programs get an xpkgwedge new enough to work.
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index a6bd9099a31..d1ecef373c2 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.24 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: Linux.mk,v 1.25 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -62,7 +62,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 8ff100ebfd0..52f641b63d4 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.20 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.21 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -75,7 +75,6 @@ _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index d2b57ed8877..760891c65f5 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.12 2006/03/18 21:40:45 jlam Exp $
+# $NetBSD: OSF1.mk,v 1.13 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -63,7 +63,6 @@ _OPSYS_RPATH_NAME=	-rpath,	# name of symbol in rpath directive to linker
 _OPSYS_SHLIB_TYPE=	COFF	# type of shared lib
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	yes	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index b28896e83dd..4de5dfa71d1 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.23 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: OpenBSD.mk,v 1.24 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -65,7 +65,6 @@ _PATCH_BACKUP_ARG?=	-V simple -z 	# switch to patch(1) for backup suffix
 .else
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
 .endif
-_USE_GNU_GETTEXT=	no	# Don't use GNU gettext
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index b7ba54fe16d..9a5df2fa64c 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.25 2006/07/20 13:19:29 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.26 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -63,7 +63,6 @@ _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF		# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	yes		# Use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
 # flags passed to the linker to extract all symbols from static archives.
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index ad364bf92ab..02ec471d167 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.21 2006/04/12 21:01:15 joerg Exp $
+# $NetBSD: UnixWare.mk,v 1.22 2006/07/20 20:02:23 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -54,7 +54,6 @@ _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF		# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
-_USE_GNU_GETTEXT=	yes		# Use GNU gettext
 #
 # The native linker for UnixWare doesn't really support an option to pass
 # rpath directives, but pretend it does anyway since the wrapper scripts
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index f9fd0c86205..b1dda7e1874 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.43 2006/07/19 19:14:39 jlam Exp $
+# $NetBSD: deprecated.map,v 1.44 2006/07/20 20:02:23 jlam Exp $
 #
 
 # This file contains names of Makefile variables and a short explanation
@@ -116,3 +116,4 @@ DEINSTALL_FILE		It may only be used internally by pkgsrc.
 # July 2006
 USE_DIGEST		You can just remove it.
 LTCONFIG_OVERRIDE	You can just remove it.
+USE_GNU_GETTEXT		You can just remove it.