Convert to new options framework

5 files changed, 44 insertions, 49 deletions

diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index 24e8c483e321..4db98686307c 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -23,36 +23,32 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
 
 NO_BUILD=	yes
 
-OPTIONS=	EXTRA "Enable extra plugins" on \
-		UNSUP "Enable unsupported plugins" off \
-		EMERALD "Enable emerald window decorator" on \
-		GCONF "Enable the gconf backend" on
-# Hold off on this until I can get a clean tb run...
-#		KCONFIG "Enable kconfig backend" off
+OPTIONS_DEFINE=	EXTRA UNSUP EMERALD GCONF
+OPTIONS_DEFAULT=	GCONF EXTRA EMERALD
+
+EXTRA_DESC=	Enable extra plugins
+UNSUP_DESC=	Enable unsupported plugins
+EMERALD_DESC=	Enable emerald window decorator
 
 do-install:	# empty
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_EXTRA)
+.if ${PORT_OPTIONS:MEXTRA}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-plugins-extra
 .endif
 
-.if defined(WITH_UNSUP)
+.if ${PORT_OPTIONS:MUNSUP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-plugins-unsupported
 .endif
 
-.if !defined(WITHOUT_EMERALD)
+.if ${PORT_OPTIONS:MEMERALD}
 RUN_DEPENDS+=	${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald \
 		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.ini:${PORTSDIR}/x11-themes/emerald-themes
 .endif
 
-.if !defined(WITHOUT_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
 RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libgconf.so:${PORTSDIR}/x11-wm/compizconfig-backend-gconf
 .endif
 
-#.if defined(WITH_KCONFIG)
-#RUN_DEPENDS+=	${LOCALBASE}/lib/compizconfig/backends/libkconfig.so:${PORTSDIR}/x11-wm/compizconfig-backend-kconfig
-#.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 9b5c1e31faf8..5c2e9c512663 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -69,13 +69,10 @@ GCONF_SCHEMAS=	gwd.schemas \
 CONFIGURE_ARGS=	--disable-kde4
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	RSVG "Enable librsvg2 support" on \
-		GTK "Enable gtk2 support" on \
-		METACITY "Enable Metacity support" on \
-		GNOME "Enable Gnome support" on \
-		DBUS "Enable DBUS support" on \
-		FUSEFS "Enable fusefs support" off \
-		KDE "Enable KDE support" off
+OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE KDE3
+OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
+
+METACITY_DESC=	Enable Metacity support
 
 SUB_FILES=		compiz-manager
 DESKTOP_ENTRIES=	"Compiz Manager" \
@@ -93,7 +90,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_RSVG)
+.if ${PORT_OPTIONS:MSVG}
 CONFIGURE_ARGS+=	--enable-librsvg
 USE_GNOME+=		librsvg2
 PLIST_SUB+=		RSVG=""
@@ -102,23 +99,23 @@ CONFIGURE_ARGS+=	--disable-librsvg
 PLIST_SUB+=		RSVG="@comment "
 .endif
 
-.if !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gtk
 USE_GNOME+=	 glib20 libwnck
-PLIST_SUB+=	GTK=""
+PLIST_SUB+=	GTK2=""
 .else
 CONFIGURE_ARGS+=	--disable-gtk
-PLIST_SUB+=	GTK="@comment "
+PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if !defined(WITHOUT_METACITY) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MMETACITY} && ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-metacity
 USE_GNOME+=	metacity
 .else
 CONFIGURE_ARGS+=	--disable-metacity
 .endif
 
-.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
+.if ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--enable-gnome \
 			--enable-gnome-keybindings
 USE_GNOME+=	 gnomecontrolcenter2
@@ -135,11 +132,11 @@ CONFIGURE_ARGS+=	--disable-gnome \
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 CONFIGURE_ARGS+=	--enable-dbus
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
-.if !defined(WITHOUT_GTK) && !defined(WITHOUT_GNOME)
+.if ${PORT_OPTIONS:MGTK} && ${PORT_OPTIONS:MGNOME}
 CONFIGURE_ARGS+=	--enable-dbus-glib
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
@@ -150,25 +147,25 @@ CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if defined(WITH_FUSEFS)
+.if ${PORT_OPTIONS:MFUSE}
 CONFIGURE_ARGS+=	--enable-fuse
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
-PLIST_SUB+=		FUSEFS=""
+PLIST_SUB+=		FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse
-PLIST_SUB+=		FUSEFS="@comment "
+PLIST_SUB+=		FUSE="@comment "
 .endif
 
-.if defined(WITH_KDE)
+.if ${PORT_OPTIONS:MKDE3}
 USE_KDEBASE_VER=	3
 CONFIGURE_ARGS+=	--enable-kde
-PLIST_SUB+=	KDE=""
+PLIST_SUB+=	KDE3=""
 # allow bsd.kde.mk to be included after bsd.port.mk
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .else
 CONFIGURE_ARGS+=	--disable-kde
-PLIST_SUB+=	KDE="@comment "
+PLIST_SUB+=	KDE3="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 0a0e7cf0e353..a53116bdd2fe 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/compiz
 bin/compiz-manager
-%%GTK%%bin/gtk-window-decorator
-%%KDE%%bin/kde-window-decorator
+%%GTK2%%bin/gtk-window-decorator
+%%KDE3%%bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/compiz-common.h
 include/compiz/compiz-core.h
@@ -34,9 +34,9 @@ lib/compiz/libdecoration.so
 lib/compiz/libfade.a
 lib/compiz/libfade.la
 lib/compiz/libfade.so
-%%FUSEFS%%lib/compiz/libfs.a
-%%FUSEFS%%lib/compiz/libfs.la
-%%FUSEFS%%lib/compiz/libfs.so
+%%FUSE%%lib/compiz/libfs.a
+%%FUSE%%lib/compiz/libfs.la
+%%FUSE%%lib/compiz/libfs.so
 lib/compiz/libgconf.a
 lib/compiz/libgconf.la
 lib/compiz/libgconf.so
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index a7ed172e835d..b96bfd7af370 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Small window manager with themes and plugins
 
 LICENSE=	BSD
 
-OPTIONS=	ESOUND "Build sound plugin (requires EsounD)" off \
-		XINERAMA "Enable Xinerama extension support" on
+OPTIONS_DEFINE=	ESOUND XINERAMA
+OPTIONS_DEFAULT=	XINERAMA
 
 USE_PERL5_BUILD=yes
 USE_BZIP2=	yes
@@ -39,7 +39,7 @@ CFLAGS+=	-fPIC
 BROKEN=		Does not compile on ia64, powerpc, or sparc64
 .endif
 
-.if defined(WITH_ESOUND)
+.if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-sound
 PLIST_SUB+=	ESOUND=""
@@ -47,7 +47,7 @@ PLIST_SUB+=	ESOUND=""
 PLIST_SUB+=	ESOUND="@comment "
 .endif
 
-.if !defined(WITHOUT_XINERAMA)
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
 CONFIGURE_ARGS+=--enable-xinerama
 .endif
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 430b9c8c1047..bef6c0461084 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -27,7 +27,9 @@ USE_GNOME=	gnomehack intltool libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	INOTIFY "Enable inotify support" on
+OPTONS_DEFINE=	INOTIFY
+OPTIONS_DEFAULT=	INOTIFY
+INOTIFY_DESC?=	Enable inotify support
 
 .include <bsd.port.pre.mk>
 
@@ -36,13 +38,13 @@ OPTIONS=	INOTIFY "Enable inotify support" on
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-compiz.cpp
 .endif
 
-.if !defined(WITHOUT_INOTIFY)
+.if ${PORT_OPTIONS:MINOTIFY}
 LIB_DEPENDS+=	inotify.0:${PORTSDIR}/devel/libinotify
 LDFLAGS+=	-linotify
 .endif
 
 post-patch:
-.if defined(WITHOUT_INOTIFY)
+.if empty(PORT_OPTIONS:MINOTIFY)
 	@${REINPLACE_CMD} -e 's|sys/inotify.h||' ${WRKSRC}/configure
 .endif
 	@echo "OSVERSION=${OSVERSION}"