Update to py-country-1.6.

Enable regress tests.

devel/py-country/Makefile

@@ -1,26 +1,32 @@
-# $OpenBSD: Makefile,v 1.7 2014/04/28 14:34:27 benoit Exp $
+# $OpenBSD: Makefile,v 1.8 2014/05/08 15:38:00 ajacoutot Exp $
 
 COMMENT =		country, language, currency and scripts definitions
 
-MODPY_EGG_VERSION =	1.5
+MODPY_EGG_VERSION =	1.6
 DISTNAME =		pycountry-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
+EXTRACT_SUFX=		.zip
 
 CATEGORIES =		devel
 
 HOMEPAGE =		http://pypi.python.org/pypi/pycountry
 
 # LGPL2.1
-PERMIT_PACKAGE_CDROM =		Yes
+PERMIT_PACKAGE_CDROM =	Yes
 
 MASTER_SITES=		${MASTER_SITE_PYPI:=p/pycountry/}
 
 MODULES =		lang/python
 
 MODPY_SETUPTOOLS =	Yes
-NO_TEST =		Yes
 
-post-configure:
-			rm ${WRKSRC}/src/pycountry/db.py.orig
+TEST_DEPENDS =		devel/py-test \
+			${BASE_PKGPATH}=${MODPY_EGG_VERSION}
+
+do-test:
+	@cd ${WRKSRC}/src/pycountry/tests/ && \
+		${MODPY_BIN} test_general.py && \
+		echo "OK" || \
+		echo "FAIL"
 
 .include <bsd.port.mk>

devel/py-country/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pycountry-1.5.tar.gz) = EcAUFQEg1R67sqEWaYrWCMniTk82wapk6UwdXgy7eZo=
-SIZE (pycountry-1.5.tar.gz) = 7384714
+SHA256 (pycountry-1.6.zip) = Fg1JEgvKhSgvGrhBGB2D049oMx0RPO8S1mcI/2t4YmI=
+SIZE (pycountry-1.6.zip) = 8014680

devel/py-country/patches/patch-src_pycountry_db_py

@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_pycountry_db_py,v 1.1.1.1 2011/12/18 13:42:31 mpi Exp $
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599369
-
---- src/pycountry/db.py.orig	Fri Jul 15 10:54:22 2011
-+++ src/pycountry/db.py	Tue Dec  6 12:19:29 2011
-@@ -7,7 +7,17 @@
- import logging
- from xml.dom import minidom
- 
-+# NullHandler is only defined for python >= 2.7
-+if 'NullHandler' not in dir(logging):
-+    class NullHandler(logging.Handler):
-+        def emit(self, record):
-+            pass
-+    logging.NullHandler = NullHandler
-+
- logger = logging.getLogger('pycountry.db')
-+# Prevent warning, see
-+# http://docs.python.org/library/logging.html#configuring-logging-for-a-library
-+logger.addHandler(logging.NullHandler())
- 
- 
- class Data(object):