Support the x11 option to enable/disable x and xft backends.

4 files changed, 51 insertions, 19 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 9f770b9d91c..10052b8ec94 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2006/05/29 17:08:43 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2006/07/23 04:59:33 minskim Exp $
 
 DISTNAME=		pango-1.12.3
 CATEGORIES=		devel fonts
@@ -39,15 +39,13 @@ CONFIGURE_ARGS+=	--with-qt=no
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
 
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+.include "options.mk"
+
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.10.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 153e58e269d..73a4a0efff8 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.25 2006/05/29 17:08:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2006/07/23 04:59:34 minskim Exp $
 bin/pango-querymodules
-bin/pango-view
+${X11}bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
 include/pango-1.0/pango/pango-context.h
@@ -27,17 +27,17 @@ include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
 include/pango-1.0/pango/pangoft2.h
-include/pango-1.0/pango/pangox.h
-include/pango-1.0/pango/pangoxft-render.h
-include/pango-1.0/pango/pangoxft.h
+${X11}include/pango-1.0/pango/pangox.h
+${X11}include/pango-1.0/pango/pangoxft-render.h
+${X11}include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.la
 lib/libpangocairo-1.0.la
 lib/libpangoft2-1.0.la
-lib/libpangox-1.0.la
-lib/libpangoxft-1.0.la
+${X11}lib/libpangox-1.0.la
+${X11}lib/libpangoxft-1.0.la
 lib/pango/1.5.0/modules/pango-arabic-fc.la
 lib/pango/1.5.0/modules/pango-basic-fc.la
-lib/pango/1.5.0/modules/pango-basic-x.la
+${X11}lib/pango/1.5.0/modules/pango-basic-x.la
 lib/pango/1.5.0/modules/pango-hangul-fc.la
 lib/pango/1.5.0/modules/pango-hebrew-fc.la
 lib/pango/1.5.0/modules/pango-indic-fc.la
@@ -48,10 +48,10 @@ lib/pango/1.5.0/modules/pango-tibetan-fc.la
 lib/pkgconfig/pango.pc
 lib/pkgconfig/pangocairo.pc
 lib/pkgconfig/pangoft2.pc
-lib/pkgconfig/pangox.pc
-lib/pkgconfig/pangoxft.pc
+${X11}lib/pkgconfig/pangox.pc
+${X11}lib/pkgconfig/pangoxft.pc
 libdata/pango/pango.modules
-libdata/pango/pangox.aliases
+${X11}libdata/pango/pangox.aliases
 man/man1/pango-querymodules.1
 share/doc/pango/PangoEngineLang.html
 share/doc/pango/PangoEngineShape.html
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 5446e85865a..57d66df3eaf 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:10:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/07/23 04:59:34 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PANGO_BUILDLINK3_MK:=	${PANGO_BUILDLINK3_MK}+
@@ -17,12 +17,25 @@ BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.12.1nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !defined(PKG_BUILD_OPTIONS.pango)
+PKG_BUILD_OPTIONS.pango!= \
+	cd ${BUILDLINK_PKGSRCDIR.pango} && \
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.pango=${PKG_BUILD_OPTIONS.pango:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.pango
+
+.if !empty(PKG_BUILD_OPTIONS.pango:Mx11)
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+.endif
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/pango/options.mk b/devel/pango/options.mk
new file mode 100644
index 00000000000..2a39ac793af
--- /dev/null
+++ b/devel/pango/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2006/07/23 04:59:34 minskim Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pango
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+###
+### X11 support
+###
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST_SUBST+=		X11=""
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUBST+=		X11="@comment "
+.endif