diff options
| author | wiz <wiz> | 2011-03-06 16:04:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-03-06 16:04:32 +0000 |
| commit | ec2ace06fc53082166ff277433588edf67af8a87 (patch) | |
| tree | 7932e4d81f8c6f4753f6924d91737148ca0591da /x11 | |
| parent | 2d98e802e061dc1f3069a9f1f217fc87a685a51a (diff) | |
| download | pkgsrc-ec2ace06fc53082166ff277433588edf67af8a87.tar.gz | |
Remove options that use GTK1.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdebase-workspace4/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase-workspace4/options.mk | 10 | ||||
| -rw-r--r-- | x11/xscreensaver/options.mk | 11 |
3 files changed, 6 insertions, 18 deletions
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile index c228d6530bc..66bc26e4381 100644 --- a/x11/kdebase-workspace4/Makefile +++ b/x11/kdebase-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2011/02/25 09:47:30 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2011/03/06 16:04:33 wiz Exp $ DISTNAME= kdebase-workspace-${_KDE_VERSION} CATEGORIES= x11 @@ -72,6 +72,7 @@ RT_LIB_SCHED= rt RT_LIB_SCHED= # empty .endif CMAKE_ARGS+= -DRT_LIB_SCHED=${RT_LIB_SCHED} +CMAKE_ARGS+= -DWITH_Xmms:BOOL=OFF # genkdmconf wont install faces if using destdir so do it ourselves INSTALLATION_DIRS+= share/kde/apps/kdm/faces diff --git a/x11/kdebase-workspace4/options.mk b/x11/kdebase-workspace4/options.mk index 77673ca16a7..3287286daee 100644 --- a/x11/kdebase-workspace4/options.mk +++ b/x11/kdebase-workspace4/options.mk @@ -1,18 +1,12 @@ -# $NetBSD: options.mk,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $ +# $NetBSD: options.mk,v 1.2 2011/03/06 16:04:33 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase-workspace -PKG_SUPPORTED_OPTIONS= inet6 xmms +PKG_SUPPORTED_OPTIONS= inet6 #PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam #PKG_SUGGESTED_OPTIONS= sasl .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mxmms) -.include "../../audio/xmms/buildlink3.mk" -.else -CMAKE_ARGS+= -DWITH_Xmms:BOOL=OFF -.endif - #.if !empty(PKG_OPTIONS:Msamba) #.include "../../net/samba/buildlink3.mk" #LIBS+= -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba diff --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk index 15f615754eb..a167c70c704 100644 --- a/x11/xscreensaver/options.mk +++ b/x11/xscreensaver/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.6 2010/05/08 16:53:06 tez Exp $ +# $NetBSD: options.mk,v 1.7 2011/03/06 16:04:33 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xscreensaver -PKG_SUPPORTED_OPTIONS= pam webcollage opengl gdk-pixbuf +PKG_SUPPORTED_OPTIONS= pam webcollage opengl PKG_SUGGESTED_OPTIONS= opengl .include "../../mk/bsd.options.mk" @@ -40,10 +40,3 @@ CONFIGURE_ARGS+= --with-gle CONFIGURE_ARGS+= --without-gl CONFIGURE_ARGS+= --without-gle .endif - -.if !empty(PKG_OPTIONS:Mgdk-pixbuf) -CONFIGURE_ARGS+= --with-pixbuf -.include "../../graphics/gdk-pixbuf/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-pixbuf -.endif |