Date: Mon, 30 Nov 2015 08:37:38 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402654 - in head: . archivers archivers/py-liblzma archivers/py-pyliblzma archivers/py-pyliblzma/files sysutils/bsdploy Message-ID: <201511300837.tAU8bcGK035182@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Mon Nov 30 08:37:38 2015 New Revision: 402654 URL: https://svnweb.freebsd.org/changeset/ports/402654 Log: 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 Added: head/archivers/py-pyliblzma/ - copied from r402653, head/archivers/py-liblzma/ Deleted: head/archivers/py-liblzma/ Modified: head/MOVED head/archivers/Makefile head/archivers/py-pyliblzma/Makefile head/archivers/py-pyliblzma/files/patch-setup.py head/sysutils/bsdploy/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Nov 30 08:02:29 2015 (r402653) +++ head/MOVED Mon Nov 30 08:37:38 2015 (r402654) @@ -8036,3 +8036,4 @@ databases/java-mybatis||2015-11-28|Has e 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 Modified: head/archivers/Makefile ============================================================================== --- head/archivers/Makefile Mon Nov 30 08:02:29 2015 (r402653) +++ head/archivers/Makefile Mon Nov 30 08:37:38 2015 (r402654) @@ -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 Modified: head/archivers/py-pyliblzma/Makefile ============================================================================== --- head/archivers/py-liblzma/Makefile Mon Nov 30 08:02:29 2015 (r402653) +++ head/archivers/py-pyliblzma/Makefile Mon Nov 30 08:37:38 2015 (r402654) @@ -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> Modified: head/archivers/py-pyliblzma/files/patch-setup.py ============================================================================== --- head/archivers/py-liblzma/files/patch-setup.py Mon Nov 30 08:02:29 2015 (r402653) +++ head/archivers/py-pyliblzma/files/patch-setup.py Mon Nov 30 08:37:38 2015 (r402654) @@ -1,28 +1,53 @@ ---- 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 +# 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.core import setup, Extension + 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 -@@ -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]) +@@ -41,21 +42,26 @@ for i in xrange(len(c_files)): + c_files[i] = os.path.join('src', c_files[i]) - extens=[Extension('lzma', c_files, extra_compile_args=compile_args, extra_link_args=link_args, define_macros=version_define)] + 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'] -@@ -74,7 +76,6 @@ - ], - py_modules = modules, - ext_modules = extens, -- test_suite = 'tests', - ) +-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) - sys.exit(0) +-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", Modified: head/sysutils/bsdploy/Makefile ============================================================================== --- head/sysutils/bsdploy/Makefile Mon Nov 30 08:02:29 2015 (r402653) +++ head/sysutils/bsdploy/Makefile Mon Nov 30 08:37:38 2015 (r402654) @@ -12,7 +12,7 @@ COMMENT= Container Management for FreeBS 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511300837.tAU8bcGK035182>