From e730d999d3dd8305cbcbc35b739703175d0c2d68 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 7 Jan 2017 21:42:28 +0000 Subject: Add more PLIST_SUB to Mk/Uses/python.mk - Add PYTHON_PYOEXTENSION and PYTHON_SUFFIX - Add PYTHON2 and PYTHON3 - Respect PYTHON_VERSION - Rename PYOEXTENSION to PYTHON_PYOEXTENSION This change would help: - Build databases/postgresql*-plpython with Python 3 (It has PLIST issue since bsd.python.mk to Uses/python.mk transition) - Simplify Makefile PR: 205807 Differential Revision: https://reviews.FreeBSD.org/D4758 Exp-run by: antoine --- graphics/eog-plugins/Makefile | 46 +++++++++--------------------------------- graphics/eog-plugins/pkg-plist | 28 ++++++++++++------------- 2 files changed, 23 insertions(+), 51 deletions(-) (limited to 'graphics/eog-plugins') diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index 44c8aedee2e8..6899629de1de 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -29,48 +29,20 @@ GLIB_SCHEMAS= org.gnome.eog.plugins.exif-display.gschema.xml OPTIONS_DEFINE= CHAMPLAIN PYTHON OPTIONS_DEFAULT=CHAMPLAIN PYTHON +OPTIONS_SUB= yes CHAMPLAIN_DESC= Champlain map plugin -.include +CHAMPLAIN_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain +CHAMPLAIN_USE= GL=gl +PYTHON_CONFIGURE_ENABLE=python +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas +PYTHON_USES= python:3 +PYTHON_VARS= GLIB_SCHEMAS+="org.gnome.eog.plugins.export-to-folder.gschema.xml org.gnome.eog.plugins.fullscreenbg.gschema.xml org.gnome.eog.plugins.pythonconsole.gschema.xml" -.if ${PORT_OPTIONS:MCHAMPLAIN} -USE_GL= gl -LIB_DEPENDS+= libchamplain-0.12.so:graphics/libchamplain -PLIST_SUB+= CHAMPLAIN="" -.else -PLIST_SUB+= CHAMPLAIN="@comment " -.endif - -PLIST_SUB+= PYVER=${PYTHON_VER:S|.||} -.if ${PORT_OPTIONS:MPYTHON} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas -CONFIGURE_ARGS+=--enable-python -USES+= python:3 -PLIST_SUB+= PYTHON="" -GLIB_SCHEMAS+= org.gnome.eog.plugins.export-to-folder.gschema.xml \ - org.gnome.eog.plugins.fullscreenbg.gschema.xml \ - org.gnome.eog.plugins.pythonconsole.gschema.xml -.else -CONFIGURE_ARGS+=--disable-python -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ! ${PORT_OPTIONS:MCHAMPLAIN} -post-patch: +post-patch-CHAMPLAIN-off: @${REINPLACE_CMD} -e 's|champlain-gtk|disabled-champlain-gtk|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} '/^DEFAULT_PLUGINS=/,/^$$/ s/map//' \ ${WRKSRC}/configure -.endif - -.include - -.if ${PYTHON_REL} < 3500 -PYOEXTENSION= pyo -.else -PYOEXTENSION= opt-1.pyc -.endif - -PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} -.include +.include diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist index 3a7668908ba2..bf05a3ab3cdd 100644 --- a/graphics/eog-plugins/pkg-plist +++ b/graphics/eog-plugins/pkg-plist @@ -1,15 +1,15 @@ lib/eog/plugins/exif-display.plugin %%PYTHON%%lib/eog/plugins/export-to-folder.plugin %%PYTHON%%lib/eog/plugins/export-to-folder.py -%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYVER%%.%%PYOEXTENSION%% -%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYVER%%.%%PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/__pycache__/export-to-folder.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/__pycache__/maximize-windows.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% lib/eog/plugins/fit-to-width.plugin %%PYTHON%%lib/eog/plugins/fullscreenbg.plugin %%PYTHON%%lib/eog/plugins/fullscreenbg.py -%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYVER%%.%%PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/__pycache__/fullscreenbg.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% lib/eog/plugins/hide-titlebar.plugin lib/eog/plugins/libexif-display.so lib/eog/plugins/libfit-to-width.so @@ -25,19 +25,19 @@ lib/eog/plugins/light-theme.plugin lib/eog/plugins/postasa.plugin %%PYTHON%%lib/eog/plugins/pythonconsole.plugin %%PYTHON%%lib/eog/plugins/pythonconsole/__init__.py -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%% -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/pythonconsole/__pycache__/console.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON%%lib/eog/plugins/pythonconsole/config.py %%PYTHON%%lib/eog/plugins/pythonconsole/console.py lib/eog/plugins/send-by-mail.plugin %%PYTHON%%lib/eog/plugins/slideshowshuffle.plugin %%PYTHON%%lib/eog/plugins/slideshowshuffle.py -%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYVER%%.pyc -%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYVER%%.%%PYOEXTENSION%% +%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON%%lib/eog/plugins/__pycache__/slideshowshuffle.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% share/appdata/eog-exif-display.metainfo.xml %%PYTHON%%share/appdata/eog-export-to-folder.metainfo.xml share/appdata/eog-fit-to-width.metainfo.xml -- cgit v1.2.3