Date: Sun, 4 Jun 2017 21:51:07 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442593 - in branches/2017Q2: archivers/py-attic archivers/py-borgbackup audio/lollypop comms/wsjt comms/wspr mail/rss2email3 math/convertall math/rpcalc multimedia/mps-youtube net-im/p... Message-ID: <201706042151.v54Lp7G5034469@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Jun 4 21:51:07 2017 New Revision: 442593 URL: https://svnweb.freebsd.org/changeset/ports/442593 Log: MFH: r442592 Allow these ports to build with PACKAGE_BUILDING_FLAVORS set. Poudriere in particulr did not properly handle DEPENDS_ARGS which made these ports not properly install dependencies. That bug is being addressed along with adding FLAVORS support to it. With hat: portmgr Approved by: portmgr (implicit) Modified: branches/2017Q2/archivers/py-attic/Makefile branches/2017Q2/archivers/py-borgbackup/Makefile branches/2017Q2/audio/lollypop/Makefile branches/2017Q2/comms/wsjt/Makefile branches/2017Q2/comms/wspr/Makefile branches/2017Q2/mail/rss2email3/Makefile branches/2017Q2/math/convertall/Makefile branches/2017Q2/math/rpcalc/Makefile branches/2017Q2/multimedia/mps-youtube/Makefile branches/2017Q2/net-im/poezio/Makefile branches/2017Q2/net/tiny-network-utilities/Makefile branches/2017Q2/ports-mgmt/py-pytoport/Makefile branches/2017Q2/security/morphis/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/archivers/py-attic/Makefile ============================================================================== --- branches/2017Q2/archivers/py-attic/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/archivers/py-attic/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -25,7 +25,8 @@ PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSY .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/archivers/py-borgbackup/Makefile ============================================================================== --- branches/2017Q2/archivers/py-borgbackup/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/archivers/py-borgbackup/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -28,7 +28,8 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/audio/lollypop/Makefile ============================================================================== --- branches/2017Q2/audio/lollypop/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/audio/lollypop/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -36,7 +36,8 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/comms/wsjt/Makefile ============================================================================== --- branches/2017Q2/comms/wsjt/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/comms/wsjt/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -103,7 +103,8 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/comms/wspr/Makefile ============================================================================== --- branches/2017Q2/comms/wspr/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/comms/wspr/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -63,7 +63,8 @@ do-fetch: .endif .endif -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/mail/rss2email3/Makefile ============================================================================== --- branches/2017Q2/mail/rss2email3/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/mail/rss2email3/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -35,7 +35,8 @@ post-install: .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/math/convertall/Makefile ============================================================================== --- branches/2017Q2/math/convertall/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/math/convertall/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -41,7 +41,8 @@ do-install: .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/math/rpcalc/Makefile ============================================================================== --- branches/2017Q2/math/rpcalc/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/math/rpcalc/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -36,7 +36,8 @@ do-install: .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/multimedia/mps-youtube/Makefile ============================================================================== --- branches/2017Q2/multimedia/mps-youtube/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/multimedia/mps-youtube/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -47,7 +47,8 @@ post-install: .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/net-im/poezio/Makefile ============================================================================== --- branches/2017Q2/net-im/poezio/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/net-im/poezio/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -20,7 +20,8 @@ USE_PYTHON= distutils autoplist .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/net/tiny-network-utilities/Makefile ============================================================================== --- branches/2017Q2/net/tiny-network-utilities/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/net/tiny-network-utilities/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -27,7 +27,8 @@ PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYT .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/ports-mgmt/py-pytoport/Makefile ============================================================================== --- branches/2017Q2/ports-mgmt/py-pytoport/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/ports-mgmt/py-pytoport/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -25,7 +25,8 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif Modified: branches/2017Q2/security/morphis/Makefile ============================================================================== --- branches/2017Q2/security/morphis/Makefile Sun Jun 4 21:49:48 2017 (r442592) +++ branches/2017Q2/security/morphis/Makefile Sun Jun 4 21:51:07 2017 (r442593) @@ -27,7 +27,8 @@ NO_ARCH= yes .include <bsd.port.pre.mk> -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ + ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706042151.v54Lp7G5034469>