Date: Sun, 8 Dec 2013 13:24:03 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335888 - in head/devel: avro-cpp cvs2svn googletest libvirt-glib mongo-cxx-driver ninja py-gamin py-itools Message-ID: <201312081324.rB8DO3iL078930@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Sun Dec 8 13:24:03 2013 New Revision: 335888 URL: http://svnweb.freebsd.org/changeset/ports/335888 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Approved by: portmgr (blanket) Modified: head/devel/avro-cpp/Makefile head/devel/cvs2svn/Makefile head/devel/googletest/Makefile (contents, props changed) head/devel/libvirt-glib/Makefile (contents, props changed) head/devel/mongo-cxx-driver/Makefile head/devel/ninja/Makefile (contents, props changed) head/devel/py-gamin/Makefile (contents, props changed) head/devel/py-itools/Makefile (contents, props changed) Modified: head/devel/avro-cpp/Makefile ============================================================================== --- head/devel/avro-cpp/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/avro-cpp/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -22,4 +22,9 @@ USE_PYTHON= yes WRKSRC= ${WRKDIR}/${DISTNAME}/lang/c++ NO_STAGE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|COMMAND python|COMMAND "${PYTHON_CMD}"|' \ + ${WRKSRC}/CMakeLists.txt + .include <bsd.port.mk> Modified: head/devel/cvs2svn/Makefile ============================================================================== --- head/devel/cvs2svn/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/cvs2svn/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -21,10 +21,15 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} # 2.4.0 -> svn r5392 PATCHREV= 5433 -USE_PYTHON= -2.7 +USES= shebangfix +USE_PYTHON= 2 USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes +python_OLD_CMD= /usr/bin/env python +python_CMD= /usr/bin/env python2 +SHEBANG_FILES= cvs2svn cvs2git cvs2bzr + OPTIONS_MULTI= SCM OPTIONS_MULTI_SCM= SUBVERSION GIT BAZAAR OPTIONS_DEFAULT= SUBVERSION Modified: head/devel/googletest/Makefile ============================================================================== --- head/devel/googletest/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/googletest/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -10,11 +10,18 @@ DISTNAME= gtest-${PORTVERSION} MAINTAINER= clsung@FreeBSD.org COMMENT= A framework for writing C++ tests on a variety of platforms +USES= shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_PYTHON_BUILD= yes +USE_PYTHON_BUILD= 2 + +python_OLD_CMD= /usr/bin/env python +python_CMD= /usr/bin/env python2 +SHEBANG_FILES= scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \ + scripts/pump.py regression-test: cd ${WRKSRC}; ${MAKE} check + .include <bsd.port.mk> Modified: head/devel/libvirt-glib/Makefile ============================================================================== --- head/devel/libvirt-glib/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/libvirt-glib/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -16,6 +16,7 @@ USES= pathfix pkgconfig gmake USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= intltool introspection +USE_PYTHON= -2.7 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector CONFIGURE_ARGS+= --enable-introspection Modified: head/devel/mongo-cxx-driver/Makefile ============================================================================== --- head/devel/mongo-cxx-driver/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/mongo-cxx-driver/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -20,7 +20,7 @@ GH_ACCOUNT= waitman GH_TAGNAME= ${GH_COMMIT} GH_COMMIT= 41691d5 -USE_PYTHON= yes +USE_PYTHON_BUILD= 2 NO_STAGE= yes .include <bsd.port.mk> Modified: head/devel/ninja/Makefile ============================================================================== --- head/devel/ninja/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/ninja/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -26,7 +26,7 @@ PORTDOCS= COPYING HACKING.md README manu do-build: @(cd ${WRKSRC} && \ - CXX=${CXX} CFLAGS="${CXXFLAGS}" ./bootstrap.py --verbose) + CXX=${CXX} CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} bootstrap.py --verbose) do-install: @${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin Modified: head/devel/py-gamin/Makefile ============================================================================== --- head/devel/py-gamin/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/py-gamin/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -20,7 +20,7 @@ GAMIN_SLAVE= yes USES= pathfix USE_PYTHON= yes -CONFIGURE_ARGS= --with-python=${LOCALBASE} \ +CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc NO_STAGE= yes Modified: head/devel/py-itools/Makefile ============================================================================== --- head/devel/py-itools/Makefile Sun Dec 8 13:22:20 2013 (r335887) +++ head/devel/py-itools/Makefile Sun Dec 8 13:24:03 2013 (r335888) @@ -16,7 +16,8 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}r ${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0:${PORTSDIR}/devel/py-pygit2 + ${PYTHON_PKGNAMEPREFIX}pygit2>=0:${PORTSDIR}/devel/py-pygit2 \ + python:${PORTSDIR}/lang/python RUN_DEPENDS+= ${BUILD_DEPENDS} LIB_DEPENDS= glib:${PORTSDIR}/devel/glib20 \ soup:${PORTSDIR}/devel/libsoup
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312081324.rB8DO3iL078930>