svn commit: r334904 - head/accessibility/redshift
Mark Felder
feld at FreeBSD.org
Mon Nov 25 22:47:01 UTC 2013
Author: feld
Date: Mon Nov 25 22:47:00 2013
New Revision: 334904
URL: http://svnweb.freebsd.org/changeset/ports/334904
Log:
Fix building with the GUI option
Split the Gnome clock integration into its own option
PR: ports/182925
Approved by: swills (mentor)
Modified:
head/accessibility/redshift/Makefile
head/accessibility/redshift/pkg-plist
Modified: head/accessibility/redshift/Makefile
==============================================================================
--- head/accessibility/redshift/Makefile Mon Nov 25 22:46:28 2013 (r334903)
+++ head/accessibility/redshift/Makefile Mon Nov 25 22:47:00 2013 (r334904)
@@ -18,10 +18,11 @@ INSTALLS_ICONS= yes
CONFIGURE_ARGS+= --disable-wingdi
-OPTIONS_DEFINE= GUI NLS RANDR VIDMODE
+OPTIONS_DEFINE= GNOME GUI NLS RANDR VIDMODE
OPTIONS_DEFAULT= RANDR
-GUI_DESC= Tray icon and location via Gnome clock
+GNOME_DESC= GNOME clock support
+GUI_DESC= Tray icon
RANDR_DESC= Support RANDR for changing colors
VIDMODE_DESC= Support VIDMODE for changing colors (NVIDIA)
@@ -51,13 +52,24 @@ CONFIGURE_ARGS+=--disable-vidmode
.endif
.if ${PORT_OPTIONS:MGUI}
-CONFIGURE_ARGS+=--enable-gui --enable-gnome-clock
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
- ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg
+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 --disable-gnome-clock
+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
+
.include <bsd.port.mk>
Modified: head/accessibility/redshift/pkg-plist
==============================================================================
--- head/accessibility/redshift/pkg-plist Mon Nov 25 22:46:28 2013 (r334903)
+++ head/accessibility/redshift/pkg-plist Mon Nov 25 22:47:00 2013 (r334904)
@@ -23,21 +23,21 @@ share/icons/hicolor/scalable/apps/redshi
%%NLS%%share/locale/ru/LC_MESSAGES/redshift.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/redshift.mo
%%GUI%%bin/gtk-redshift
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/__init__.py
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/__init__.pyc
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/__init__.pyo
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/defs.py
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/defs.pyc
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/defs.pyo
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/statusicon.py
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/statusicon.pyc
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/statusicon.pyo
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/utils.py
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/utils.pyc
-%%GUI%%lib/python2.6/site-packages/gtk_redshift/utils.pyo
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/__init__.py
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/__init__.pyc
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/__init__.pyo
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/defs.py
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/defs.pyc
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/defs.pyo
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/statusicon.py
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/statusicon.pyc
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/statusicon.pyo
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/utils.py
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/utils.pyc
+%%GUI%%%%PYTHON_SITELIBDIR%%/gtk_redshift/utils.pyo
%%GUI%%share/applications/gtk-redshift.desktop
@dirrmtry share/icons/hicolor/scalable/apps
@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
-%%GUI%%@dirrmtry lib/python2.6/site-packages/gtk_redshift
+%%GUI%%@dirrmtry %%PYTHON_SITELIBDIR%%/gtk_redshift
More information about the svn-ports-all
mailing list