Wed Apr 30 12:20:09 2008 UTC ()
Add the libXcomposite buildlink when using the 'composite' option,
otherwise kompmgr won't be built.


(xtraeme)
diff -r1.4 -r1.5 pkgsrc/x11/kdebase3/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/x11/kdebase3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/kdebase3/Attic/options.mk 2008/04/12 22:43:14 1.4
+++ pkgsrc/x11/kdebase3/Attic/options.mk 2008/04/30 12:20:09 1.5
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:14 jlam Exp $ 1# $NetBSD: options.mk,v 1.5 2008/04/30 12:20:09 xtraeme Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase 3PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase
4PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam composite 4PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam composite
5PKG_SUGGESTED_OPTIONS= sasl 5PKG_SUGGESTED_OPTIONS= sasl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= composite 9PLIST_VARS+= composite
10.if !empty(PKG_OPTIONS:Mcomposite) 10.if !empty(PKG_OPTIONS:Mcomposite)
11CONFIGURE_ARGS+= --with-composite 11CONFIGURE_ARGS+= --with-composite
12PLIST.composite= yes 12PLIST.composite= yes
 13.include "../../x11/libXcomposite/buildlink3.mk"
13.else 14.else
14CONFIGURE_ARGS+= --without-composite 15CONFIGURE_ARGS+= --without-composite
15.endif 16.endif
16 17
17PLIST_VARS+= smb 18PLIST_VARS+= smb
18.if !empty(PKG_OPTIONS:Msamba) 19.if !empty(PKG_OPTIONS:Msamba)
19.include "../../net/samba/buildlink3.mk" 20.include "../../net/samba/buildlink3.mk"
20LIBS+= -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba 21LIBS+= -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba
21PLIST.smb= yes 22PLIST.smb= yes
22.endif 23.endif
23 24
24.if !empty(PKG_OPTIONS:Mdebug) 25.if !empty(PKG_OPTIONS:Mdebug)
25CC+= -ggdb 26CC+= -ggdb