1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00

archivers/py-liblzma: Rename to pylibzma, Modernize

- Rename to match upstream (PyPI) name: pylibzma
- Backport upstream issue/commit to fix build without pkg-config [1][2]
- Remove post-patch: target, no longer necessary
- Remove other setup.py overrides, back to upstream sources
- Add do-test target:
- Add LICENSE_FILE
- Add MOVED entry

While I'm here:

- Update sysutils/bsdploy dependency

[1] https://bugs.launchpad.net/pyliblzma/+bug/613837
[2] https://bazaar.launchpad.net/~proyvind/pyliblzma/trunk/revision/494

Reviewed by:		sbz
Approved by:		dbn (maintainer timeout, 15 days)
Differential Revision:	D4161
This commit is contained in:
Kubilay Kocak 2015-11-30 08:37:38 +00:00
parent 7caa28b8d5
commit 892f21154b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=402654
9 changed files with 61 additions and 35 deletions

1
MOVED
View File

@ -8036,3 +8036,4 @@ databases/java-mybatis||2015-11-28|Has expired: Broken for more than 6 months
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

View File

@ -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

View File

@ -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)

View File

@ -3,7 +3,7 @@
PORTNAME= liblzma
PORTVERSION= 0.5.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= archivers python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -13,15 +13,15 @@ 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-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
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
.include <bsd.port.mk>

View File

@ -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",

View File

@ -12,7 +12,7 @@ COMMENT= Container Management for FreeBSD Jails
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 \