summaryrefslogtreecommitdiff
path: root/textproc/expat
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-03-19 12:34:12 +0000
committerjoerg <joerg@pkgsrc.org>2012-03-19 12:34:12 +0000
commit3fa6844b90128e447a14b987ba3a0092109b8aa3 (patch)
treea3955afe4cc63c2b002bc7b453f7fdc618bce538 /textproc/expat
parent32c8d39ca597eba9cb78a81fb767883d72a98142 (diff)
downloadpkgsrc-3fa6844b90128e447a14b987ba3a0092109b8aa3.tar.gz
Drop imake-check logic from X11 components' builtin.mk.
Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man pages, not cat pages when using imake. Unify the various imake PLIST variables in preparation for dropping. Adjust xbattbar for the new expectations.
Diffstat (limited to 'textproc/expat')
-rw-r--r--textproc/expat/builtin.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index d7fa665369b..ec97b741d9d 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2010/07/04 16:34:46 obache Exp $
+# $NetBSD: builtin.mk,v 1.16 2012/03/19 12:34:20 joerg Exp $
BUILTIN_PKG:= expat
@@ -14,15 +14,10 @@ BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h \
### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
###
.if !defined(IS_BUILTIN.expat)
-IS_BUILTIN.expat= no
. if empty(H_EXPAT:M__nonexistent__)
-. if !empty(H_EXPAT:M${X11BASE}/*)
-BUILTIN_IMAKE_CHECK:= expat:BuildExpatLibrary
-. include "../../mk/buildlink3/imake-check.mk"
-IS_BUILTIN.expat= ${BUILTIN_IMAKE_CHECK.expat}
-. else
IS_BUILTIN.expat= yes
-. endif
+. else
+IS_BUILTIN.expat= no
. endif
.endif
MAKEVARS+= IS_BUILTIN.expat