From 1d92d065693dc3e92f8576a4d1bf11e03b5a7277 Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Wed, 2 Jan 2019 20:36:07 +0000
Subject: ori: catch up with scons update

Untested because the package is broken due to dependency on legacy
boost::tr1 APIs.
---
 filesystems/ori/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'filesystems')

diff --git a/filesystems/ori/Makefile b/filesystems/ori/Makefile
index 53c32b6e9c5..c464534064d 100644
--- a/filesystems/ori/Makefile
+++ b/filesystems/ori/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/03/25 21:13:51 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/02 20:36:07 tnn Exp $
 
 DISTNAME=	ori-0.8.1
 PKGREVISION=	2
@@ -11,11 +11,11 @@ HOMEPAGE=	http://ori.scs.stanford.edu/
 COMMENT=	Secure distributed file system
 LICENSE=	isc
 
-BUILD_DEPENDS+=	scons>=2.0:../../devel/scons
-
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37	# python2 SCons files
+
 SUBST_CLASSES+=		man
 SUBST_SED.man+=		-e "s,share/man,${PKGMANDIR},"
 SUBST_FILES.man+=	SConstruct
@@ -30,10 +30,10 @@ CWRAPPERS_APPEND.cxx+=	-D_KERNTYPES
 .endif
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN}
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/scons install PREFIX=${DESTDIR}${PREFIX}
+	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${SCONSBIN} install PREFIX=${DESTDIR}${PREFIX}
 
 # configure script demands libevent 2.0 or greater
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0
@@ -41,6 +41,8 @@ BUILDLINK_API_DEPENDS.libevent+=	libevent>=2.0
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
+PYTHON_FOR_BUILD_ONLY?=	yes
+.include "../../devel/scons/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-- 
cgit v1.2.3