uzbl-git: Switch to wheel format

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Wed Feb 22 22:18:46 2017 +0100
Changeset:	f18d589df2a4b1cf02a768a48c9769fb19b60866

Modified Files:
	uzbl-git/Makefile
	uzbl-git/PLIST
	uzbl-git/distinfo
Added Files:
	uzbl-git/patches/patch-Makefile

Log Message:
uzbl-git: Switch to wheel format

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f18d589df2a4b1cf02a768a48c9769fb19b60866

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 uzbl-git/Makefile               | 13 +++----------
 uzbl-git/PLIST                  | 14 +++++++++-----
 uzbl-git/distinfo               |  1 +
 uzbl-git/patches/patch-Makefile | 15 +++++++++++++++
 4 files changed, 28 insertions(+), 15 deletions(-)

diffs:
diff --git a/uzbl-git/Makefile b/uzbl-git/Makefile
index 3055934e1b..d9ceb5409b 100644
--- a/uzbl-git/Makefile
+++ b/uzbl-git/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	uzbl-0.9.0
+DISTNAME=	uzbl-0.9.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=uzbl/}
 
@@ -21,6 +21,7 @@ PY_PATCHPLIST=		yes
 .include "../../lang/python/extension.mk"
 MAKE_ENV+=	PYTHON=${PYTHONBIN}
 MAKE_ENV+=	MANDIR=${DESTDIR}/${PREFIX}/${PKGMANDIR}
+INSTALL_ENV+=	PIP=pip${PYVERSSUFFIX}
 
 SUBST_CLASSES+=			fix-share
 SUBST_STAGE.fix-share=		pre-configure
@@ -41,18 +42,10 @@ 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}") }
-
 pre-configure:
 	${RM} ${WRKSRC}/examples/data/scripts/auth.py.orig
 
+BUILD_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 # for uzbl-browser
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
diff --git a/uzbl-git/PLIST b/uzbl-git/PLIST
index b5cb3e5255..b8c677aa48 100644
--- a/uzbl-git/PLIST
+++ b/uzbl-git/PLIST
@@ -3,11 +3,14 @@ bin/uzbl-browser
 bin/uzbl-core
 bin/uzbl-event-manager
 bin/uzbl-tabbed
-${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}/${PKGNAME}.dist-info/DESCRIPTION.rst
+${PYSITELIB}/${PKGNAME}.dist-info/INSTALLER
+${PYSITELIB}/${PKGNAME}.dist-info/METADATA
+${PYSITELIB}/${PKGNAME}.dist-info/RECORD
+${PYSITELIB}/${PKGNAME}.dist-info/WHEEL
+${PYSITELIB}/${PKGNAME}.dist-info/entry_points.txt
+${PYSITELIB}/${PKGNAME}.dist-info/metadata.json
+${PYSITELIB}/${PKGNAME}.dist-info/top_level.txt
 ${PYSITELIB}/uzbl/__init__.py
 ${PYSITELIB}/uzbl/__init__.pyc
 ${PYSITELIB}/uzbl/arguments.pyc
@@ -70,6 +73,7 @@ share/uzbl/docs/README.event-manager.md
 share/uzbl/docs/README.md
 share/uzbl/docs/README.scripts.md
 share/uzbl/docs/config.h
+share/uzbl/examples/config/README.md
 share/uzbl/examples/config/config
 share/uzbl/examples/config/style.css
 share/uzbl/examples/data/bookmarks
diff --git a/uzbl-git/distinfo b/uzbl-git/distinfo
index 93b9dbed8d..a37e7179ae 100644
--- a/uzbl-git/distinfo
+++ b/uzbl-git/distinfo
@@ -1,3 +1,4 @@
 $NetBSD$
 
+SHA1 (patch-Makefile) = 084b2008ad64fc8597ccc3d973bf74cb4f23844a
 SHA1 (patch-examples_data_scripts_auth.py) = 29f222ebd756c617e9d26313fb229d3bec87c0cf
diff --git a/uzbl-git/patches/patch-Makefile b/uzbl-git/patches/patch-Makefile
new file mode 100644
index 0000000000..2a400bba38
--- /dev/null
+++ b/uzbl-git/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Avoid paths based on commit hash
+
+--- Makefile.orig	2017-02-20 17:49:47.000000000 +0000
++++ Makefile
+@@ -35,7 +35,7 @@ ARCH := $(shell uname -m)
+ COMMIT_HASH := $(shell ./misc/hash.sh)
+ 
+ # Convert version to pip format, v0.9.1-23-g69480a3 becomes 0.9.1+23.g69480a3
+-PYVERSION := $(shell echo ${COMMIT_HASH} | sed 's/^v//;s/-/+/;s/-/./g')
++PYVERSION := $(shell echo ${COMMIT_HASH} | sed 's/^v//;s/-.*//')
+ PYWHEEL := uzbl-${PYVERSION}-py3-none-any.whl
+ 
+ CPPFLAGS += -D_XOPEN_SOURCE=500 -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\" -DLIBDIR=\"$(LIBDIR)\"