- Update to 0.4.2

- Submitter is now maintainer

PR:		ports/152122
Submitted by:	Sofian Brabez <sbrabez AT gmail.com>

5 files changed, 53 insertions, 26 deletions

diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile
index 7747fa6baca1..fca2823a4f26 100644
--- a/archivers/py-lzma/Makefile
+++ b/archivers/py-lzma/Makefile
@@ -6,17 +6,29 @@
 #
 
 PORTNAME=	lzma
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.2
 CATEGORIES=	archivers python
-MASTER_SITES=	http://www.joachim-bauch.de/projects/python/pylzma/releases/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	pylzma-${PORTVERSION}
+DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sbrabez@gmail.com
 COMMENT=	Python binding for the LZMA compression library
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=	pylzma
+USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_PKGNAME=	py${PORTNAME}
+PYEASYINSTALL_ARCHDEP=	yes
+PYEASYINSTALL_EGG=	${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg
+
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+
+PORTDOCS=	usage.txt
+
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/archivers/py-lzma/distinfo b/archivers/py-lzma/distinfo
index 00a57ec106fc..012c677aad4e 100644
--- a/archivers/py-lzma/distinfo
+++ b/archivers/py-lzma/distinfo
@@ -1,3 +1,2 @@
-MD5 (pylzma-0.3.0.tar.gz) = 7ab1a1706cf3e19f2d10579d795babf7
-SHA256 (pylzma-0.3.0.tar.gz) = 3c110341150bcff08cbe46f9236bb10a71ce00bebd626cb08327af148c03921c
-SIZE (pylzma-0.3.0.tar.gz) = 117440
+SHA256 (pylzma-0.4.2.tar.gz) = 7d61ccae245f82714451805476b5673a8704e753431d14309987cd69f37425c7
+SIZE (pylzma-0.4.2.tar.gz) = 93257
diff --git a/archivers/py-lzma/files/patch-7zip-LzmaCompatDecode.h b/archivers/py-lzma/files/patch-7zip-LzmaCompatDecode.h
deleted file mode 100644
index e6b32643a65e..000000000000
--- a/archivers/py-lzma/files/patch-7zip-LzmaCompatDecode.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 7zip/LzmaCompatDecode.h.orig	Thu Dec 28 06:27:50 2006
-+++ 7zip/LzmaCompatDecode.h	Thu Dec 28 06:27:56 2006
-@@ -39,10 +39,6 @@
- #  define LZMACALL
- #endif
- 
--#ifndef malloc
--#include <malloc.h>
--#endif
--
- #ifndef UInt32
- #ifdef _LZMA_UINT32_IS_ULONG
- #define UInt32 unsigned long
diff --git a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h b/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h
new file mode 100644
index 000000000000..fed44d4faf82
--- /dev/null
+++ b/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h
@@ -0,0 +1,17 @@
+--- ./src/compat/LzmaCompatDecode.h.orig	2010-04-24 00:26:40.000000000 +0200
++++ ./src/compat/LzmaCompatDecode.h	2010-11-11 00:20:51.000000000 +0100
+@@ -39,14 +39,6 @@
+ #  define LZMACALL
+ #endif
+ 
+-#ifndef malloc
+-# ifdef __APPLE__
+-#include <malloc/malloc.h>
+-# else
+-#include <malloc.h>
+-# endif
+-#endif
+-
+ #ifndef UInt32
+ #ifdef _LZMA_UINT32_IS_ULONG
+ #define UInt32 unsigned long
diff --git a/archivers/py-lzma/pkg-plist b/archivers/py-lzma/pkg-plist
index fbbe07f7fee3..624f9c572fda 100644
--- a/archivers/py-lzma/pkg-plist
+++ b/archivers/py-lzma/pkg-plist
@@ -1,4 +1,16 @@
-%%PYTHON_SITELIBDIR%%/py7zlib.py
-%%PYTHON_SITELIBDIR%%/py7zlib.pyc
-%%PYTHON_SITELIBDIR%%/py7zlib.pyo
-%%PYTHON_SITELIBDIR%%/pylzma.so
+@comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylzma.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylzma.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylzma.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylzma.so
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%