Index: head/accessibility/py-papi/Makefile
===================================================================
--- head/accessibility/py-papi/Makefile	(revision 360452)
+++ head/accessibility/py-papi/Makefile	(revision 360453)
@@ -1,36 +1,32 @@
 # Created by: Marcus von Appen
 # $FreeBSD$
 
 PORTNAME=	papi
 PORTVERSION=	0.0.9
 CATEGORIES=	accessibility devel python
 MASTER_SITES=	SF/ocemp/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	ATK accessibility wrapper for python
 
 USES=		pkgconfig
 USE_GNOME=	atk
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 EXAMPLES=	atkaction.py atkapplication.py atkcapi.c atktext.py atkvalue.py \
 		msaaapplication.py msaacapi.cpp
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	${REINPLACE_CMD} -i "" -e 's|: docfiles|: []|g' ${WRKSRC}/setup.py
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/
 	@cd ${WRKSRC}/doc/examples && \
 		${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
Index: head/accessibility/redshift/Makefile
===================================================================
--- head/accessibility/redshift/Makefile	(revision 360452)
+++ head/accessibility/redshift/Makefile	(revision 360453)
@@ -1,73 +1,46 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	redshift
 PORTVERSION=	1.7
 PORTREVISION=	1
 CATEGORIES=	accessibility
 MASTER_SITES=	http://launchpad.net/redshift/trunk/${PORTVERSION}/+download/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Adjusts the color temperature of your screen
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS+=	--disable-wingdi
 
 OPTIONS_DEFINE=	GNOME GUI NLS RANDR VIDMODE
-OPTIONS_DEFAULT=	RANDR
+OPTIONS_DEFAULT=RANDR
+OPTIONS_SUB=	yes
 
 GNOME_DESC=	GNOME clock support
 GUI_DESC=	Tray icon
 RANDR_DESC=	Support RANDR for changing colors
 VIDMODE_DESC=	Support VIDMODE for changing colors (NVIDIA)
 
-.include <bsd.port.options.mk>
+NLS_USES=		gettext iconv
+NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
+			--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF=	--disable-nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} \
-                --with-libintl-prefix=${LOCALBASE}
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
+RANDR_USE=		XORG=xrandr
+RANDR_CONFIGURE_ENABLE=	randr
 
-.if ${PORT_OPTIONS:MRANDR}
-CONFIGURE_ARGS+=--enable-randr
-USE_XORG=	xrandr
-.else
-CONFIGURE_ARGS+=--disable-randr
-.endif
+VIDMODE_CONFIGURE_ENABLE=	vidmode
 
-.if ${PORT_OPTIONS:MVIDMODE}
-CONFIGURE_ARGS+=--enable-vidmode
-.else
-CONFIGURE_ARGS+=--disable-vidmode
-.endif
+GUI_USE=		PYTHON=yes
+GUI_CONFIGURE_ENABLE=	gui
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
+			${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
 
-.if ${PORT_OPTIONS:MGUI}
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=--enable-gui
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=--disable-gui
-PLIST_SUB+=	GUI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGNOME}
-CONFIGURE_ARGS+=--enable-gnome-clock
-BUILD_DEPENDS+=	glib>0:${PORTSDIR}/devel/glib20 \
-		gconf2>0:${PORTSDIR}/devel/gconf2
-RUN_DEPENDS+=	glib>0:${PORTSDIR}/devel/glib20 \
-		gconf2>0:${PORTSDIR}/devel/gconf2
-.else
-CONFIGURE_ARGS+=--disable-gnome-clock
-.endif
+GNOME_CONFIGURE_ENABLE=	gnome-clock
+GNOME_USE=		GNOME=glib20,gconf2
 
 .include <bsd.port.mk>