From 49179a230ec19313be93670bcc90d93dddf1712e Mon Sep 17 00:00:00 2001
From: Nicola Vitale <nivit@FreeBSD.org>
Date: Mon, 14 Jul 2014 23:48:13 +0000
Subject: [PATCH] - Update to 0.24.0 - Sort variables - Use option helpers -
 Remove devel/py-dirspec from run-dependencies

---
 devel/py-wheel/Makefile | 35 ++++++++++++-----------------------
 devel/py-wheel/distinfo |  4 ++--
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 7c641b3de813..b90acf513d4d 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	wheel
-PORTVERSION=	0.21.0
-PORTREVISION=	1
+PORTVERSION=	0.24.0
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,30 +13,19 @@ COMMENT=	Built-package format for Python
 
 LICENSE=	MIT
 
-PYDISTUTILS_AUTOPLIST=	yes
-USE_PYDISTUTILS=	yes
-# Python 3 ready
-USE_PYTHON=	yes
-
 OPTIONS_DEFINE=	PIP SIGNATURE
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
 PIP_DESC=	Use pip to install wheels
+PIP_RUN_DEPENDS=	pip:${PORTSDIR}/devel/py-pip
+PYDISTUTILS_AUTOPLIST=	yes
+
 SIGNATURE_DESC=	Enable digital signature of wheels
+SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec \
+			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring \
+			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
 
-.include <bsd.port.options.mk>
+USE_PYDISTUTILS=	yes
+USE_PYTHON=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MPIP}
-RUN_DEPENDS+=	pip:${PORTSDIR}/devel/py-pip
-.endif
-
-.if ${PORT_OPTIONS:MSIGNATURE}
-.	if ${PYTHON_REL} < 270
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>=1.1:${PORTSDIR}/devel/py-argparse
-.	endif
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec \
-		${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-wheel/distinfo b/devel/py-wheel/distinfo
index dc44282f2494..8f684a917bf7 100644
--- a/devel/py-wheel/distinfo
+++ b/devel/py-wheel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wheel-0.21.0.tar.gz) = 68ad3e66560e9df1f1f435b480183ba24ef913da26556af9e5ae16cd94dd26e1
-SIZE (wheel-0.21.0.tar.gz) = 39310
+SHA256 (wheel-0.24.0.tar.gz) = ef832abfedea7ed86b6eae7400128f88053a1da81a37c00613b1279544d585aa
+SIZE (wheel-0.24.0.tar.gz) = 50597