Date: Tue, 25 Oct 2016 19:09:14 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424644 - in head: audio/idjc net/cyphesis textproc/codespell textproc/py-libxml2 textproc/py3-libxml2 Message-ID: <201610251909.u9PJ9ECM019539@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Tue Oct 25 19:09:14 2016 New Revision: 424644 URL: https://svnweb.freebsd.org/changeset/ports/424644 Log: Do not hand roll PYTHON_CMD Modified: head/audio/idjc/Makefile head/net/cyphesis/Makefile head/textproc/codespell/Makefile head/textproc/py-libxml2/Makefile head/textproc/py3-libxml2/Makefile Modified: head/audio/idjc/Makefile ============================================================================== --- head/audio/idjc/Makefile Tue Oct 25 18:31:54 2016 (r424643) +++ head/audio/idjc/Makefile Tue Oct 25 19:09:14 2016 (r424644) @@ -47,7 +47,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} pre-install: ${REINPLACE_CMD} 's|libvorbis.so.0|libvorbis.so|' \ ${WRKSRC}/python/format.py - ${REINPLACE_CMD} 's|#! /usr/local/bin/python2.72.7|#\!${LOCALBASE}/bin/${PYTHON_VERSION}|' \ + ${REINPLACE_CMD} 's|#! /usr/local/bin/python2.72.7|#\!${PYTHON_CMD}|' \ ${WRKSRC}/idjc .include <bsd.port.mk> Modified: head/net/cyphesis/Makefile ============================================================================== --- head/net/cyphesis/Makefile Tue Oct 25 18:31:54 2016 (r424643) +++ head/net/cyphesis/Makefile Tue Oct 25 19:09:14 2016 (r424644) @@ -49,7 +49,7 @@ post-patch: ${REINPLACE_CMD} -e 's|$$(datadir)/cyphesis|${DATADIR}|g ; \ s|confbackupdir = .*|confbackupdir = ${DOCSDIR}/conf|g' @${REINPLACE_CMD} -e 's|/bash|/sh|' ${WRKSRC}/scripts/extract_revision.sh - @${REINPLACE_CMD} -e '1s|python|${LOCALBASE}/bin/${PYTHON_VERSION}|' ${WRKSRC}/scripts/gen_buildid.py + @${REINPLACE_CMD} -e '1s|python|${PYTHON_CMD}|' ${WRKSRC}/scripts/gen_buildid.py @${REINPLACE_CMD} -e 's/#ifdef __APPLE__/#if defined(__APPLE__) || defined(__FreeBSD__)/g; \ s/#ifndef __APPLE__/#if !defined(__APPLE__) \&\& !defined(__FreeBSD__)/g' \ ${WRKSRC}/common/system.cpp \ Modified: head/textproc/codespell/Makefile ============================================================================== --- head/textproc/codespell/Makefile Tue Oct 25 18:31:54 2016 (r424643) +++ head/textproc/codespell/Makefile Tue Oct 25 19:09:14 2016 (r424644) @@ -23,7 +23,7 @@ PORTEXAMPLES= * SUB_FILES+= pkg-message do-build: - ${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${LOCALBASE}/bin/${PYTHON_VERSION}|' \ + ${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \ ${WRKSRC}/codespell.py do-install: Modified: head/textproc/py-libxml2/Makefile ============================================================================== --- head/textproc/py-libxml2/Makefile Tue Oct 25 18:31:54 2016 (r424643) +++ head/textproc/py-libxml2/Makefile Tue Oct 25 19:09:14 2016 (r424644) @@ -18,8 +18,8 @@ USE_GNOME+= libxml2 USES+= python:2 gettext-runtime USE_PYTHON= autoplist distutils -CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` -LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` +CPPFLAGS+= `${PYTHON_CMD}-config --cflags` +LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \ Modified: head/textproc/py3-libxml2/Makefile ============================================================================== --- head/textproc/py3-libxml2/Makefile Tue Oct 25 18:31:54 2016 (r424643) +++ head/textproc/py3-libxml2/Makefile Tue Oct 25 19:09:14 2016 (r424644) @@ -18,8 +18,8 @@ USE_GNOME+= libxml2 USES= python:3 gettext-runtime USE_PYTHON= autoplist distutils -CPPFLAGS+= `${PYTHON_VERSION}-config --cflags` -LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_VERSION}-config --libs` +CPPFLAGS+= `${PYTHON_CMD}-config --cflags` +LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs` CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ --with-html-subdir=${PORTNAME} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610251909.u9PJ9ECM019539>