CVS commit: pkgsrc/lang/rust

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov 29 14:32:14 UTC 2018

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: Ensure the bundled http-parser is used.

Trying to mix and match pkgsrc and bundled dependencies resulted in conflicts
between libgit and http-parser, such that cargo was unable to fetch indexes
from crates.io with spurious network error regarding Content-Type headers.

While here add a note about why these dependencies are currently disabled.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/lang/rust/Makefile

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.66 pkgsrc/lang/rust/Makefile:1.67
--- pkgsrc/lang/rust/Makefile:1.66      Tue Nov 27 15:45:23 2018
+++ pkgsrc/lang/rust/Makefile   Thu Nov 29 14:32:14 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2018/11/27 15:45:23 adam Exp $
+# $NetBSD: Makefile,v 1.67 2018/11/29 14:32:14 jperkin Exp $
 
 DISTNAME=      rustc-1.30.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://static.rust-lang.org/dist/
 
@@ -423,14 +424,18 @@ stage0-bootstrap: install
         ${GTAR} -zcf ${PKGNAME_NOREV}-${RUST_ARCH}.tar.gz ${PKGNAME_NOREV}-${RUST_ARCH})
 .endif
 
+# These dependencies currently use the bundled sources as they require
+# development features not yet available in released versions.
+#
+#.include "../../devel/libgit2/buildlink3.mk"
+#.include "../../security/libssh2/buildlink3.mk"
+#.include "../../www/curl/buildlink3.mk"
+#.include "../../www/http-parser/buildlink3.mk"
+
 .include "../../devel/cmake/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
-#.include "../../devel/libgit2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #.include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-#.include "../../security/libssh2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-#.include "../../www/curl/buildlink3.mk"
-.include "../../www/http-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"