Merge libsolv branch with master (9389e83)

macports · Feb 7, 2017 · 8d4a1a5 · 8d4a1a5
2 parents 7733405 + 9389e83
commit 8d4a1a5
Show file tree

Hide file tree

Showing 7,768 changed files with 2,147,796 additions and 2,103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,12 +32,23 @@ tests/test.tcl
 tests/test/library.tcl
 tests/test/trace/test.tcl
 
-vendor/*/
+vendor/vendor-destroot/
 vendor/tclsh
+vendor/**/*.o
+vendor/**/*.a
+vendor/**/*.dylib
+vendor/**/config.log
+vendor/**/config.status
+vendor/tcl8.*/unix/Tcl-Info.plist
+vendor/tcl8.*/unix/Tclsh-Info.plist
+vendor/tcl8.*/unix/tcl.pc
+vendor/tcl8.*/unix/tclConfig.sh
+vendor/tcl8.*/unix/tclsh
 
 !*.in
 
 Makefile
 pkgIndex.tcl
+!vendor/tcllib*/**/pkgIndex.tcl
 
 /dist/
diff --git a/.mailmap b/.mailmap
@@ -2,3 +2,4 @@
 <jkh@macports.org> <jkh@apple.com>
 <kevin@macports.org> <kvv@apple.com>
 <ryandesign@macports.org> <git@ryandesign.com>
+Toby Peterson <toby@macports.org> <toby@apple.com>
diff --git a/ChangeLog b/ChangeLog
@@ -2,12 +2,29 @@
 # This is a log of major user-visible changes in each MacPorts release.
 ###
 
-Release 2.4 (unreleased)
-    - Show date in verbose output of 'port installed'
-      (raimue in r146757, r152685)
+Release 2.4.1 (unreleased)
+    - Avoid an infinite loop when livecheck.regex is empty.
+      (raimue in d33a8a0)
 
-    - Add depends_test to handle the dependencies for the test phase of ports.
-      (khindenburg in r140488, #38208)
+    - Fixed detection of /opt/local/bin already in the user's PATH in the
+      installer postflight script. (barry-scott in dcb0788)
+
+    - Fixed the display of default variants by 'port variants' when the
+      defaults are affected by variants present in variants.conf.
+      (jmr in 9e63a61)
+
+    - Fixed 'port reclaim' deleting a file installed by the MacPorts installer
+      for technical reasons.
+      (cal in b0c0957, #53436)
+
+Release 2.4 (2017-01-27 by jmr)
+    - New action 'port reclaim' to clean inactive ports and unnecessary
+      distfiles to get back disk space, developed during GSoC 2014.
+      (ksammons in branch gsoc14-cleanup)
+
+    - New action 'port diagnose' to check for installation problems and
+      configuration errors, developed during GSoC 2014.
+      (ksammons in branch gsoc14-cleanup)
 
     - Replaced the strings previously printed by "port help" with much more
       detailed and current manpages written using asciidoc that open
@@ -17,13 +34,6 @@ Release 2.4 (unreleased)
        manpages written by cal, jmr, raimue, ionic, jeremyhu,
        #44530, #15467)
 
-    - Added macports_version to the Portfile execution context, to allow
-      checking the current MacPorts version in Portfiles.
-      (cal in r134511)
-
-    - Added "setunrequested" alias for "unsetrequested" command.
-      (ionic in r130217)
-
     - Added interactive questions for various use cases like 'install',
       'activate', 'uninstall --follow-dependencies'. Also added global
       flag '-N' to provide non-interactive invocations.
@@ -33,17 +43,47 @@ Release 2.4 (unreleased)
       installation to prevent them from getting lost in the scrolling output.
       (#24507, cal in r118304, patch by snc)
 
+    - Show date in verbose output of 'port installed'
+      (raimue in r146757, r152685)
+
+    - Added "setunrequested" alias for "unsetrequested" command.
+      (ionic in r130217)
+
     - Handle SIGTERM and SIGINT (^C) in MacPorts to prevent inconsistencies in
       the registry database when MacPorts is aborted during a critical
       operation.
       (cal in r118297 and r118298)
 
+    - Added macports_version to the Portfile execution context, to allow
+      checking the current MacPorts version in Portfiles.
+      (cal in r134511)
+
+    - Add depends_test to handle the dependencies for the test phase of ports.
+      (khindenburg in r140488, #38208)
+
     - Remove "support" for rpm and deb packages in MacPorts, leaving pkg/mpkg.
       (afb in r123004)
 
     - Remove deprecated rpm-vercomp function, ports should use vercmp instead.
       (afb in r123005)
 
+    - Use pkgbuild instead of PackageMaker.app in 'port pkg' on newer systems.
+      (#42725, jmr in dd89bb8)
+
+    - Fixed a bug that could cause installation of ports with large numbers of
+      dependencies to fail due to running out of file descriptors.
+      (#50986, jmr in 0fd195f)
+
+    - Fixed variants requested on the command line or in variants.conf not
+      being properly passed down to dependencies when +universal is added
+      by arch checking. (#53322, jmr in 4972592)
+
+    - Fixed building dmgs of ports with a non-zero revision.
+      (#51136, jmr in 62d7125, e0c7f1c, 75584d8)
+
+    - Fix 'port info' output for multi-valued maintainers
+      (#52928, raimue in ba2002c)
+
 Release 2.3.5 (2016-11-16 by raimue)
     - Updated compiler selection for macOS 10.12 Sierra
       (jeremyhu in r141134 and r150305)
@@ -54,7 +94,7 @@ Release 2.3.5 (2016-11-16 by raimue)
     - Prune symlinks to deleted libtool archives (.la)
       (#40935, jmr in r119571, r119594, r119595)
 
-    - Return an error livecheck matched a version older than the current
+    - Return an error if livecheck matched a version older than the current
       version.
       (jmr, raimue in r127797, r149299)
 
@@ -89,7 +129,7 @@ Release 2.3.5 (2016-11-16 by raimue)
       (#52757, raimue in fc45aaf)
 
     - Support multi-valued entries in the maintainers field and allow GitHub
-      usernames as mainainers
+      usernames as maintainers
       (cal in 30c27d5)
 
 Release 2.3.4 (2015-10-01 by jmr)

diff --git a/Makefile.in b/Makefile.in
@@ -1,4 +1,3 @@
-# $Id$
 
 srcdir      = @srcdir@
 VPATH       = @srcdir@
@@ -17,7 +16,7 @@ include Mk/macports.autoconf.mk
 
 all:: Mk/macports.autoconf.mk
 
-Mk/macports.autoconf.mk: Mk/macports.autoconf.mk.in src/config.h.in Makefile.in doc/Makefile.in src/Makefile.in src/cflib1.0/Makefile.in src/cregistry/Makefile.in src/darwintracelib1.0/Makefile.in src/machista1.0/Makefile.in src/macports1.0/Makefile.in src/mpcommon1.0/Makefile.in src/package1.0/Makefile.in src/pextlib1.0/Makefile.in src/port/Makefile.in src/port1.0/Makefile.in src/programs/Makefile.in src/programs/daemondo/Makefile.in src/registry2.0/Makefile.in tests/Makefile.in config.status
+Mk/macports.autoconf.mk: Mk/macports.autoconf.mk.in src/config.h.in Makefile.in doc/Makefile.in src/Makefile.in src/cflib1.0/Makefile.in src/cregistry/Makefile.in src/darwintracelib1.0/Makefile.in src/machista1.0/Makefile.in src/macports1.0/Makefile.in src/mpcommon1.0/Makefile.in src/package1.0/Makefile.in src/pextlib1.0/Makefile.in src/port/Makefile.in src/port1.0/Makefile.in src/programs/Makefile.in src/programs/daemondo/Makefile.in src/registry2.0/Makefile.in tests/Makefile.in vendor/Makefile.in config.status
 	./config.status
 	${MAKE} clean
 

diff --git a/Mk/macports.autoconf.mk.in b/Mk/macports.autoconf.mk.in
@@ -1,4 +1,3 @@
-# $Id$
 # vim:ts=8:noet:sts=8:sw=8
 
 SHELL			= @SHELL@

diff --git a/Mk/macports.subdir.mk b/Mk/macports.subdir.mk
@@ -1,4 +1,3 @@
-# $Id$
 
 .PHONY : all
 .PHONY : clean distclean

diff --git a/Mk/macports.tea.mk b/Mk/macports.tea.mk
@@ -1,4 +1,3 @@
-# $Id$
 
 .SUFFIXES: .m
 
@@ -22,6 +21,6 @@ clean::
 distclean:: clean
 
 install:: all
-	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+	$(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+	$(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 ${SHLIB_NAME} "${INSTALLDIR}"
+	$(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,4 +1,3 @@
-dnl $Id$
 builtin(include,m4/tcl.m4)
 builtin(include,m4/pthread.m4)
 builtin(include,m4/foundation.m4)
@@ -105,55 +104,21 @@ AC_DEFUN([MP_TOOL_PATH], [dnl
 		[])dnl
 ])
 
-dnl Configure a project contained in a .tar.gz, .tgz or .tar.bz2 tarball,
-dnl extracting it previously, if necessary. Different from AC_CONFIG_SUBDIRS
-dnl (on which this macro is based), you can pass parameters to the
-dnl sub-configure script.
+dnl Configure a project contained in a subdirectory. Different from
+dnl AC_CONFIG_SUBDIRS (on which this macro is based), you can pass parameters
+dnl to the sub-configure script.
 dnl
 dnl Parameters:
-dnl  - The relative path to the tarball
-dnl  - The relative path to the directory that will be extracted from the
-dnl    tarball and contains the configure script to be run (can be a sub directory of the extracted directory)
+dnl  - The relative path to the directory that contains the configure script
+dnl    to be run
 dnl  - Parameters to pass to the configure script
 dnl
-dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
-AC_DEFUN([MP_CONFIG_TARBALL], [
-	dnl Warning: Don't use $GZIP and $BZIP2 here, both tools interpret these
-	dnl env variables as additional parameters.
-	AC_PATH_PROG(GZIP_BIN, [gzip], [])
-	AC_PATH_PROG(BZIP2_BIN, [bzip2], [])
+dnl MP_CONFIG_SUBDIR([path-to-directory], [configure-parameters])
+AC_DEFUN([MP_CONFIG_SUBDIR], [
 
-	mp_tarball="$1"
-	ac_dir=$2
+	ac_dir="$1"
 
 	mp_popdir=$(pwd)
-	if ! test -d "$ac_dir"; then
-		mp_tarball_vendordir="$(dirname "$mp_tarball")"
-		AS_MKDIR_P(["$mp_tarball_vendordir"])
-		AC_MSG_NOTICE([=== extracting $mp_tarball])
-		mp_tarball_extract_cmd=
-		case "$mp_tarball" in
-			*.tar.gz | *.tgz)
-				if test "x$GZIP_BIN" = "x"; then
-					AC_MSG_ERROR([gzip not found])
-				fi
-				mp_tarball_extract_cmd="$GZIP_BIN"
-				;;
-			*.tar.bz2 | *.tbz2)
-				if test "x$BZIP2_BIN" = "x"; then
-					AC_MSG_ERROR([bzip2 not found])
-				fi
-				mp_tarball_extract_cmd="$BZIP2_BIN"
-				;;
-			*)
-				AC_MSG_ERROR([Don't know how to extract tarball $mp_tarball])
-				;;
-		esac
-		(cd "$mp_tarball_vendordir"; umask 0022; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
-	fi
-	if ! test -d "$ac_dir"; then
-		AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
-	fi
 
 	AS_MKDIR_P(["$ac_dir"])
 	_AC_SRCDIRS(["$ac_dir"])
@@ -164,10 +129,10 @@ AC_DEFUN([MP_CONFIG_TARBALL], [
 		if test -f "$ac_srcdir/configure"; then
 			mp_sub_configure_args=
 			mp_sub_configure_keys=
-			# Compile a list of keys that have been given to the MP_CONFIG_TARBALL
+			# Compile a list of keys that have been given to the MP_CONFIG_SUBDIR
 			# macro; we want to skip copying those parameters from the original
 			# configure invocation.
-			for mp_arg in $3; do
+			for mp_arg in $2; do
 				case $mp_arg in
 					--*=* | -*=*)
 						_MP_EXTRACT_KEY([mp_arg_key], ["$mp_arg"])
@@ -179,7 +144,7 @@ AC_DEFUN([MP_CONFIG_TARBALL], [
 			# Walk the list of arguments given to the original configure script;
 			# filter out a few common ones we likely would not want to pass along,
 			# add --disable-option-checking and filter those already given as
-			# argument to MP_CONFIG_TARBALL.
+			# argument to MP_CONFIG_SUBDIR.
 			# Most of this code is adapted from _AC_OUTPUT_SUBDIRS in
 			# $prefix/share/autoconf/autoconf/status.m4.
 			mp_prev=

diff --git a/config/RELEASE_URL b/config/RELEASE_URL
@@ -1 +1 @@
-https://github.com/macports/macports-base/tags/v2.3.5
+https://github.com/macports/macports-base/tags/v2.4.0
diff --git a/config/macports_version b/config/macports_version
@@ -1 +1 @@
-2.3.99
+2.4.99