diff options
-rw-r--r-- | Packages.txt | 3 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 21 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 3 |
6 files changed, 6 insertions, 30 deletions
diff --git a/Packages.txt b/Packages.txt index 3b95560f52b..136eea240d7 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.264 2002/10/21 13:58:14 wiz Exp $ +# $NetBSD: Packages.txt,v 1.265 2002/10/23 12:21:29 wiz Exp $ ########################################################################### ========================== @@ -1664,7 +1664,6 @@ directly adding a dependency on that package, include that package's buildlink.mk instead. The following variables may also be replaced with buildlink.mk files: - USE_LIBINTL --> .include "../../devel/gettext-lib/buildlink.mk" USE_X11 --> .include "../../mk/x11.buildlink.mk" Packages that have an explicit dependency on ncurses should set USE_NCURSES diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f3f569bb7fd..80ed987cd89 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1076 2002/10/22 22:57:56 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1077 2002/10/23 12:21:29 wiz Exp $ # # This file is in the public domain. # @@ -300,25 +300,6 @@ _ULIMIT_CMD+= ${ULIMIT_CMD_${__tmp__}} ; . endfor .endif -# -lintl in CONFIGURE_ENV is to workaround broken gettext.m4 -# (gettext.m4 does not add -lintl where it should, and fails to detect -# if libintl.a is genuine GNU gettext or not). -.if ${_DO_LIBINTL_CHECKS} == "yes" -. if defined(USE_LIBINTL) -. if exists(/usr/include/libintl.h) -. if defined(GNU_CONFIGURE) -LIBS+= -lintl -. endif -. else -DEPENDS+= gettext-lib>=0.10.35nb1:../../devel/gettext-lib -. if defined(GNU_CONFIGURE) -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lintl -. endif -. endif -. endif -.endif - CPPFLAGS+= ${CPP_PRECOMP_FLAGS} # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script. diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 782ef9bf8fd..4632d0599cf 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.30 2002/10/09 00:00:26 schmonz Exp $ +# $NetBSD: defs.Darwin.mk,v 1.31 2002/10/23 12:21:30 wiz Exp $ # # Variable definitions for the Darwin operating system. @@ -75,7 +75,6 @@ ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` USERADD?= ${FALSE} # XXX - Fix me! ZOULARISBASE?= ${LOCALBASE} -_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _DO_SHLIB_CHECKS= yes # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _OPSYS_HAS_GMAKE= yes # GNU make is standard diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index b6384e7a573..858fe90497b 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.31 2002/10/04 23:32:17 jlam Exp $ +# $NetBSD: defs.Linux.mk,v 1.32 2002/10/23 12:21:30 wiz Exp $ # # Variable definitions for the Linux operating system. @@ -79,7 +79,6 @@ ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` USERADD?= /usr/sbin/useradd ZOULARISBASE?= /usr/pkg -_DO_LIBINTL_CHECKS= no # perform checks for valid libintl _DO_SHLIB_CHECKS= no # on installation, fixup PLIST for shared libs _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _OPSYS_HAS_GMAKE= yes # GNU make is standard diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 2292539b7b2..2e002fc4126 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.30 2002/10/16 23:42:00 itojun Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.31 2002/10/23 12:21:30 wiz Exp $ # # Variable definitions for the NetBSD operating system. @@ -89,7 +89,6 @@ ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` -_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs/run ldconfig _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake _OPSYS_HAS_GMAKE= no # GNU make is not standard diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 0e4c3745a1d..d204e45a5e3 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.31 2002/10/17 14:39:18 grant Exp $ +# $NetBSD: defs.SunOS.mk,v 1.32 2002/10/23 12:21:30 wiz Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -88,7 +88,6 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v` USERADD?= /usr/sbin/useradd -_DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs _IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake _OPSYS_HAS_GMAKE= no # GNU make is not standard |