pkg/49756: textproc/csvkit: fix for new py-dateutil and some improvements

[Leonardo Taccari <iamleot%gmail.com@localhost>]

>Number:         49756
>Category:       pkg
>Synopsis:       textproc/csvkit: fix for new py-dateutil and some improvements
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 18 18:45:00 +0000 2015
>Originator:     Leonardo Taccari
>Release:        NetBSD 7.99.6
>Organization:
Università Politecnica delle Marche
>Environment:
	
	
System: NetBSD boh 7.99.6 NetBSD 7.99.6 (GENERIC) #9: Mon Mar 16 04:34:08 CET 2015 leot@boh:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
Architecture: x86_64
Machine: amd64
>Description:
	textproc/csvkit does not work due a version mismatch against
	py-dateutil.
>How-To-Repeat:
	$ cd pkgsrc/textproc/csvkit
	$ make install
	[... then please try some csvkit programs ...]
>Fix:
	Please apply the attached patches.

	While here I also saw the comments regarding dbf and to my eyes it seems
	that it does not reflect the reality (dbf at the moment is not present
	in pkgsrc altough csvkit can be used also without it). I am just a
	Python user so before applying it please review this part.

	The attached patches also simplify the Makefile (thanks to
	MASTER_SITE_GITHUB and get rid of the needed depends regarding python26
	because this package is PYTHON_VERSIONS_INCOMPATIBLE with the 2.6
	version).


------------------8<------------------8<------------------8<------------------
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/csvkit/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	11 Jan 2015 13:52:42 -0000	1.2
+++ Makefile	12 Mar 2015 21:00:24 -0000
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.2 2015/01/11 13:52:42 cheusov Exp $
 
-DISTNAME=	0.9.0
-PKGNAME=	csvkit-${DISTNAME}
+DISTNAME=	csvkit-0.9.0
+PKGREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/onyxfish/csvkit/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=onyxfish/}
 
 MAINTAINER=	cheusov%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/onyxfish/csvkit/archive/
+HOMEPAGE=	https://github.com/onyxfish/csvkit/
 COMMENT=	Suite of utilities for converting to and working with CSV
 LICENSE=	mit
 
@@ -24,17 +24,8 @@
 
 PYTHON_VERSIONS_INCOMPATIBLE=	26
 
-# csvkit publishes files like "0.9.0.tar.gz"
-DIST_SUBDIR=	${PKGNAME_NOREV}
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
 USE_LANGUAGES=	# none
 
-EGG_NAME=	${PKGNAME}
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+=	${PYPKGPREFIX}-ordereddict>=1.1:../../devel/py-ordereddict
-.endif
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/csvkit/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	11 Jan 2015 13:35:16 -0000	1.1.1.1
+++ distinfo	12 Mar 2015 21:00:24 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1.1.1 2015/01/11 13:35:16 cheusov Exp $
 
-SHA1 (csvkit-0.9.0/0.9.0.tar.gz) = 9afc884d9af7b5c8c5277d6816384dd15a4968cf
-RMD160 (csvkit-0.9.0/0.9.0.tar.gz) = 2836ec7769e87ee0fe13829187069ebcbfcac26b
-Size (csvkit-0.9.0/0.9.0.tar.gz) = 3928467 bytes
-SHA1 (patch-csvkit_convert_____init____.py) = b2da7ef399cac88c9f4de737aa0b43ee61341ce0
-SHA1 (patch-setup.py) = d0f4f3b6bbe9b4adbdabbeb90d60d02a3e92cb61
+SHA1 (csvkit-0.9.0.tar.gz) = 9afc884d9af7b5c8c5277d6816384dd15a4968cf
+RMD160 (csvkit-0.9.0.tar.gz) = 2836ec7769e87ee0fe13829187069ebcbfcac26b
+Size (csvkit-0.9.0.tar.gz) = 3928467 bytes
+SHA1 (patch-csvkit_convert_____init____.py) = 6b21e31e69d371cd28c591df0a489de24279d405
+SHA1 (patch-setup.py) = d99993c033bf8d558ae8c12d4e1a6cb6d54ceeee
Index: patches/patch-csvkit_convert_____init____.py
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/csvkit/patches/patch-csvkit_convert_____init____.py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-csvkit_convert_____init____.py
--- patches/patch-csvkit_convert_____init____.py	11 Jan 2015 13:35:16 -0000	1.1.1.1
+++ patches/patch-csvkit_convert_____init____.py	12 Mar 2015 21:00:24 -0000
@@ -1,6 +1,8 @@
 $NetBSD: patch-csvkit_convert_____init____.py,v 1.1.1.1 2015/01/11 13:35:16 cheusov Exp $
 
-# Fix too strict requirements
+dbf is not available in pkgsrc and it does not strictly needed by csvkit,
+do not depend by it.
+
 --- csvkit/convert/__init__.py.orig	2014-09-09 00:22:49.000000000 +0000
 +++ csvkit/convert/__init__.py
 @@ -12,10 +12,11 @@ from csvkit.convert.xlsx import xlsx2csv
@@ -11,7 +13,7 @@
 -    from csvkit.convert.dbase import dbf2csv
 -
 -    SUPPORTED_FORMATS.append('dbf')
-+# I do not like "==" style of requirements, newer version is available
++# Not available in pkgsrc.
 +#if six.PY2:
 +#    from csvkit.convert.dbase import dbf2csv
 +#
Index: patches/patch-setup.py
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/csvkit/patches/patch-setup.py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-setup.py
--- patches/patch-setup.py	11 Jan 2015 13:35:16 -0000	1.1.1.1
+++ patches/patch-setup.py	12 Mar 2015 21:00:24 -0000
@@ -1,15 +1,27 @@
 $NetBSD: patch-setup.py,v 1.1.1.1 2015/01/11 13:35:16 cheusov Exp $
 
-# Fix too strict requirements
+o Fix too strict requirements
+o dbf is not available in pkgsrc and it does not strictly needed by csvkit,
+  do not depend by it.
+
 --- setup.py.orig	2014-09-09 00:22:49.000000000 +0000
 +++ setup.py
+@@ -8,7 +8,7 @@ install_requires = [
+     'sqlalchemy>=0.6.6',
+     'openpyxl>=2.0.3',
+     'six>=1.6.1',
+-    'python-dateutil==2.2'
++    'python-dateutil>=2.2'
+ ]
+ 
+ if sys.version_info < (2, 7):
 @@ -16,8 +16,9 @@ if sys.version_info < (2, 7):
      install_requires.append('ordereddict>=1.1')
      install_requires.append('simplejson>=3.6.3')
  
 -if sys.version_info[0] == 2:
 -    install_requires.append('dbf==0.94.003')
-+# I don't like "==" style of requirements, newer version is available
++# Not available in pkgsrc
 +#if sys.version_info[0] == 2:
 +#    install_requires.append('dbf==0.94.003')
  

>Unformatted: