fltk14-devel: Drop cairo option

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Oct 17 13:50:43 2019 +0200
Changeset:	10d5df3e08dd36dc47529e41671230c3db971ecc

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/buildlink3.mk
	fltk14-devel/options.mk

Log Message:
fltk14-devel: Drop cairo option

Give up on attempt to support Cairo. Would require insane patching
of build system to work with libtool and dynamic linking.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=10d5df3e08dd36dc47529e41671230c3db971ecc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/Makefile      | 8 +++-----
 fltk14-devel/buildlink3.mk | 5 -----
 fltk14-devel/options.mk    | 9 +--------
 3 files changed, 4 insertions(+), 18 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index fc02ad63ac..27b1fc3d51 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -47,11 +47,9 @@ pre-configure:
 # ------------------------------------------------------
 
 .if ${OPSYS} != "Darwin"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-#BUILDLINK_DEPMETHOD.libXt?=	build
-#.include "../../x11/libXt/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXft/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index 65ed85ae27..69b6607676 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -14,11 +14,6 @@ pkgbase := fltk
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../mk/pkg-build-options.mk"
 
-# For "cairo" option
-.if !empty(PKG_BUILD_OPTIONS.fltk:Mcairo)
-.  include "../../graphics/cairo/buildlink3.mk"
-.endif
-
 # For "opengl" option
 .if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
 .  if ${OPSYS} != "Darwin"
diff --git a/fltk14-devel/options.mk b/fltk14-devel/options.mk
index a1dd98dc9f..613bd173c6 100644
--- a/fltk14-devel/options.mk
+++ b/fltk14-devel/options.mk
@@ -1,20 +1,13 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk14
-PKG_SUPPORTED_OPTIONS=	cairo opengl pango
+PKG_SUPPORTED_OPTIONS=	opengl pango
 PKG_SUGGESTED_OPTIONS=	opengl pango
 PLIST_VARS+=		opengl
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mcairo)
-.  include "../../graphics/cairo/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-cairo
-.else
-CONFIGURE_ARGS+=	--disable-cairo
-.endif
-
 .if !empty(PKG_OPTIONS:Mopengl)
 .  if ${OPSYS} != "Darwin"
 .     include "../../graphics/MesaLib/buildlink3.mk"