CVS commit: pkgsrc/filesystems/ori

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Jan  2 20:36:07 UTC 2019

Modified Files:
        pkgsrc/filesystems/ori: Makefile

Log Message:
ori: catch up with scons update

Untested because the package is broken due to dependency on legacy
boost::tr1 APIs.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/ori/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/ori/Makefile
diff -u pkgsrc/filesystems/ori/Makefile:1.5 pkgsrc/filesystems/ori/Makefile:1.6
--- pkgsrc/filesystems/ori/Makefile:1.5 Fri Mar 25 21:13:51 2016
+++ pkgsrc/filesystems/ori/Makefile     Wed Jan  2 20:36:07 2019
@@ -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+=      libeven
 .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"