From owner-svn-ports-head@freebsd.org Tue Oct 25 19:09:16 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58DEFC224EF; Tue, 25 Oct 2016 19:09:16 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32621CB6; Tue, 25 Oct 2016 19:09:16 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9PJ9FaW019544; Tue, 25 Oct 2016 19:09:15 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9PJ9ECM019539; Tue, 25 Oct 2016 19:09:14 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201610251909.u9PJ9ECM019539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 25 Oct 2016 19:09:14 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2016 19:09:16 -0000 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 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} \