From 7518f3bbf724960dd4a361ff2fe0f68ce1468be7 Mon Sep 17 00:00:00 2001 From: Tim Larson Date: Mon, 12 Nov 2012 23:26:26 +0000 Subject: [PATCH] Added buildlink3 file for easier dependencies. Made fam non-optional instead of a standard option. --- edelib/Makefile | 7 ++++--- edelib/buildlink3.mk | 13 +++++++++++++ edelib/options.mk | 11 +---------- 3 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 edelib/buildlink3.mk diff --git a/edelib/Makefile b/edelib/Makefile index c175332129..22194b2e6c 100644 --- a/edelib/Makefile +++ b/edelib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/11/07 19:42:21 christtrekker Exp $ +# $NetBSD: Makefile,v 1.11 2012/11/12 23:26:26 christtrekker Exp $ # DISTNAME= edelib-2.0 @@ -24,8 +24,8 @@ PKGCONFIG_OVERRIDE+= edelib-gui.pc.in PKGCONFIG_OVERRIDE+= edelib.pc.in PKG_OPTIONS_VAR= PKG_OPTIONS.edelib -PKG_SUPPORTED_OPTIONS= fam fam-only largefile nls shared -PKG_SUGGESTED_OPTIONS= fam nls shared +PKG_SUPPORTED_OPTIONS= largefile nls shared +PKG_SUGGESTED_OPTIONS= nls shared PLIST_VARS+= shlibs statlibs .include "../../mk/bsd.prefs.mk" @@ -45,6 +45,7 @@ BUILD_DEPENDS+= doxygen:../../devel/doxygen BUILD_DEPENDS+= jam:../../devel/jam +.include "../../mk/fam.buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/fltk13/buildlink3.mk" diff --git a/edelib/buildlink3.mk b/edelib/buildlink3.mk new file mode 100644 index 0000000000..50940ad816 --- /dev/null +++ b/edelib/buildlink3.mk @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.1 2012/11/12 23:26:27 christtrekker Exp $ + +BUILDLINK_TREE+= edelib + +.if !defined(EDELIB_BUILDLINK3_MK) +EDELIB_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.edelib+= edelib>=2.0 +BUILDLINK_PKGSRCDIR.edelib?= ../../wip/edelib + +.endif # EDELIB_BUILDLINK3_MK + +BUILDLINK_TREE+= -edelib diff --git a/edelib/options.mk b/edelib/options.mk index da677bf193..cdb7f34e3c 100644 --- a/edelib/options.mk +++ b/edelib/options.mk @@ -1,13 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2012/11/07 19:42:21 christtrekker Exp $ - -.if !empty(PKG_OPTIONS:Mfam) || !empty(PKG_OPTIONS:Mfam-only) -. include "../../mk/fam.buildlink3.mk" -. if !empty(PKG_OPTIONS:Mfam-only) -CONFIGURE_ARGS+= --enable-fam-only -. else -CONFIGURE_ARGS+= --disable-fam-only -. endif -.endif +# $NetBSD: options.mk,v 1.4 2012/11/12 23:26:27 christtrekker Exp $ .if !empty(PKG_OPTIONS:Mlargefile) CONFIGURE_ARGS+= --enable-largefile