diff options
| author | hira <hira> | 2008-03-09 11:17:27 +0000 |
|---|---|---|
| committer | hira <hira> | 2008-03-09 11:17:27 +0000 |
| commit | 4125cc05c3fb5946136930ea28ba2cbb2e961ee6 (patch) | |
| tree | 81a7f2e5780c87b957835d7570ceeb9a2bd2e642 /devel | |
| parent | 630b5142fe938bffe5f1c59218ba3a47c924bfd5 (diff) | |
| download | pkgsrc-4125cc05c3fb5946136930ea28ba2cbb2e961ee6.tar.gz | |
Fix build with X11_TYPE=modular (s|fonts/Xft2|x11/libXft|).
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/m17n-lib/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/m17n-lib/options.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk index 3ee2b27a307..4c9b3f655cd 100644 --- a/devel/m17n-lib/buildlink3.mk +++ b/devel/m17n-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/03/09 11:17:27 hira Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ M17N_LIB_BUILDLINK3_MK:= ${M17N_LIB_BUILDLINK3_MK}+ @@ -24,7 +24,6 @@ pkgbase := m17n-lib .endif .if !empty(PKG_BUILD_OPTIONS.m17n-lib:Mx11) -.include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" @@ -32,6 +31,7 @@ pkgbase := m17n-lib .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .endif diff --git a/devel/m17n-lib/options.mk b/devel/m17n-lib/options.mk index f9cd6bcbda6..83d3d3d9024 100644 --- a/devel/m17n-lib/options.mk +++ b/devel/m17n-lib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $ +# $NetBSD: options.mk,v 1.2 2008/03/09 11:17:27 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.m17n-lib PKG_SUPPORTED_OPTIONS= anthy x11 libthai @@ -11,11 +11,11 @@ PKG_SUGGESTED_OPTIONS= x11 .endif .if !empty(PKG_OPTIONS:Mx11) -.include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" .include "../../graphics/libotf/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" PLIST_SUBST+= X11="" .else |