wip/nix: Update to version 2.3.1.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/nix: Update to version 2.3.1.
From: ng0 <ng0%NetBSD.org@localhost>
Date: Thu, 31 Oct 2019 13:52:22 +0000
Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Thu Oct 31 13:52:22 2019 +0000
Changeset:	df3a4fc835b0914726879fec064cb63661260220

Modified Files:
	nix/Makefile
	nix/distinfo
Removed Files:
	nix/patches/patch-aa__configure_ac
	nix/patches/patch-ab__Makefile_config_in
	nix/patches/patch-mk__libraries_mk
	nix/patches/patch-mk__programs_mk

Log Message:
wip/nix: Update to version 2.3.1.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=df3a4fc835b0914726879fec064cb63661260220

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

diffstat:
 nix/Makefile                             | 41 ++++++++++++++++++--------------
 nix/distinfo                             | 12 ++++------
 nix/patches/patch-aa__configure_ac       |  8 -------
 nix/patches/patch-ab__Makefile_config_in |  8 -------
 nix/patches/patch-mk__libraries_mk       | 11 ---------
 nix/patches/patch-mk__programs_mk        | 12 ----------
 6 files changed, 27 insertions(+), 65 deletions(-)

diffs:
diff --git a/nix/Makefile b/nix/Makefile
index 4e06ad3b18..881e6a5c39 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	nix-2.2.2
+DISTNAME=	nix-2.3.1
 CATEGORIES=	wip
 MASTER_SITES=	${MASTER_SITE_GITHUB:=NixOS/}
 
@@ -9,7 +9,8 @@ HOMEPAGE=	https://github.com/NixOS/nix/
 COMMENT=	Purely functional package manager
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	pkg-config flex automake autoconf autoreconf bash gmake bison
+USE_TOOLS+=	pkg-config flex bash gmake bison
+USE_TOOLS+=	automake autoconf autoreconf
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
@@ -20,12 +21,16 @@ PKGCONFIG_OVERRIDE+=	src/libstore/nix-store.pc.in
 CONFIGURE_ARGS+=	--with-sandbox-shell=/bin/sh
 CONFIGURE_ARGS+=	--enable-gc
 
-# s3 option needs s3-cpp, this was reported as a cause for error if left unchanged.
+# s3 option needs s3-cpp, this was reported as a cause for error if
+# left unchanged.
 CONFIGURE_ENV+=		ac_cv_header_aws_s3_S3Client_h=no
-CONFIGURE_ENV+=		EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
-CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+#CONFIGURE_ENV+=		EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
+#CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+CONFIGURE_ENV+=		EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include
+CONFIGURE_ENV+=		EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
 CONFIGURE_ENV+=		LIBLZMA_CFLAGS=${BUILDLINK_PREFIX.lzmalib:Q}/include
 CONFIGURE_ENV+=		LIBLZMA_LIBS=${BUILDLINK_PREFIX.lzmalib:Q}/lib
+CONFIGURE_ENV+=		BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
 
 # Workaround for:
 #   /usr/bin/ld: error: undefined symbol: SHA512_Update
@@ -46,20 +51,20 @@ CONFIG_SHELL=		${BASH}
 # incomplete, remove once the docs build
 CONFIGURE_ARGS+=	--disable-doc-gen
 
-SUBST_CLASSES+=         docbook
-SUBST_MESSAGE.docbook=  Fixing docbook URLs.
-SUBST_FILES.docbook+=   doc/manual/installation/prerequisites-source.xml
-SUBST_FILES.docbook+=   doc/manual/local.mk
-SUBST_FILES.docbook+=   doc/manual/manual.xmli
-SUBST_STAGE.docbook=    pre-configure
-SUBST_SED.docbook+=     -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
+SUBST_CLASSES+=		docbook
+SUBST_MESSAGE.docbook=	Fixing docbook URLs.
+SUBST_FILES.docbook+=	doc/manual/installation/prerequisites-source.xml
+SUBST_FILES.docbook+=	doc/manual/local.mk
+SUBST_FILES.docbook+=	doc/manual/manual.xmli
+SUBST_STAGE.docbook=	pre-configure
+SUBST_SED.docbook+=	-e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
 
 # and one more.
-SUBST_CLASSES+=         docbook2
-SUBST_MESSAGE.docbook2=  Fixing docbook URLs.
-SUBST_FILES.docbook2+=   doc/manual/local.mk
-SUBST_STAGE.docbook2=    pre-configure
-SUBST_SED.docbook2+=     -e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
+SUBST_CLASSES+=		docbook2
+SUBST_MESSAGE.docbook2=	Fixing docbook URLs.
+SUBST_FILES.docbook2+=	doc/manual/local.mk
+SUBST_STAGE.docbook2=	pre-configure
+SUBST_SED.docbook2+=	-e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
 
 BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
@@ -73,7 +78,7 @@ pre-configure:
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/editline/buildlink3.mk"
-#.include "../../meta-pkgs/boost/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/nix/distinfo b/nix/distinfo
index faf6d0e309..16b5029458 100644
--- a/nix/distinfo
+++ b/nix/distinfo
@@ -1,10 +1,6 @@
 $NetBSD$
 
-SHA1 (nix-2.2.2.tar.gz) = 2bf4001dc70472d695534f04bea3803f546a9594
-RMD160 (nix-2.2.2.tar.gz) = 5d95c107c10833c52e674f75ffab3e06f2657082
-SHA512 (nix-2.2.2.tar.gz) = 793fb94a4fa7959651238d7b31853cba231a0016d2d7cb2ab5b8445ad9fbfe738673cfc1cc8666a2c59898bfda481c1b8d31c64af65123052f11194867f2a97d
-Size (nix-2.2.2.tar.gz) = 865747 bytes
-SHA1 (patch-aa__configure_ac) = 6c20b077d347ed08a73e64a189d67e11f75ebe23
-SHA1 (patch-ab__Makefile_config_in) = aecad05838282840f966b1f529e7b87dfe6f6c41
-SHA1 (patch-mk__libraries_mk) = 1ea7f8d5b6d743efa146dc9f9d1773bd01c4ec60
-SHA1 (patch-mk__programs_mk) = 5b8481e4d47f57f1d4fb02d94a8804216d3a8867
+SHA1 (nix-2.3.1.tar.gz) = 7a08687d40b3f2fd80d3e315195e956eab787f10
+RMD160 (nix-2.3.1.tar.gz) = 65fe91b3cd5ea9ebf2a1fdaa848a8ffb02f2043e
+SHA512 (nix-2.3.1.tar.gz) = 47b2455cd9527bd6dae1eb35351c679e230b69429315be73b2c49c7d649044e5e39d09d6d95d5c946061548d2aa25eff62535655a6033a6740ab40641f02c11d
+Size (nix-2.3.1.tar.gz) = 894698 bytes
diff --git a/nix/patches/patch-aa__configure_ac b/nix/patches/patch-aa__configure_ac
deleted file mode 100644
index 6f53d4beb2..0000000000
--- a/nix/patches/patch-aa__configure_ac
+++ /dev/null
@@ -1,8 +0,0 @@
-Respect CFLAGS and CXXFLAGS.
---- configure.ac~
-+++ configure.ac
-@@ -57,4 +57,2 @@ fi
- 
--CFLAGS=
--CXXFLAGS=
- AC_PROG_CC
diff --git a/nix/patches/patch-ab__Makefile_config_in b/nix/patches/patch-ab__Makefile_config_in
deleted file mode 100644
index 32acfc74c0..0000000000
--- a/nix/patches/patch-ab__Makefile_config_in
+++ /dev/null
@@ -1,8 +0,0 @@
-
---- Makefile.config.in~
-+++ Makefile.config.in
-@@ -5,3 +5,4 @@ CXX = @CXX@
- CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
- ENABLE_S3 = @ENABLE_S3@
- HAVE_SODIUM = @HAVE_SODIUM@
diff --git a/nix/patches/patch-mk__libraries_mk b/nix/patches/patch-mk__libraries_mk
deleted file mode 100644
index 8b4470ad99..0000000000
--- a/nix/patches/patch-mk__libraries_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/libraries.mk~
-+++ mk/libraries.mk
-@@ -88,3 +88,3 @@ define build-library
-     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
-+	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
- 
-@@ -102,3 +102,3 @@ define build-library
-     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
diff --git a/nix/patches/patch-mk__programs_mk b/nix/patches/patch-mk__programs_mk
deleted file mode 100644
index 4384271d5f..0000000000
--- a/nix/patches/patch-mk__programs_mk
+++ /dev/null
@@ -1,12 +0,0 @@
---- mk/programs.mk~
-+++ mk/programs.mk
-@@ -34,3 +34,3 @@ define build-program
-   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-+	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
- 
-@@ -48,3 +48,3 @@ define build-program
-     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-
Prev by Date: wip/go-spew: finalize package.
Next by Date: wip/tokei: Adjust description.
Previous by Thread: wip/go-spew: finalize package.
Next by Thread: wip/tokei: Adjust description.
Indexes:
Home | Main Index | Thread Index | Old Index