Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 7B8847A16F for ; Thu, 5 Jan 2017 02:18:04 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E12C1856C5; Thu, 5 Jan 2017 02:18:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 714C685618 for ; Thu, 5 Jan 2017 02:18:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id I6VF5uQjqIKm for ; Thu, 5 Jan 2017 02:18:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D18C0855B4 for ; Thu, 5 Jan 2017 02:18:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CC7A4FBA6; Thu, 5 Jan 2017 02:18:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1483582682189510" MIME-Version: 1.0 Date: Thu, 5 Jan 2017 02:18:02 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/devel/p5-perl-headers To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170105021802.CC7A4FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1483582682189510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Jan 5 02:18:02 UTC 2017 Modified Files: pkgsrc/devel/p5-perl-headers: Makefile Log Message: Fix build on Darwin when there's no /usr/include anymore. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/p5-perl-headers/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1483582682189510 Content-Disposition: inline Content-Length: 1080 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/p5-perl-headers/Makefile diff -u pkgsrc/devel/p5-perl-headers/Makefile:1.45 pkgsrc/devel/p5-perl-headers/Makefile:1.46 --- pkgsrc/devel/p5-perl-headers/Makefile:1.45 Wed Jun 8 19:23:48 2016 +++ pkgsrc/devel/p5-perl-headers/Makefile Thu Jan 5 02:18:02 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/06/08 19:23:48 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2017/01/05 02:18:02 schmonz Exp $ DISTNAME= p5-perl-headers PKGNAME= ${DISTNAME}-${OS_VERSION} @@ -19,10 +19,18 @@ PERL5_PACKLIST= .packlist.h2ph NO_CONFIGURE= yes OSVERSION_SPECIFIC= yes +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include) +USR_INCLUDE= ${OSX_SDK_PATH}/usr/include +.else +USR_INCLUDE= /usr/include +.endif + do-build: ${MKDIR} ${WRKSRC}/h2ph ${RM} -f ${WRKSRC}/h2ph_log ${WRKSRC}/packlist - ( cd "/usr/include" && \ + ( cd "${USR_INCLUDE}" && \ ${BUILDLINK_PREFIX.perl}/bin/h2ph -d ${WRKSRC}/h2ph -r -l . ) \ > ${WRKSRC}/h2ph_log ( ${ECHO} "${PERL5_INSTALLVENDORARCH}/_h2ph_pre.ph" && \ --_----------=_1483582682189510--