From owner-svn-ports-head@FreeBSD.ORG Sun Nov 24 16:57:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D636309; Sun, 24 Nov 2013 16:57:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2BA5E2988; Sun, 24 Nov 2013 16:57:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOGv80v090348; Sun, 24 Nov 2013 16:57:08 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOGv7FK090326; Sun, 24 Nov 2013 16:57:07 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201311241657.rAOGv7FK090326@svn.freebsd.org> From: Marcus von Appen Date: Sun, 24 Nov 2013 16:57:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334746 - in head/devel: ros ros-common_msgs ros-documentation ros-nxt ros_comm 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.16 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: Sun, 24 Nov 2013 16:57:08 -0000 Author: mva Date: Sun Nov 24 16:57:06 2013 New Revision: 334746 URL: http://svnweb.freebsd.org/changeset/ports/334746 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Modified: head/devel/ros-common_msgs/Makefile (contents, props changed) head/devel/ros-documentation/Makefile (contents, props changed) head/devel/ros-nxt/Makefile (contents, props changed) head/devel/ros/Makefile (contents, props changed) head/devel/ros_comm/Makefile Modified: head/devel/ros-common_msgs/Makefile ============================================================================== --- head/devel/ros-common_msgs/Makefile Sun Nov 24 16:43:54 2013 (r334745) +++ head/devel/ros-common_msgs/Makefile Sun Nov 24 16:57:06 2013 (r334746) @@ -5,7 +5,7 @@ PORTNAME= ros-common_msgs PORTVERSION= 1.4.0 PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= https://code.ros.org/svn/release/download/stacks/common_msgs/common_msgs-${PORTVERSION}/ +MASTER_SITES= https://code.ros.org/svn/release/download/stacks/common_msgs/common_msgs-${PORTVERSION}/ DISTNAME= common_msgs-${PORTVERSION} DIST_SUBDIR= ros @@ -20,10 +20,18 @@ BUILD_DEPENDS= rosmake:${PORTSDIR}/devel ${LOCALBASE}/ros/stacks/ros_comm/stack.xml:${PORTSDIR}/devel/ros_comm RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros \ ${LOCALBASE}/ros/stacks/ros_comm/stack.xml:${PORTSDIR}/devel/ros_comm -USE_PYTHON= yes + +USES= shebangfix +USE_PYTHON= 2 USE_BZIP2= yes USE_LDCONFIG= yes +python_OLD_CMD= /usr/bin/env python +python_CMD= /usr/bin/env python2 +SHEBANG_FILES= actionlib_msgs/genaction.py \ + stereo_msgs/migration_rules/split_rawstereo.py \ + test_common_msgs/test/test_common_msgs_migration.py + # rosmake does its own threading MAKE_JOBS_UNSAFE= yes @@ -55,7 +63,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/ros/stacks/${STACKNAME} .endfor #strip and symlink ELF libraries -.for f in sensor_msgs/lib/libsensor_msgs.so +.for f in sensor_msgs/lib/libsensor_msgs.so ${STRIP_CMD} ${PREFIX}/ros/stacks/${STACKNAME}/${f} ${LN} -s ${PREFIX}/ros/stacks/${STACKNAME}/${f} ${PREFIX}/lib .endfor Modified: head/devel/ros-documentation/Makefile ============================================================================== --- head/devel/ros-documentation/Makefile Sun Nov 24 16:43:54 2013 (r334745) +++ head/devel/ros-documentation/Makefile Sun Nov 24 16:57:06 2013 (r334746) @@ -23,7 +23,7 @@ RUN_DEPENDS= rosrun:${PORTSDIR}/devel/ro sphinx-build:${PORTSDIR}/textproc/py-sphinx \ doxygen:${PORTSDIR}/devel/doxygen \ epydoc:${PORTSDIR}/devel/epydoc -USE_PYTHON= yes +USE_PYTHON= 2 USE_BZIP2= yes # rosmake does its own threading @@ -40,6 +40,8 @@ MAKE_ARGS= -i --no-rosdep --status-rate= NO_STAGE= yes post-patch: + @${GREP} -l -r "^#\!/usr/bin/env python" ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -E -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" # fix path to bash ${GREP} -l -r "^#\! /bin/bash" ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -E -e "s|#! /bin/bash|#!${LOCALBASE}/bin/bash|" Modified: head/devel/ros-nxt/Makefile ============================================================================== --- head/devel/ros-nxt/Makefile Sun Nov 24 16:43:54 2013 (r334745) +++ head/devel/ros-nxt/Makefile Sun Nov 24 16:57:06 2013 (r334746) @@ -36,7 +36,7 @@ RUN_DEPENDS= roscore:${PORTSDIR}/devel/r ${LOCALBASE}/ros/stacks/common_msgs/stack.xml:${PORTSDIR}/devel/ros-common_msgs \ ${LOCALBASE}/ros/stacks/geometry/stack.xml:${PORTSDIR}/math/ros-geometry \ ${PYTHON_SITELIBDIR}/usb.so:${PORTSDIR}/devel/py-usb -USE_PYTHON= yes +USE_PYTHON= 2 USE_BZIP2= yes # rosmake does its own threading @@ -67,6 +67,12 @@ post-extract: # and keeping it here breaks rospack ${RM} -rf ${WRKSRC}/nxt_rviz_plugin +post-patch: + @${GREP} -l -r "^#\!/usr/bin/env python" ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -E -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" + @${REINPLACE_CMD} -e 's|python setup.py|python2 setup.py|' \ + ${WRKSRC}/nxt_python/Makefile + do-build: (cd ${WRKSRC} ; ${MAKE_ENV} ${LOCALBASE}/bin/rosmake ${MAKE_ARGS}) Modified: head/devel/ros/Makefile ============================================================================== --- head/devel/ros/Makefile Sun Nov 24 16:43:54 2013 (r334745) +++ head/devel/ros/Makefile Sun Nov 24 16:57:06 2013 (r334746) @@ -30,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/_ gmake:${PORTSDIR}/devel/gmake \ sudo:${PORTSDIR}/security/sudo \ wget:${PORTSDIR}/ftp/wget -USE_PYTHON= yes +USE_PYTHON= 2 USE_BZIP2= yes USE_LDCONFIG= yes USES= pkgconfig @@ -56,12 +56,19 @@ PORTDOCS= AUTHORS README NO_STAGE= yes post-patch: + ${GREP} -l -r "^#! /usr/bin/env python" ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -E -e "s|^#! /usr/bin/env python$$|#!/usr/bin/env python2|;" + ${GREP} -l -r "^#!/usr/bin/env python$$" ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -E -e "s|^#!/usr/bin/env python$$|#!/usr/bin/env python2|;" # fix path to bash ${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \ - ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|" + ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|" # temporarily alter how ROS is built for the port build ${REINPLACE_CMD} -E -e "s|rosmake --rosdep-install|bin/rosmake --no-rosdep --disable-logging -i -a|" \ - ${WRKSRC}/Makefile + ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|COMMAND python|COMMAND python2|' \ + ${WRKSRC}/core/rosbuild/public.cmake \ + ${WRKSRC}/core/rosbuild/private.cmake post-build: # restore original ROS Makefile Modified: head/devel/ros_comm/Makefile ============================================================================== --- head/devel/ros_comm/Makefile Sun Nov 24 16:43:54 2013 (r334745) +++ head/devel/ros_comm/Makefile Sun Nov 24 16:57:06 2013 (r334746) @@ -22,7 +22,7 @@ BUILD_DEPENDS= rosmake:${PORTSDIR}/devel RUN_DEPENDS= roscore:${PORTSDIR}/devel/ros \ f2py:${PORTSDIR}/math/py-numpy \ pilconvert.py:${PORTSDIR}/graphics/py-imaging -USE_PYTHON= yes +USE_PYTHON= 2 USE_BZIP2= yes USE_LDCONFIG= yes @@ -43,6 +43,8 @@ post-patch: # fix path to bash ${GREP} -l -r "^#\!/bin/bash" ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -E -e "s|#!/bin/bash|#!${LOCALBASE}/bin/bash|" + ${GREP} -l -r "^#\!/usr/bin/env python" ${WRKSRC} | ${XARGS} \ + ${REINPLACE_CMD} -E -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" do-build: (cd ${WRKSRC} ; ${MAKE_ENV} ${LOCALBASE}/bin/rosmake ${MAKE_ARGS}) @@ -58,7 +60,7 @@ do-install: ${FIND} ${WRKSRC}/${d} -name build -type d -or -name \*.bak -type f \ -or -name .svnignore -type f -or -name .cvsignore -type f \ -or -name \*.orig -type f | ${XARGS} ${RM} -rf - (cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${STACKNAME}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${PREFIX}/ros/stacks/${STACKNAME}) .endfor # strip and symlink ELF libraries .for f in clients/cpp/roscpp/lib/libros.so \