CVS commit: pkgsrc/chat/swift

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct  4 20:37:40 UTC 2017

Modified Files:
        pkgsrc/chat/swift: Makefile

Log Message:
swift: switch to building using its own scons

scons-3.x is too new for this and needs too many fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/chat/swift/Makefile

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

Modified files:

Index: pkgsrc/chat/swift/Makefile
diff -u pkgsrc/chat/swift/Makefile:1.29 pkgsrc/chat/swift/Makefile:1.30
--- pkgsrc/chat/swift/Makefile:1.29     Mon Sep 18 09:53:12 2017
+++ pkgsrc/chat/swift/Makefile  Wed Oct  4 20:37:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/09/18 09:53:12 maya Exp $
+# $NetBSD: Makefile,v 1.30 2017/10/04 20:37:40 wiz Exp $
 
 DISTNAME=      swift-3.0
 PKGREVISION=   16
@@ -10,7 +10,9 @@ HOMEPAGE=     http://swift.im/
 COMMENT=       Swift XMPP Client
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      scons>=1.3:../../devel/scons
+# would be nicer to build with pkgsrc version, but
+# swift-3.0 does not build with scons>=3
+#DEPENDS+=     scons>=1.3:../../devel/scons
 
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    pkg-config
@@ -34,11 +36,11 @@ do-configure:
        ${ECHO} "allow_warnings=\"true\"" >> config.py ;
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./scons Swift
 
 do-install:
        cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+       ${SETENV} ${MAKE_ENV} ./scons \
            SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
        ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1