Date: Thu, 3 Jul 2014 20:01:14 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360453 - in head/accessibility: py-papi redshift Message-ID: <201407032001.s63K1EgB050571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jul 3 20:01:14 2014 New Revision: 360453 URL: http://svnweb.freebsd.org/changeset/ports/360453 QAT: https://qat.redports.org/buildarchive/r360453/ Log: Reduce unnecessary bsd.port.options.mk inclusion by using OPTIONS helpers. Approved by: portmgr (blanket) Modified: head/accessibility/py-papi/Makefile head/accessibility/redshift/Makefile Modified: head/accessibility/py-papi/Makefile ============================================================================== --- head/accessibility/py-papi/Makefile Thu Jul 3 19:55:21 2014 (r360452) +++ head/accessibility/py-papi/Makefile Thu Jul 3 20:01:14 2014 (r360453) @@ -21,16 +21,12 @@ EXAMPLES= atkaction.py atkapplication.py 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> Modified: head/accessibility/redshift/Makefile ============================================================================== --- head/accessibility/redshift/Makefile Thu Jul 3 19:55:21 2014 (r360452) +++ head/accessibility/redshift/Makefile Thu Jul 3 20:01:14 2014 (r360453) @@ -17,57 +17,30 @@ 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 + +RANDR_USE= XORG=xrandr +RANDR_CONFIGURE_ENABLE= randr + +VIDMODE_CONFIGURE_ENABLE= vidmode + +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: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 - -.if ${PORT_OPTIONS:MRANDR} -CONFIGURE_ARGS+=--enable-randr -USE_XORG= xrandr -.else -CONFIGURE_ARGS+=--disable-randr -.endif - -.if ${PORT_OPTIONS:MVIDMODE} -CONFIGURE_ARGS+=--enable-vidmode -.else -CONFIGURE_ARGS+=--disable-vidmode -.endif - -.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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407032001.s63K1EgB050571>