diff options
| author | markd <markd> | 2005-03-24 04:47:58 +0000 |
|---|---|---|
| committer | markd <markd> | 2005-03-24 04:47:58 +0000 |
| commit | d0d73216ed5958813a8110685028e1262e7a9ad1 (patch) | |
| tree | 135bdc240862637df27bcea1e261de979e6dbcf1 /x11/kdebase3 | |
| parent | b7d901f10c9397ab59d8958365a41549161c2861 (diff) | |
| download | pkgsrc-d0d73216ed5958813a8110685028e1262e7a9ad1.tar.gz | |
Add missing explicit dependency on cyrus-sasl2. Make it optional but
on by default. The default might be changed later if the common
authentication cases are covered without it.
Diffstat (limited to 'x11/kdebase3')
| -rw-r--r-- | x11/kdebase3/Makefile | 8 | ||||
| -rw-r--r-- | x11/kdebase3/buildlink3.mk | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 32cfdd28ab1..a2f87c55d91 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2005/03/23 21:44:37 markd Exp $ +# $NetBSD: Makefile,v 1.70 2005/03/24 04:47:58 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} CATEGORIES= x11 @@ -74,8 +74,9 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no PLIST_SRC+= ${PKGDIR}/PLIST +PKG_DEFAULT_OPTIONS+= sasl2 PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase -PKG_SUPPORTED_OPTIONS= samba +PKG_SUPPORTED_OPTIONS= sasl2 samba .include "../../mk/bsd.options.mk" BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 @@ -143,6 +144,9 @@ post-install: .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" +.if !empty(PKG_OPTIONS:Msasl2) +.include "../../security/cyrus-sasl2/buildlink3.mk" +.endif .include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/xcursor/buildlink3.mk" diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index e8d5940d862..8423dfb3992 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 21:44:37 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 04:47:58 markd Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -16,12 +16,20 @@ BUILDLINK_RECOMMENDED.kdebase?= kdebase>=3.4.0 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 .endif # KDEBASE_BUILDLINK3_MK +PKG_OPTIONS.kdebase?= ${PKG_DEFAULT_OPTIONS} + BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 .include "../../databases/openldap/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" +.if !empty(PKG_OPTIONS.kdebase:Msamba) +. include "../../net/samba/buildlink3.mk" +.endif +.if !empty(PKG_OPTIONS.kdebase:Msasl2) +. include "../../security/cyrus-sasl2/buildlink3.mk" +.endif .include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/xcursor/buildlink3.mk" |