pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
uzbl-git: Handle Python version changes in PLIST
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Tue Jan 17 20:40:00 2017 +0100
Changeset: 964a0dfe422c98806d29e6baeb8bc6dc9cfbf3cd
Modified Files:
uzbl-git/Makefile
uzbl-git/PLIST
uzbl-git/TODO
Log Message:
uzbl-git: Handle Python version changes in PLIST
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=964a0dfe422c98806d29e6baeb8bc6dc9cfbf3cd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
uzbl-git/Makefile | 9 +++++++++
uzbl-git/PLIST | 10 +++++-----
uzbl-git/TODO | 1 +
3 files changed, 15 insertions(+), 5 deletions(-)
diffs:
diff --git a/uzbl-git/Makefile b/uzbl-git/Makefile
index 0e96171..584f040 100644
--- a/uzbl-git/Makefile
+++ b/uzbl-git/Makefile
@@ -41,6 +41,15 @@ REPLACE_PYTHON+= examples/data/scripts/per-site-settings.py
REPLACE_PYTHON+= examples/data/scripts/scheme.py
.include "../../lang/python/application.mk"
+# adapted from ../../lang/python/distutils.mk
+# Set the egg file basename.
+EGG_NAME?= uzbl-201100808
+
+# Egg files have the version encoded, so generalize in PLIST.
+PLIST_SUBST+= EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PRINT_PLIST_AWK+= { gsub("${EGG_NAME}-py${PYVERSSUFFIX}.egg-info", \
+ "$${EGG_FILE}") }
+
# for uzbl-browser
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
# for uzbl-tabbed with GTK+ 2
diff --git a/uzbl-git/PLIST b/uzbl-git/PLIST
index b0e66c1..b5cb3e5 100644
--- a/uzbl-git/PLIST
+++ b/uzbl-git/PLIST
@@ -3,11 +3,11 @@ bin/uzbl-browser
bin/uzbl-core
bin/uzbl-event-manager
bin/uzbl-tabbed
-${PYSITELIB}/uzbl-201100808-py3.5.egg-info/PKG-INFO
-${PYSITELIB}/uzbl-201100808-py3.5.egg-info/SOURCES.txt
-${PYSITELIB}/uzbl-201100808-py3.5.egg-info/dependency_links.txt
-${PYSITELIB}/uzbl-201100808-py3.5.egg-info/entry_points.txt
-${PYSITELIB}/uzbl-201100808-py3.5.egg-info/top_level.txt
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/entry_points.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
${PYSITELIB}/uzbl/__init__.py
${PYSITELIB}/uzbl/__init__.pyc
${PYSITELIB}/uzbl/arguments.pyc
diff --git a/uzbl-git/TODO b/uzbl-git/TODO
index ac514a5..85b1874 100644
--- a/uzbl-git/TODO
+++ b/uzbl-git/TODO
@@ -2,3 +2,4 @@ Add options or separate packages for uzbl-browser and uzbl-tabbed
Add option for GTK+ version for uzbl-tabbed:
Resolve Python version conflict for uzbl-tabbed with GTK+ 2
Add missing dependencies for uzbl-tabbed with GTK+ 3
+Resolve the EGG_FILE in PLIST problem properly
Home |
Main Index |
Thread Index |
Old Index