diff options
| author | Mark Felder <feld@FreeBSD.org> | 2013-11-25 22:47:00 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2013-11-25 22:47:00 +0000 |
| commit | 529e46878cb4bc3c46ecfe14e813cbe6269b7655 (patch) | |
| tree | 16d309045428f710879f2729a50cb78724132b3e /accessibility | |
| parent | Update to new upstream release candidate #3, with three changes since RC1: (diff) | |
Fix building with the GUI option
Split the Gnome clock integration into its own option
PR: ports/182925
Approved by: swills (mentor)
Notes
Notes:
svn path=/head/; revision=334904
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/redshift/Makefile | 24 | ||||
| -rw-r--r-- | accessibility/redshift/pkg-plist | 26 |
2 files changed, 31 insertions, 19 deletions
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile index 8476fd38c14e..80baf7549eb9 100644 --- a/accessibility/redshift/Makefile +++ b/accessibility/redshift/Makefile @@ -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> diff --git a/accessibility/redshift/pkg-plist b/accessibility/redshift/pkg-plist index 90d8a2055d70..8bb57a880508 100644 --- a/accessibility/redshift/pkg-plist +++ b/accessibility/redshift/pkg-plist @@ -23,21 +23,21 @@ share/icons/hicolor/scalable/apps/redshift-status-on.svg %%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 |