diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2011-01-29 03:51:06 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2011-01-29 03:51:06 +0000 |
| commit | 0faf4b145a5b2a775f9e3f0a07fb5e68af1d9b25 (patch) | |
| tree | c87f1f55349a5ee9eb2cedced7890b92d7f09aee /archivers | |
| parent | After discussion with maintainer, change RESTRICTED to NO_CDROM. It appears (diff) | |
- Update to 0.4.3
PR: 154330
Submitted by: Sofian Brabez <sbrabez@gmail.com>
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268359
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/py-lzma/Makefile | 8 | ||||
| -rw-r--r-- | archivers/py-lzma/distinfo | 4 | ||||
| -rw-r--r-- | archivers/py-lzma/files/patch-setup.py | 19 | ||||
| -rw-r--r-- | archivers/py-lzma/files/patch-src__7zip__C__CpuArch.c | 26 | ||||
| -rw-r--r-- | archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h | 2 | ||||
| -rw-r--r-- | archivers/py-lzma/pkg-plist | 1 |
6 files changed, 56 insertions, 4 deletions
diff --git a/archivers/py-lzma/Makefile b/archivers/py-lzma/Makefile index fca2823a4f26..318a0db66ece 100644 --- a/archivers/py-lzma/Makefile +++ b/archivers/py-lzma/Makefile @@ -6,7 +6,7 @@ # PORTNAME= lzma -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.3 CATEGORIES= archivers python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,6 +15,12 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= sbrabez@gmail.com COMMENT= Python binding for the LZMA compression library +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +ONLY_FOR_ARCHS= i386 + +USE_DOS2UNIX= yes USE_PYTHON= yes USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= py${PORTNAME} diff --git a/archivers/py-lzma/distinfo b/archivers/py-lzma/distinfo index 012c677aad4e..9ef4d47fa527 100644 --- a/archivers/py-lzma/distinfo +++ b/archivers/py-lzma/distinfo @@ -1,2 +1,2 @@ -SHA256 (pylzma-0.4.2.tar.gz) = 7d61ccae245f82714451805476b5673a8704e753431d14309987cd69f37425c7 -SIZE (pylzma-0.4.2.tar.gz) = 93257 +SHA256 (pylzma-0.4.3.tar.gz) = ddfc7fc7bfe1d4b84c88c981ce0c508a96766fdcdf53c415b63b3ca8f60a4239 +SIZE (pylzma-0.4.3.tar.gz) = 104857 diff --git a/archivers/py-lzma/files/patch-setup.py b/archivers/py-lzma/files/patch-setup.py new file mode 100644 index 000000000000..b3dbbc6dd3fa --- /dev/null +++ b/archivers/py-lzma/files/patch-setup.py @@ -0,0 +1,19 @@ +--- ./setup.py.orig 2010-10-23 22:50:04.000000000 +0200 ++++ ./setup.py 2011-01-27 02:30:39.000000000 +0100 +@@ -27,13 +27,10 @@ + from distutils import log + from distutils.command.build_ext import build_ext as _build_ext + +-try: +- from setuptools import setup, Extension +-except ImportError: +- from ez_setup import use_setuptools +- use_setuptools() ++from ez_setup import use_setuptools ++use_setuptools() + +- from setuptools import setup, Extension ++from setuptools import setup, Extension + + class UnsupportedPlatformWarning(Warning): + pass diff --git a/archivers/py-lzma/files/patch-src__7zip__C__CpuArch.c b/archivers/py-lzma/files/patch-src__7zip__C__CpuArch.c new file mode 100644 index 000000000000..d138e1ffc2b4 --- /dev/null +++ b/archivers/py-lzma/files/patch-src__7zip__C__CpuArch.c @@ -0,0 +1,26 @@ +--- ./src/7zip/C/CpuArch.c.orig 2010-07-21 22:13:50.000000000 +0200 ++++ ./src/7zip/C/CpuArch.c 2011-01-27 02:31:44.000000000 +0100 +@@ -72,14 +72,15 @@ + + #else + +- __asm__ __volatile__ ( +- "cpuid" +- : "=a" (*a) , +- "=b" (*b) , +- "=c" (*c) , +- "=d" (*d) +- : "0" (function)) ; +- ++ /* fix GCC build error with -fPIC by storing ebx value before calling cpuid */ ++ __asm__ __volatile__( ++ "pushl %%ebx \n\t" ++ "cpuid \n\t" ++ "movl %%ebx, %1 \n\t" ++ "popl %%ebx \n\t" ++ : "=a"(*a), "=r"(*b), "=c"(*c), "=d"(*d) ++ : "a"(function) ++ : "cc"); + #endif + + #else diff --git a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h b/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h index fed44d4faf82..0b606faa6022 100644 --- a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h +++ b/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h @@ -1,5 +1,5 @@ --- ./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 ++++ ./src/compat/LzmaCompatDecode.h 2011-01-27 02:30:39.000000000 +0100 @@ -39,14 +39,6 @@ # define LZMACALL #endif diff --git a/archivers/py-lzma/pkg-plist b/archivers/py-lzma/pkg-plist index 624f9c572fda..04129c23c68b 100644 --- a/archivers/py-lzma/pkg-plist +++ b/archivers/py-lzma/pkg-plist @@ -5,6 +5,7 @@ %%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%%/EGG-INFO/requires.txt %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.py %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyc %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/py7zlib.pyo |