diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-29 05:43:28 +0000 |
| commit | a80d266a4620e732c3d6da660a316aa6eb017164 (patch) | |
| tree | 2684bb3d4a41538be1b78668954f44c69a49033d /devel/gettext-lib | |
| parent | 8a7eccf2586e657ebc5f1d274226f0cc281e66cf (diff) | |
| download | pkgsrc-a80d266a4620e732c3d6da660a316aa6eb017164.tar.gz | |
Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
Diffstat (limited to 'devel/gettext-lib')
| -rw-r--r-- | devel/gettext-lib/builtin.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk index 722b706b355..3576d21ce69 100644 --- a/devel/gettext-lib/builtin.mk +++ b/devel/gettext-lib/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/22 20:57:38 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $ .if !defined(_BLNK_LIBINTL_FOUND) _BLNK_LIBINTL_FOUND!= \ @@ -7,7 +7,7 @@ _BLNK_LIBINTL_FOUND!= \ else \ ${ECHO} "yes"; \ fi -MAKEFLAGS+= _BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND} +BUILDLINK_VARS+= _BLNK_LIBINTL_FOUND .endif _LIBINTL_H= /usr/include/libintl.h @@ -26,16 +26,15 @@ IS_BUILTIN.gettext!= \ # XXX Consider the native libintl to be gettext-lib-0.10.35nb1. # XXX BUILTIN_PKG.gettext= gettext-lib-0.10.35nb1 -MAKEFLAGS+= BUILTIN_PKG.gettext=${BUILTIN_PKG.gettext} +BUILDLINK_VARS+= BUILTIN_PKG.gettext . endif . endif -MAKEFLAGS+= IS_BUILTIN.gettext=${IS_BUILTIN.gettext} -.endif +BUILDLINK_VARS+= IS_BUILTIN.gettext +.endif # IS_BUILTIN.gettext -CHECK_BUILTIN.gettext?= no -.if !empty(CHECK_BUILTIN.gettext:M[yY][eE][sS]) -USE_BUILTIN.gettext= yes -.endif +#.if defined(USE_BUILTIN.iconv) && !empty(USE_BUILTIN.iconv:M[nN][oO]) +#USE_BUILTIN.gettext= no +#.endif .if !defined(USE_BUILTIN.gettext) USE_BUILTIN.gettext?= ${IS_BUILTIN.gettext} @@ -83,6 +82,9 @@ USE_BUILTIN.gettext= no . endif .endif # USE_BUILTIN.gettext +CHECK_BUILTIN.gettext?= no +.if !empty(CHECK_BUILTIN.gettext:M[nN][oO]) + .if !empty(USE_BUILTIN.gettext:M[nN][oO]) _BLNK_LIBINTL= -lintl _GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1 @@ -147,3 +149,5 @@ CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} CONFIGURE_ARGS+= --without-libintl-prefix . endif .endif + +.endif # CHECK_BUILTIN.gettext |