pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/filesystems/ori ori: catch up with scons update



details:   https://anonhg.NetBSD.org/pkgsrc/rev/69a001a30858
branches:  trunk
changeset: 327510:69a001a30858
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 20:36:07 2019 +0000

description:
ori: catch up with scons update

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

diffstat:

 filesystems/ori/Makefile |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 2b721e75a126 -r 69a001a30858 filesystems/ori/Makefile
--- a/filesystems/ori/Makefile  Wed Jan 02 20:32:22 2019 +0000
+++ b/filesystems/ori/Makefile  Wed Jan 02 20:36:07 2019 +0000
@@ -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 @@
 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 @@
 .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 @@
 .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"



Home | Main Index | Thread Index | Old Index