diff options
| author | joerg <joerg> | 2012-03-19 12:34:12 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-03-19 12:34:12 +0000 |
| commit | ad2bf164272bde84fc59271276f26d61b4d62e93 (patch) | |
| tree | a3955afe4cc63c2b002bc7b453f7fdc618bce538 /fonts | |
| parent | 5f53554e3f26ee6c0c33e06243267f899af6e951 (diff) | |
| download | pkgsrc-ad2bf164272bde84fc59271276f26d61b4d62e93.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 'fonts')
| -rw-r--r-- | fonts/Xft2/builtin.mk | 9 | ||||
| -rw-r--r-- | fonts/fontconfig/builtin.mk | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/fonts/Xft2/builtin.mk b/fonts/Xft2/builtin.mk index 4c900dc738f..c6a49e18321 100644 --- a/fonts/Xft2/builtin.mk +++ b/fonts/Xft2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.17 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:12 joerg Exp $ BUILTIN_PKG:= Xft2 @@ -12,11 +12,10 @@ BUILTIN_FIND_FILES.H_XFT2= ${X11BASE}/include/X11/Xft/Xft.h ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.Xft2) -IS_BUILTIN.Xft2= no . if empty(H_XFT2:M__nonexistent__) -BUILTIN_IMAKE_CHECK:= Xft2:BuildXftLibrary -. include "../../mk/buildlink3/imake-check.mk" -IS_BUILTIN.Xft2= ${BUILTIN_IMAKE_CHECK.Xft2} +IS_BUILTIN.Xft2= yes +. else +IS_BUILTIN.Xft2= no . endif .endif MAKEVARS+= IS_BUILTIN.Xft2 diff --git a/fonts/fontconfig/builtin.mk b/fonts/fontconfig/builtin.mk index 82d5afb1cdd..01443e82012 100644 --- a/fonts/fontconfig/builtin.mk +++ b/fonts/fontconfig/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2008/10/05 21:36:35 cube Exp $ +# $NetBSD: builtin.mk,v 1.11 2012/03/19 12:34:13 joerg Exp $ BUILTIN_PKG:= fontconfig @@ -13,11 +13,10 @@ BUILTIN_FIND_FILES.H_FONTCONFIG= \ ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.fontconfig) -IS_BUILTIN.fontconfig= no . if empty(H_FONTCONFIG:M__nonexistent__) -BUILTIN_IMAKE_CHECK:= fontconfig:BuildFontconfigLibrary -. include "../../mk/buildlink3/imake-check.mk" -IS_BUILTIN.fontconfig= ${BUILTIN_IMAKE_CHECK.fontconfig} +IS_BUILTIN.fontconfig= yes +. else +IS_BUILTIN.fontconfig= no . endif .endif MAKEVARS+= IS_BUILTIN.fontconfig |