Page MenuHomeFreeBSD
Files F153119449

D4161.id.diff
No OneTemporary
Actions

D4161.id.diff
View Options

Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -8036,3 +8036,4 @@
databases/openbase-jdbc||2015-11-28|Has expired: Broken for more than 6 months
www/mediawiki119|www/mediawiki125|2015-11-28|Has expired: Please upgrade to mediawiki-1.25
www/R-cran-Rpad||2015-11-28|Has expired: Unmaintained upstream
+archivers/py-liblzma|py-pyliblzma|2015-11-30|Rename to match upstream (PyPI) naming
Index: head/archivers/Makefile
===================================================================
--- head/archivers/Makefile
+++ head/archivers/Makefile
@@ -163,10 +163,10 @@
SUBDIR += ppunpack
SUBDIR += pxz
SUBDIR += py-attic
- SUBDIR += py-liblzma
SUBDIR += py-librtfcomp
SUBDIR += py-lz4
SUBDIR += py-lzma
+ SUBDIR += py-pyliblzma
SUBDIR += py-python-snappy
SUBDIR += qpress
SUBDIR += quazip
Index: head/archivers/py-liblzma/Makefile
===================================================================
--- head/archivers/py-liblzma/Makefile
+++ head/archivers/py-liblzma/Makefile
@@ -1,27 +0,0 @@
-# Created by: David Naylor <naylor.b.david@gmail.com>
-# $FreeBSD$
-
-PORTNAME= liblzma
-PORTVERSION= 0.5.3
-PORTREVISION= 4
-CATEGORIES= archivers python
-MASTER_SITES= CHEESESHOP
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= py${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= dbn@FreeBSD.org
-COMMENT= Python binding for the LZMA compression library
-
-LICENSE= LGPL3
-
-USES= pkgconfig python tar:bzip2
-USE_PYTHON= distutils autoplist
-
-post-patch:
- @${REINPLACE_CMD} -e 's/pc_cflags = .*/pc_cflags = ""/' \
- -e 's/pc_libs = .*/pc_libs = "-llzma"/' ${WRKSRC}/setup.py
-
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lzma.so
-
-.include <bsd.port.mk>
Index: head/archivers/py-liblzma/distinfo
===================================================================
--- head/archivers/py-liblzma/distinfo
+++ head/archivers/py-liblzma/distinfo
@@ -1,2 +0,0 @@
-SHA256 (pyliblzma-0.5.3.tar.bz2) = 08d762f36d5e59fb9bb0e22e000c300b21f97e35b713321ee504cfb442667957
-SIZE (pyliblzma-0.5.3.tar.bz2) = 43498
Index: head/archivers/py-liblzma/files/patch-setup.py
===================================================================
--- head/archivers/py-liblzma/files/patch-setup.py
+++ head/archivers/py-liblzma/files/patch-setup.py
@@ -1,28 +0,0 @@
---- setup.py~ 2009-01-12 14:38:38.000000000 +0200
-+++ setup.py 2009-01-12 15:03:21.000000000 +0200
-@@ -23,7 +23,7 @@
- #
- import sys, os
- from warnings import warn
--from setuptools import setup, Extension
-+from distutils.core import setup, Extension
-
- descr = "Python bindings for liblzma"
- long_descr = """PylibLZMA provides a python interface for the liblzma library
-@@ -54,6 +54,8 @@
- pc_libs = subprocess.Popen("pkg-config --libs liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
- if(pc_libs):
- link_args.extend(pc_libs.split(' '))
-+link_args.append('-L%s/lib' % os.environ["LOCALBASE"])
-+link_args.append('-lpython%i.%i' % sys.version_info[:2])
-
- extens=[Extension('lzma', c_files, extra_compile_args=compile_args, extra_link_args=link_args, define_macros=version_define)]
-
-@@ -74,7 +76,6 @@
- ],
- py_modules = modules,
- ext_modules = extens,
-- test_suite = 'tests',
- )
-
- sys.exit(0)
Index: head/archivers/py-liblzma/files/patch-src_liblzma.h
===================================================================
--- head/archivers/py-liblzma/files/patch-src_liblzma.h
+++ head/archivers/py-liblzma/files/patch-src_liblzma.h
@@ -1,16 +0,0 @@
---- src/liblzma.h.orig 2010-02-20 23:07:31 UTC
-+++ src/liblzma.h
-@@ -8,13 +8,6 @@
- #include <Python.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined (__APPLE__) || defined(__FreeBSD__) || \
-- defined(__OpenBSD__) || defined(__NetBSD__) || \
-- defined (__sun) || defined (__svr4__)
--#include <stdlib.h>
--#else
--#include <malloc.h>
--#endif
- #include <string.h>
- #include <inttypes.h>
- #if !defined(linux) && !defined(__sun) && !defined(__svr4__)
Index: head/archivers/py-liblzma/pkg-descr
===================================================================
--- head/archivers/py-liblzma/pkg-descr
+++ head/archivers/py-liblzma/pkg-descr
@@ -1,7 +0,0 @@
-Python module implementing LZMA Utils' liblzma API
-
-PylibLZMA provides a python interface for the liblzma
-library to read and write data that has been compressed
-or can be decompressed by Lasse Collin's LZMA Utils.
-
-WWW: http://launchpad.net/pyliblzma
Index: head/archivers/py-pyliblzma/Makefile
===================================================================
--- head/archivers/py-pyliblzma/Makefile
+++ head/archivers/py-pyliblzma/Makefile
@@ -0,0 +1,27 @@
+# Created by: David Naylor <naylor.b.david@gmail.com>
+# $FreeBSD$
+
+PORTNAME= liblzma
+PORTVERSION= 0.5.3
+PORTREVISION= 5
+CATEGORIES= archivers python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= py${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= dbn@FreeBSD.org
+COMMENT= Python binding for the LZMA compression library
+
+LICENSE= LGPL3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= pkgconfig python tar:bzip2
+USE_PYTHON= distutils autoplist
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lzma.so
+
+do-test:
+ @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.mk>
Index: head/archivers/py-pyliblzma/distinfo
===================================================================
--- head/archivers/py-pyliblzma/distinfo
+++ head/archivers/py-pyliblzma/distinfo
@@ -0,0 +1,2 @@
+SHA256 (pyliblzma-0.5.3.tar.bz2) = 08d762f36d5e59fb9bb0e22e000c300b21f97e35b713321ee504cfb442667957
+SIZE (pyliblzma-0.5.3.tar.bz2) = 43498
Index: head/archivers/py-pyliblzma/files/patch-setup.py
===================================================================
--- head/archivers/py-pyliblzma/files/patch-setup.py
+++ head/archivers/py-pyliblzma/files/patch-setup.py
@@ -0,0 +1,53 @@
+# allow building without pkg-config
+# https://bugs.launchpad.net/pyliblzma/+bug/613837
+# https://bazaar.launchpad.net/~proyvind/pyliblzma/trunk/revision/494
+
+--- setup.py.orig 2015-11-14 02:51:37 UTC
++++ setup.py
+@@ -24,6 +24,7 @@
+ import sys, os, subprocess
+ from warnings import warn
+ from setuptools import setup, Extension
++from distutils.ccompiler import get_default_compiler
+
+ descr = "Python bindings for liblzma"
+ long_descr = """PylibLZMA provides a python interface for the liblzma library
+@@ -41,21 +42,26 @@ for i in xrange(len(c_files)):
+ c_files[i] = os.path.join('src', c_files[i])
+
+ compile_args = []
+-warnflags = ['-Wall', '-Wextra', '-pedantic', '-Wswitch-enum', '-Wswitch-default']
+-compile_args.extend(warnflags)
+ link_args = []
+-if not subprocess.Popen('touch gnu99-test.c; gcc -std=gnu99 -E gnu99-test.c > /dev/null; rm -f gnu99-test.c',
+- shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True).stdout.read():
+- compile_args.append('-std=gnu99')
++libraries = ['lzma']
+
+-pc_cflags = subprocess.Popen("pkg-config --cflags liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
+-if(pc_cflags):
+- compile_args.extend(pc_cflags.split(' '))
+-pc_libs = subprocess.Popen("pkg-config --libs liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
+-if(pc_libs):
+- link_args.extend(pc_libs.split(' '))
++if get_default_compiler() in ('cygwin', 'emx', 'mingw32', 'unix'):
++ warnflags = ['-Wall', '-Wextra', '-pedantic', '-Wswitch-enum', '-Wswitch-default']
++ compile_args.extend(warnflags)
+
+-extens=[Extension('lzma', c_files, extra_compile_args=compile_args, extra_link_args=link_args, define_macros=version_define)]
++ if not subprocess.Popen('touch gnu99-test.c; gcc -std=gnu99 -E gnu99-test.c > /dev/null; rm -f gnu99-test.c',
++ shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True).stdout.read():
++ compile_args.append('-std=gnu99')
++
++ pc_cflags = subprocess.Popen("pkg-config --cflags liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
++ if(pc_cflags):
++ compile_args.extend(pc_cflags.split(' '))
++
++ pc_libs = subprocess.Popen("pkg-config --libs liblzma", shell=True, stdout=subprocess.PIPE, close_fds=True).stdout.readline().strip()
++ if(pc_libs):
++ link_args.extend(pc_libs.split(b' '))
++
++extens=[Extension('lzma', c_files, extra_compile_args=compile_args, libraries=libraries, extra_link_args=link_args, define_macros=version_define)]
+
+ setup(
+ name = "pyliblzma",
Index: head/archivers/py-pyliblzma/files/patch-src_liblzma.h
===================================================================
--- head/archivers/py-pyliblzma/files/patch-src_liblzma.h
+++ head/archivers/py-pyliblzma/files/patch-src_liblzma.h
@@ -0,0 +1,16 @@
+--- src/liblzma.h.orig 2010-02-20 23:07:31 UTC
++++ src/liblzma.h
+@@ -8,13 +8,6 @@
+ #include <Python.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if defined (__APPLE__) || defined(__FreeBSD__) || \
+- defined(__OpenBSD__) || defined(__NetBSD__) || \
+- defined (__sun) || defined (__svr4__)
+-#include <stdlib.h>
+-#else
+-#include <malloc.h>
+-#endif
+ #include <string.h>
+ #include <inttypes.h>
+ #if !defined(linux) && !defined(__sun) && !defined(__svr4__)
Index: head/archivers/py-pyliblzma/pkg-descr
===================================================================
--- head/archivers/py-pyliblzma/pkg-descr
+++ head/archivers/py-pyliblzma/pkg-descr
@@ -0,0 +1,7 @@
+Python module implementing LZMA Utils' liblzma API
+
+PylibLZMA provides a python interface for the liblzma
+library to read and write data that has been compressed
+or can be decompressed by Lasse Collin's LZMA Utils.
+
+WWW: http://launchpad.net/pyliblzma
Index: head/sysutils/bsdploy/Makefile
===================================================================
--- head/sysutils/bsdploy/Makefile
+++ head/sysutils/bsdploy/Makefile
@@ -12,7 +12,7 @@
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
- ${PYTHON_PKGNAMEPREFIX}liblzma>0:${PORTSDIR}/archivers/py-liblzma \
+ ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:${PORTSDIR}/archivers/py-pyliblzma \
${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:${PORTSDIR}/sysutils/py-ploy \
${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:${PORTSDIR}/sysutils/py-ploy_ansible \
${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:${PORTSDIR}/sysutils/py-ploy_ezjail \

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 7:20 AM (11 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31825238
Default Alt Text
D4161.id.diff (10 KB)

Event Timeline