[pkgsrc/trunk]: pkgsrc/devel/gettext-lib Add some double quotes and move a se...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a5e80c5527d
branches:  trunk
changeset: 466077:4a5e80c5527d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 11 06:29:38 2004 +0000

description:
Add some double quotes and move a section into a protected region so we
don't keep re-evaluating it.

diffstat:

 devel/gettext-lib/buildlink3.mk |  29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diffs (61 lines):

diff -r 0d4aa19b40a8 -r 4a5e80c5527d devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Sun Jan 11 04:02:52 2004 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Sun Jan 11 06:29:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/01/06 19:13:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/01/11 06:29:38 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=        ${GETTEXT_BUILDLINK3_MK}+
@@ -59,16 +59,6 @@
        BUILDLINK_USE_BUILTIN.gettext="${BUILDLINK_USE_BUILTIN.gettext}"
 .endif
 
-.if !defined(_BLNK_LIBINTL_FOUND)
-_BLNK_LIBINTL_FOUND!=  \
-       if [ "`${ECHO} /usr/lib/libintl.*`" = "/usr/lib/libintl.*" ]; then \
-               ${ECHO} NO;                                             \
-       else                                                            \
-               ${ECHO} YES;                                            \
-       fi
-MAKEFLAGS+=    _BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
-.endif
-
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    gettext
@@ -82,14 +72,14 @@
 .    if !defined(_GETTEXT_NEEDS_ICONV)
 _GETTEXT_NEEDS_ICONV!= \
        if ${PKG_INFO} -qe "${BUILDLINK_DEPENDS.gettext}"; then         \
-               pkg=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -s "" lsbest '${BUILDLINK_DEPENDS.gettext}'`; \
+               pkg=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -S lsbest '${BUILDLINK_DEPENDS.gettext}'`; \
                if ${PKG_INFO} -qN "$$pkg" | ${GREP} -q "libiconv-[0-9]"; then \
-                       ${ECHO} YES;                                    \
+                       ${ECHO} "YES";                                  \
                else                                                    \
-                       ${ECHO} NO;                                     \
+                       ${ECHO} "NO";                                   \
                fi;                                                     \
        else                                                            \
-               ${ECHO} YES;                                            \
+               ${ECHO} "YES";                                          \
        fi
 MAKEFLAGS+=    _GETTEXT_NEEDS_ICONV=${_GETTEXT_NEEDS_ICONV}
 .    endif
@@ -99,6 +89,15 @@
 _BLNK_LIBINTL+=                        ${BUILDLINK_LDADD.iconv}
 .    endif
 .  else
+.    if !defined(_BLNK_LIBINTL_FOUND)
+_BLNK_LIBINTL_FOUND!=  \
+       if [ "`${ECHO} /usr/lib/libintl.*`" = "/usr/lib/libintl.*" ]; then \
+               ${ECHO} "NO";                                           \
+       else                                                            \
+               ${ECHO} "YES";                                          \
+       fi
+MAKEFLAGS+=    _BLNK_LIBINTL_FOUND="${_BLNK_LIBINTL_FOUND}"
+.    endif
 .    if ${_BLNK_LIBINTL_FOUND} == "YES"
 _BLNK_LIBINTL=         -lintl
 .    else