summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-05 07:17:14 +0000
committerjlam <jlam>2004-02-05 07:17:14 +0000
commit609b1ecd9faf34479e407e0dd09192ab6e0e39ef (patch)
treeedbbed6f9491b43337c846644df6d1c3e8ce8f32 /converters
parentb1770a7720f03a2832f44de82413ac976f8a3c93 (diff)
downloadpkgsrc-609b1ecd9faf34479e407e0dd09192ab6e0e39ef.tar.gz
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/buildlink2.mk8
-rw-r--r--converters/libiconv/buildlink3.mk8
2 files changed, 6 insertions, 10 deletions
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index da186c14800..37a4520a1e8 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.14 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2004/02/05 07:17:14 jlam Exp $
.if !defined(ICONV_BUILDLINK2_MK)
ICONV_BUILDLINK2_MK= # defined
@@ -33,11 +33,9 @@ _NEED_ICONV= YES
. endfor
.endif
-.if defined(PREFER_PKGSRC)
-. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:Miconv)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(PREFER_PKGSRC:Miconv)
_NEED_ICONV= YES
-. endif
.endif
.if ${_NEED_ICONV} == "YES"
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index 6079e90643f..d1353edd5c1 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -20,11 +20,9 @@ BUILDLINK_IS_BUILTIN.iconv= YES
. endif
.endif
-.if defined(PREFER_PKGSRC)
-. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:Miconv)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(PREFER_PKGSRC:Miconv)
BUILDLINK_USE_BUILTIN.iconv= NO
-. endif
.endif
.if defined(USE_GNU_ICONV)