From ebe0a76e1f8bc5e5070fec3a092a34d774ca2f49 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Sun, 4 Jun 2017 21:49:48 +0000 Subject: 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 MFH: 2017Q2 --- comms/wsjt/Makefile | 3 ++- comms/wspr/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'comms') diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile index 27dd2dd9fd3b..f20e3d8d7e44 100644 --- a/comms/wsjt/Makefile +++ b/comms/wsjt/Makefile @@ -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 diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile index 9661010c0618..ba67d41f78c0 100644 --- a/comms/wspr/Makefile +++ b/comms/wspr/Makefile @@ -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 -- cgit