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 /textproc | |
| 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 'textproc')
| -rw-r--r-- | textproc/expat/builtin.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk index affa0e49395..1b6ea514d5b 100644 --- a/textproc/expat/builtin.mk +++ b/textproc/expat/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:15 jlam Exp $ +# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $ _EXPAT_H= ${X11BASE}/include/expat.h _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl @@ -30,16 +30,11 @@ _EXPAT_MICRO!= \ ${_EXPAT_H} _EXPAT_VERSION= ${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO} BUILTIN_PKG.expat= expat-${_EXPAT_VERSION} -MAKEFLAGS+= BUILTIN_PKG.expat=${BUILTIN_PKG.expat} +BUILDLINK_VARS+= BUILTIN_PKG.expat . endif . endif -MAKEFLAGS+= IS_BUILTIN.expat=${IS_BUILTIN.expat} -.endif - -CHECK_BUILTIN.expat?= no -.if !empty(CHECK_BUILTIN.expat:M[yY][eE][sS]) -USE_BUILTIN.expat= yes -.endif +BUILDLINK_VARS+= IS_BUILTIN.expat +.endif # IS_BUILTIN.expat .if !defined(USE_BUILTIN.expat) USE_BUILTIN.expat?= ${IS_BUILTIN.expat} @@ -59,6 +54,9 @@ USE_BUILTIN.expat!= \ . endif .endif # USE_BUILTIN.expat +CHECK_BUILTIN.expat?= no +.if !empty(CHECK_BUILTIN.expat:M[nN][oO]) + .if !empty(USE_BUILTIN.expat:M[nN][oO]) BUILDLINK_DEPENDS.expat+= expat>=1.95.4 .endif @@ -67,3 +65,5 @@ BUILDLINK_DEPENDS.expat+= expat>=1.95.4 BUILDLINK_PREFIX.expat= ${X11BASE} USE_X11= yes .endif + +.endif # CHECK_BUILTIN.expat |