macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from JacksonIsaac/libsolv

Browse Source 
Merge 'master' into gsoc15-dependency branch
This commit is contained in:
Jackson Isaac
2016-12-06 23:45:44 +05:30
committed by GitHub
parent d8ef7c5bbe ddc845b26c
commit 38e5733c01
252 changed files with 5258 additions and 3457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+3
View File
@@ -0,0 +1,3 @@
# Normalize EOLs by default, to avoid falling back on committers'
# "core.autocrlf" settings.
* text=auto
.gitignore
+43
View File
@@ -0,0 +1,43 @@
/config.log
/config.status
/Doxyfile
/setupenv.bash
/autom4te.cache
doc/*.gz
doc/*.mtree
doc/*.xml
doc/.dep
doc/macports.conf
doc/pubkeys.conf
Mk/macports.autoconf.mk
portmgr/dmg/postflight
src/*
!src/*/
src/*/*.dylib
src/*/*_autoconf.tcl
src/cregistry/macports.sqlext
src/darwintracelib1.0/*.d
src/darwintracelib1.0/sip_copy_proc.[ch]
src/machista1.0/tests/libmachista-test
src/port/*
!src/port/*.tcl
src/programs/daemondo/build/
src/**/*.[ao]
tests/test.tcl
tests/test/library.tcl
tests/test/trace/test.tcl
vendor/*/
vendor/tclsh
!*.in
Makefile
pkgIndex.tcl
/dist/
.mailmap
+4
View File
@@ -0,0 +1,4 @@
<cal@macports.org> <neverpanic@gmail.com>
<jkh@macports.org> <jkh@apple.com>
<kevin@macports.org> <kvv@apple.com>
<ryandesign@macports.org> <git@ryandesign.com>
ChangeLog
+71 -1
View File
@@ -1,9 +1,14 @@
###
# This is a log of major user-visible changes in each MacPorts release.
# $Id$
###
Release 2.4 (unreleased)
- Show date in verbose output of 'port installed'
(raimue in r146757, r152685)
- Add depends_test to handle the dependencies for the test phase of ports.
(khindenburg in r140488, #38208)
- Replaced the strings previously printed by "port help" with much more
detailed and current manpages written using asciidoc that open
automatically. Added documentation for almost all commands currently
@@ -39,6 +44,71 @@ Release 2.4 (unreleased)
- Remove deprecated rpm-vercomp function, ports should use vercmp instead.
(afb in r123005)
Release 2.3.5 (2016-11-16 by raimue)
- Updated compiler selection for macOS 10.12 Sierra
(jeremyhu in r141134 and r150305)
- Do not use default archive_sites for custom ports trees
(raimue in r147456)
- Prune symlinks to deleted libtool archives (.la)
(#40935, jmr in r119571, r119594, r119595)
- Return an error livecheck matched a version older than the current
version.
(jmr, raimue in r127797, r149299)
- Permit pkg phase to be run as root, if needed for additional
modifications in destroot.
(ctreleaven in r152115)
- Ignore warnings on stderr for archive extraction to allow use of gnutar.
(#42492, cal in r132312)
- Create the documented porthier(7) directory structure in ${prefix}/var
and ${prefix}/share for destroot phase.
(#45434, #47688, ryandesign in r135998, r135999)
- When syncing a ports tree failed, operation could continue with the
wrong uid.
(#43202, cal in r118570)
- Change default of livecheck.ignore_sslcert to "no".
(#52515, raimue in r153648)
- No longer check Subversion properties in 'port lint'
(#48577, ryandesign in r153865)
- Fix problems with the postflight script in the installer.
(#43875, #43749, cal in r122042, r122044, r154073, r154110)
- Warn when the obsolete Subversion repository is used.
(raimue in r154451)
- port lint: warn if obsolete $Id$ keyword is used.
(#52757, raimue in fc45aaf)
- Support multi-valued entries in the maintainers field and allow GitHub
usernames as mainainers
(cal in 30c27d5)
Release 2.3.4 (2015-10-01 by jmr)
- Installation will now abort when an archive is found on a server but
downloading it fails, rather than trying to build from source without
the correct dependencies (jmr in r138461)
- Re-added macports-llvm-gcc-4.2 and apple-gcc-4.2 to the compiler
fallback list on Yosemite now that they work (jmr in r136965)
- Changed the existsuser and existsgroup procs to return -1 on failure
instead of 0, since 0 is root's uid (#45737, cal in r135851)
- The MacPorts version is now available to Portfiles through a proc called
macports_version (cal in r134511)
- Fix failure to activate ports that install files with backslashes in
their names (#47283, cal in r134501, r134502)
Release 2.3.3 (2014-11-21 by jmr)
- Fix database performance regressions with SQLite 3.8 by specifying a
good index for some queries (#45645, cal in r128113, r128274, r128276)
LICENSE
+2 -2
View File
@@ -1,5 +1,5 @@
Copyright (c) 2002 - 2003, Apple Inc.
Copyright (c) 2004 - 2014, The MacPorts Project.
Copyright (c) 2002-2003, Apple Inc.
Copyright (c) 2004-2016, The MacPorts Project.
All rights reserved.
Redistribution and use in source and binary forms, with or without
Makefile.in
+18 -30
View File
@@ -7,11 +7,9 @@ PATH = @PATH_CLEANED@
SUBDIR = vendor doc src tests
DISTDIR = dist
DISTVER =
DISTTAG = release_${subst .,_,${DISTVER}}
DISTTAG = v${DISTVER}
DISTNAME = MacPorts-${DISTVER}
DISTARCTAG = ${DISTTAG}-archive
DISTARCNAME = ${DISTNAME}-archive
SVNURL = https://svn.macports.org/repository/macports
DISTGPGID =
include Mk/macports.autoconf.mk
@@ -19,7 +17,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/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 config.status
./config.status
${MAKE} clean
@@ -102,7 +100,7 @@ endif
ifndef SELFUPDATING
@echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, add ${prefix}/bin to your PATH and run:"; echo ""
@echo "sudo port -v selfupdate"; echo ""
@echo "Please read \"man port\", the MacPorts guide at http://guide.macports.org/ and Wiki at https://trac.macports.org/ for full documentation."; echo ""
@echo "Please read \"man port\", the MacPorts guide at https://guide.macports.org/ and Wiki at https://trac.macports.org/ for full documentation."; echo ""
else
@echo ""; echo "Congratulations, you have successfully upgraded the MacPorts system."; echo ""
endif
@@ -125,31 +123,21 @@ distclean::
rm -f setupenv.bash
rm -f portmgr/dmg/postflight
_gettag:
cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${PKGNAME}-svn
_pkgdist:
[ ! -d ${DISTDIR}/${PKGNAME} ] || rm -rf ${DISTDIR}/${PKGNAME}
cd ${DISTDIR}; svn export ${PKGNAME}-svn ${PKGNAME}
cd ${DISTDIR}; COPY_EXTENDED_ATTRIBUTES_DISABLE=true tar -c ${PKGNAME} | gzip > ${PKGNAME}.tar.gz
cd ${DISTDIR}; COPY_EXTENDED_ATTRIBUTES_DISABLE=true tar -c ${PKGNAME} | bzip2 > ${PKGNAME}.tar.bz2
cd ${DISTDIR}; for tarball in ${PKGNAME}.tar.*; do { \
for type in -md5 -sha1 -ripemd160 -sha256; do { \
openssl dgst $$type $$tarball; \
}; done >> ${DISTNAME}.chk.txt; \
}; done
_dopkg: _gettag _pkgdist
# This target fetches a tagged distribution from svn, and generates tarballs and checksums for it
distfromsvn:
@[ -n "${DISTVER}" ] || { echo Must specify DISTVER, like: make DISTVER=1.4.0 distfromsvn; exit 1; }
[ -d ${DISTDIR} ] || mkdir ${DISTDIR}
dist:
@[ -n "${DISTVER}" ] || { echo "Usage: make dist DISTVER=2.3.4"; exit 1; }
mkdir -p ${DISTDIR}
git archive --format=tar --prefix=${DISTNAME}/ ${DISTTAG} | gzip -cn > ${DISTDIR}/${DISTNAME}.tar.gz
git archive --format=tar --prefix=${DISTNAME}/ ${DISTTAG} | bzip2 -c > ${DISTDIR}/${DISTNAME}.tar.bz2
rm -f ${DISTDIR}/${DISTNAME}.chk.txt
${MAKE} SVNTAG=${DISTTAG}/base/ PKGNAME=${DISTNAME} _dopkg
ifeq ($(ARC),yes)
${MAKE} SVNTAG=${DISTARCTAG} PKGNAME=${DISTARCNAME} _dopkg
endif
cd $(DISTDIR) && for tarball in ${DISTNAME}.tar.{gz,bz2}; do \
for type in -md5 -sha1 -ripemd160 -sha256; do \
openssl dgst $$type $$tarball; \
done >> ${DISTNAME}.chk.txt; \
if [ -n "${DISTGPGID}" ]; then \
gpg --sign --detach-sig --armor --local-user ${DISTGPGID} $$tarball; \
fi; \
done
docs:
@[ -e "${prefix}/bin/doxygen" -a -e "${prefix}/bin/dot" ] \
NEWS
-267
View File
@@ -1,267 +0,0 @@
== Overview of changes from MacPorts 2.0.4 to 2.1.0 ==
# For regular users:
*) New 'rev-upgrade' action that checks for and rebuilds ports that may have
become incorrectly linked when a dependency was upgraded to a new,
binary-incompatible version. This runs automatically after upgrades and
installs by default, and can be turned off or configured to only report
problems in macports.conf.
*) The pkg and mpkg targets will create flat packages on 10.6+.
*) Build-time dependencies will no longer be installed if a prebuilt
archive is available for download (and port is configured to use it).
*) Config file archive_sites.conf can be used to download archives from
custom locations.
*) 'buildfromsource' macports.conf option allows permanently choosing
source-only or binary-only mode.
*) New macports.conf options 'host_blacklist' and 'preferred_hosts', for
controlling which download hosts will be used.
# For Portfile writers:
*) New -W option for reinplace that sets a base directory for all file
arguments.
*) Livecheck can now find multiple regex matches on each line.
*) license_noconflict option can be used to override automatic license
compatibility checks.
*) compiler.whitelist, compiler.blacklist, and compiler.fallback options allow
simpler, detailed control over which compilers are used to build ports.
== Overview of changes from MacPorts 1.9.2 to 2.0.0 ==
# For regular users:
*) Downloaded archives are now checked for integrity using digital signatures.
New pubkeys.conf file allows configuring keys to trust.
*) Actions can be abbreviated to an unambiguous prefix of the full name.
*) Ports that create StartupItems (aka launchd plists) should now be
installable by unprivileged users.
*) Port images are now stored as archives. Archive mode is now effectively
always on. Direct mode and the flat registry format are no longer
available. Conversion will happen automatically.
# For Portfile writers:
*) Multiple ports can now be defined in one Portfile using the 'subport'
procedure.
*) New option 'add_users' can be set to ensure that the listed users are
created at the right times during the install process.
*) SHA256 checksums are now supported.
== Overview of changes from MacPorts 1.8.2 to 1.9.0 ==
# For regular users:
*) All output is now logged to a file, whose location will be shown if a port
target fails. This should be attached to bug reports. The new 'log' action
can also be used to view the log for a port.
*) Command line options can be abbreviated if unambiguous.
*) New actions: rdeps, rdependents, setrequested, unsetrequested
*) --follow-dependencies option for uninstall (ports with the requested flag
set or with other dependents are skipped).
*) New pseudo-ports and selectors: requested, unrequested, leaves, depof:,
rdepof:, dependentof:, rdependentof:.
*) Architectures of dependencies are checked before install, and in many cases
will be automatically fixed by upgrading with +universal.
*) New sqlite registry format which is faster and lacks some of the old
format's inconvenient limitations.
*) Explicitly deselected variants (e.g. -foo) are now recorded, so they will
not be set to + when upgrading if +foo appears in variants.conf or
the port's default_variants.
# For Portfile writers:
*) New os.subplatform variable.
*) New configure.ld_archflags option to match configure.cc_archflags et al.
*) 'platform' acts like an 'if' statement rather than a variant.
*) New supported_archs option for indicating a port only supports certain
archs or is noarch.
*) pre-/post-deactivate and pre-/post-uninstall procedures can now be used,
and pre-/post-activate procedures are run every time the port is activated,
not just the first time when it is installed.
== Overview of changes from MacPorts 1.7.1 to 1.8.0 ==
# For regular users:
*) Compatible with Mac OS X 10.6 Snow Leopard, requires at least 10.4 Tiger
*) CPU architecture to build for is now configurable
*) Performance and memory usage improvements
*) New -y option for dry-run
*) 'port search' has many new options that make it more flexible
*) 'port upgrade' now follows the right dependencies when variants change them
*) 'port info' and 'port variants' indicate selected and default variants;
'port variants' also shows conflicts and dependencies between variants
*) A port can be marked as being replaced by another port; upgrading will
perform the replacement
*) upgrade accepts new options: --force, --enforce-variants, --no-replace
*) Ports can be marked as conflicting, and conflicts will be detected before
the install process starts
*) Proxy information can now be obtained from System Preferences and from
macports.conf
*) Activating a port will now first deactivate any other version of the same
port that is already active
*) MacPorts can be configured to drop root privileges when not needed
*) port(1) will exit with an appropriate status code when an error is
encountered (use -p to continue despite errors)
# For Portfile writers:
*) New options: replaced_by, conflicts, depends_fetch, depends_extract, license
*) build_arch variable indicates which architecture should be targeted. Flags
used to implement this are configured per-compiler, for example,
configure.cc_archflags will be passed to configure.cc in CFLAGS
*) Dependencies can be satisfied by ports that are installed but not
available in the ports tree
*) Deleting all the contents of an option no longer unsets the option entirely
*) Using an alternative fetch or extract type now adds appropriate
dependencies automatically, e.g. 'use_zip yes' adds a dep on unzip, and
'fetch.type svn' adds a dep on subversion
*) Running phases prior to install should now work reliably when the port is
already installed
== Overview of changes from MacPorts 1.6.0 to 1.7.0 ==
# For regular users:
*) The resources directory (containing port group information and the mirror sites) has been moved into the ports tree, so a new MacPorts release is no longer needed to update these items
*) The error message from 'port upgrade outdated' when no ports are outdated is much improved
*) Improvement on handling of MacPorts configuration files (global and user-defined options)
*) Case-insensitive issues have been fixed
*) 'port help' is improved
*) The MacPorts mirror, distfiles.macports.org, is automatically checked when the normal sites fail to respond
*) The search command of port now searches the name, description, and long_description fields
*) Numerous improvements to dependency handling
*) Work around a bug in 10.5's Tcl environment handling
*) Fetching distfiles now tries to ping all mirror sites first in an attempt to pick the best source
*) A new option was added to uninstall: --recursive
*) The output for the port commands info, deps, dependents, and search has been improved
*) Two new options to selfupdate: --pretend and --nosync
*) A platform command has been added to port to display your platform information
*) A suitable message is output when the requested port is not installed when polling its dependents;
*) Fixed the "Error: Unable to open port: invalid command name "ui_prefix"" runtime error on Panther;
*) Fixed the "Error: Unable to open port: invalid command name "ui_channels"" runtime error on Panther;
*) Fixed a MacPorts, Panther specific build failure due to missing sqlite headers on that platform;
*) Fixed a MacPorts build failure when building itself in universal fashion;
# For Portfile writers:
*) ruby port group adds a new parameter to ruby.setup for multiple ruby version support
*) New use_dmg option allows DMG-format distfiles
*) ruby.setup (part of the ruby port group) now takes a fetch type
*) git has been added as a valid fetch.type
*) On Mac OS X, MACOSX_DEPLOYMENT_TARGET is now always set to workaround various issues
*) Several universal-specific variables added to the configure.* group
*) A merge function is now available for easier merging of multiple architectures for universal support
*) Pre-fabricated statements with correct checksums are output when in verbose mode if the existing ones in the Portfile are incorrect;
*) "port lint" now recognizes non-canonical modelines;
*) Added a 'configure.pipe' Portfile option for using pipes rather than intermediate files when compiling C/C++ based ports;
== Overview of changes from MacPorts 1.5.2 to 1.6.0 ==
# For regular usage:
*) Revived and thoroughly refreshed web presence at http://www.macports.org/ , with more improvements still on the way;
*) New project guide at http://guide.macports.org/
*) Fixed the "upgrade" target of the port(1) command to properly handle installed versions beginning with letters;
*) Improved the "variants" target of the port(1) command to behave like the "info" target to poll the requested Portfile directly
rather than the index for more up-to-date information, while also providing a --index flag for legacy behavior;
*) Fixed a bug by which a user-specific 'macports.conf' file would not be read;
*) Tightened security by installing MacPorts in 0755 mode (no write permission for group and others) by default;
*) Added 'none' as a possible option for supported types of startupitems scripts;
*) Disabled readline support in interactive mode of the port(1) command by deafult;
*) Fixed a bug by which the "variants" target of the port(1) command would spit out an error backtrace to the terminal when no match
was found for the requested port;
*) Revamped the "postflight" script that takes care of setting a MacPorts-compatible shell environment after installation from our
"pkg" is complete; it now gracefully handles the addition of PATH, MANPATH and DISPLAY environment variables separately and only
if strictly needed, properly backing up appropriate shell configuration files before proceeding to modify them
(http://guide.macports.org/#installing.binary.postflight.details for more information);
# Individual port-building-related improvements:
*) Eugene Pimenov's GSoC2007 work on improving "trace mode" for the building of ports in clean environments,
http://trac.macports.org/projects/macports/wiki/soc2007/epimenov ;
*) Added 'bsdmake' and 'gnumake' defaults for building ports on the FreeBSD and Linux platforms;
*) Added 'configureccache' and 'configuredistcc' configuration options to the main 'macports.conf' for distributed
builds (defaulting to no);
*) Improved building of configure-based universal ports on Leopard;
*) Fixed a bug by which the 'universal' variant would disappear if a 'macosx' variant was selected;
*) Added a 'macosx_deployment_target' option to the main 'macports.conf' file for ports that benefit from this Mac OS X specific flag;
*) Added a 'configurepipe' option to the main 'macports.conf' file for using pipes rather than intermediate files when compiling C/C++
based ports;
*) Removed LD_PREBIND & LD_PREBIND_ALLOW_OVERLAP variables from MacPorts' environment to prevent prebinding of binaries, which can be harmful
on Tiger and above;
# Packaging-related improvements:
*) Created pkg's no longer have /etc, /var/ or /tmp directories in them;
*) Fixed a bug by which all .mpkg packages were missing their welcome page;
*) Fixed a bug by which HTML contents were written as a pkg's Welcome.rtf file, causing it to not display at all;
*) Made the homepage clickable in a pkg's welcoming screen;
*) Added support for lzma compression for archives;
*) Improved pkg & dmg creation on Leopard, for both Intel and PowerPC platforms;
*) Added an 'mdmg' target, for the creation of a dmg for a port and its dependencies;
*) Dramatically improved performace of the port(1) command's Portfile level actions like "file", "dir", "work" and "url"
# For Portfile writers:
*) Added more compiler suites as options to the 'configure.compiler' Portfile option;
*) Added 'configure.fflags' 'configure.fcflags' 'configure.f90flags' Portfile options for Fortran based ports;
*) Added 'configure.javac' and 'configure.classpath' Portfile options for Java ports;
*) Added 'configure.objc' 'configure.objcflags' Portfile options for Objective-C based ports;
*) Added 'build.nice' and 'build.jobs' Portfile options for parallel builds and build prioritizing;
*) Added 'startupitem.netchange' boolean flag Portfile option for generated startup scripts;
*) Added a "lint" target to the port(1) command, for Portfile verification and beautification;
*) Added Portfile group code for Python 3.0 based ports and deprecated the plain 'python' group code;
*) Added generic GNU livecheck rules;
*) The "x86" platform has been normalized as "i386";
*) Added a 'use_parallel_build' Portfile option for declaring if a particular port can be built in parallel through make's -j flag,
defaulting to no;
*) Added 'configure.awk', 'configure.bison', 'configure.pkg_config', 'configure.pkg_config_path' Portfile options to point to the
relevant programs/paths to use;
*) Added a 'extract.mkdir' Portfile option to better deal with so-called "tar bombs";
# For MacPorts scripting:
*) Moved the 'ui_isset' and 'global_option_isset' Tcl procedures for testing of the UI and global options to the macports1.0 API
sparing its clients from having to implement them;
*) Improved defaults for implicit ui_prefix and ui_channels behaviour at the macports1.0 layer;
# Miscellaneous:
*) Added MacPorts-configure time checks for Mac OS X and Xcode versions and warnings for old versions;
*) Added a 'user-agent' parameters to our libcurl-based fetching of sources for sites that require a user agent;
*) 'livecheck' regular expressions are now checked against each entry in the listed master_site in the Portfile;
*) Fixed regexp in livecheck code to work when there is both a tag and a subdir in the mirror uri;
*) Improved the integrated "daemondo" program to better handle the death of startupitem-based programs;
*) Added a "--restart-wait=n" argument to the integrated "daemondo" program to control the number of seconds to wait during restart of
the process it is monitoring, defaulting to 3;
*) Enabled building of our objc bridge against GNUStep on platforms other than Mac OS X;
*) Added support for packing of MacPorts itself on FreeBSD and Fedora platforms;
*) Added SourceForge.jp to our list of SourceForge-based mirrors for sources fetching;
*) Added http mirror sites for the postgresql mirrors list;
*) Added the ftp://ftp.gnu.org/old-gnu/ mirror to the GNU mirrors list;
*) Fixed a bug by which paths with embedded spaces would cause the "dp2mp-move" upgrade code to fail when trying to find user-specific
'macports.conf' files;
regen.sh → autogen.sh
View File
config/README.TXT
+1 -1
View File
@@ -1,6 +1,6 @@
The file RELEASE_URL in this directory is used by the rsync infrastructure
at the MacPorts server to control the tag from which "released" code is provided,
ultimately at rsync://rsync.macports.org/release/base/.
ultimately at rsync://rsync.macports.org/macports/release/base/.
The script handling that operation checks out from svn the code tagged by the
contents of the RELEASE_URL file and makes that code available via rsync.
config/RELEASE_URL
+1 -1
View File
@@ -1 +1 @@
https://svn.macports.org/repository/macports/tags/release_2_3_3/base
https://github.com/macports/macports-base/tags/v2.3.5
configure
Vendored
+24 -6
View File
@@ -656,6 +656,7 @@ VENDOR_TCL_INSTALL
VENDOR_TCL_SUBDIR
localstatedir_expanded
MPCONFIGDIR_EXPANDED
DARWINTRACE_SIP_WORKAROUND_PATH
prefix_expanded
TRACEMODE_SUPPORT
LDFLAGS_SQLITE3
@@ -8798,7 +8799,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
fi
for ac_header in crt_externs.h err.h fcntl.h libkern/OSAtomic.h limits.h paths.h pwd.h \
for ac_header in crt_externs.h err.h fcntl.h libkern/OSAtomic.h libproc.h limits.h paths.h pwd.h \
readline/history.h readline/readline.h spawn.h sys/cdefs.h sys/event.h sys/fcntl.h sys/file.h \
sys/paths.h sys/socket.h sys/sysctl.h utime.h
do :
@@ -9622,6 +9623,17 @@ fi
eval "prefix_expanded=$prefix"
eval "exec_prefix_expanded=$exec_prefix"
# Define a path where our trace mode workaround for SIP-protected binaries on
# >= 10.11 puts copies
eval DARWINTRACE_SIP_WORKAROUND_PATH="${prefix}/var/macports/sip-workaround"
cat >>confdefs.h <<_ACEOF
#define DARWINTRACE_SIP_WORKAROUND_PATH "$DARWINTRACE_SIP_WORKAROUND_PATH"
_ACEOF
# do this twice, since there is a nested variable of
# ${prefix} inside of ${sysconfdir}
eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
@@ -9636,10 +9648,10 @@ prefix=$oldprefix
exec_prefix=$oldexec_prefix
## Tcl package
tcl_version=8.5.15
tcl_thread_version=2.7.0
tcl_version=8.5.18
tcl_thread_version=2.7.3
tclx_version=8.4.1
tcllib_version=1.15
tcllib_version=1.17
mp_fn_var_prepend() {
eval "$1=\"$2\$$1\""
}
@@ -11806,7 +11818,7 @@ STLIB_LD=${TCL_STLIB_LD}
SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
TCLSH=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
INTREE_TCLSH=${TCL_BIN_DIR}/tclsh
INTREE_TCLSH=`(cd vendor; pwd)`/tclsh
# strip possible whitespace at the end of TCL_PACKAGE_PATH
eval "TCL_PACKAGE_PATH=${TCL_PACKAGE_PATH}"
@@ -11822,6 +11834,7 @@ eval "TCL_PACKAGE_PATH=${TCL_PACKAGE_PATH}"
INCLUDES="-I.. -I. $INCLUDES"
@@ -11842,9 +11855,11 @@ $as_echo "yes" >&6; }
# Output
ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl tests/test/library.tcl tests/test/trace/test.tcl vendor/Makefile"
ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/Makefile doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/dmg/postflight setupenv.bash src/Makefile src/cregistry/Makefile src/darwintracelib1.0/Makefile src/machista1.0/Makefile src/macports1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_test_autoconf.tcl src/mpcommon1.0/Makefile src/package1.0/Makefile src/package1.0/package_test_autoconf.tcl src/pextlib1.0/Makefile src/port/Makefile src/port1.0/Makefile src/port1.0/port_autoconf.tcl src/port1.0/port_test_autoconf.tcl src/programs/Makefile src/registry2.0/Makefile src/registry2.0/registry_autoconf.tcl tests/Makefile tests/test.tcl tests/test/library.tcl tests/test/trace/test.tcl vendor/Makefile"
ac_config_files="$ac_config_files vendor/tclsh"
ac_config_files="$ac_config_files src/dedup_portfiles.tcl"
ac_config_files="$ac_config_files src/images_to_archives.tcl"
@@ -12564,6 +12579,7 @@ do
"src/macports1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/macports1.0/Makefile" ;;
"src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
"src/macports1.0/macports_test_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_test_autoconf.tcl" ;;
"src/mpcommon1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/mpcommon1.0/Makefile" ;;
"src/package1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/package1.0/Makefile" ;;
"src/package1.0/package_test_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/package1.0/package_test_autoconf.tcl" ;;
"src/pextlib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/pextlib1.0/Makefile" ;;
@@ -12579,6 +12595,7 @@ do
"tests/test/library.tcl") CONFIG_FILES="$CONFIG_FILES tests/test/library.tcl" ;;
"tests/test/trace/test.tcl") CONFIG_FILES="$CONFIG_FILES tests/test/trace/test.tcl" ;;
"vendor/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/Makefile" ;;
"vendor/tclsh") CONFIG_FILES="$CONFIG_FILES vendor/tclsh" ;;
"src/dedup_portfiles.tcl") CONFIG_FILES="$CONFIG_FILES src/dedup_portfiles.tcl" ;;
"src/images_to_archives.tcl") CONFIG_FILES="$CONFIG_FILES src/images_to_archives.tcl" ;;
"src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
@@ -13135,6 +13152,7 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;}
case $ac_file$ac_mode in
"vendor/tclsh":F) chmod +x vendor/tclsh ;;
"src/dedup_portfiles.tcl":F) chmod +x src/dedup_portfiles.tcl ;;
"src/images_to_archives.tcl":F) chmod +x src/images_to_archives.tcl ;;
"src/pkg_mkindex.sh":F) chmod +x src/pkg_mkindex.sh ;;
configure.ac
+18 -5
View File
@@ -246,7 +246,7 @@ MP_UNIVERSAL_OPTIONS
AC_HEADER_STDC
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([crt_externs.h err.h fcntl.h libkern/OSAtomic.h limits.h paths.h pwd.h \
AC_CHECK_HEADERS([crt_externs.h err.h fcntl.h libkern/OSAtomic.h libproc.h limits.h paths.h pwd.h \
readline/history.h readline/readline.h spawn.h sys/cdefs.h sys/event.h sys/fcntl.h sys/file.h \
sys/paths.h sys/socket.h sys/sysctl.h utime.h])
@@ -312,6 +312,16 @@ fi
eval "prefix_expanded=$prefix"
eval "exec_prefix_expanded=$exec_prefix"
AC_SUBST(prefix_expanded)
# Define a path where our trace mode workaround for SIP-protected binaries on
# >= 10.11 puts copies
eval DARWINTRACE_SIP_WORKAROUND_PATH="${prefix}/var/macports/sip-workaround"
AC_SUBST(DARWINTRACE_SIP_WORKAROUND_PATH)
AC_DEFINE_UNQUOTED(
[DARWINTRACE_SIP_WORKAROUND_PATH],
["$DARWINTRACE_SIP_WORKAROUND_PATH"],
[Absolute path to a directory used by darwintrace to copy SIP-protected files before executing])
# do this twice, since there is a nested variable of
# ${prefix} inside of ${sysconfdir}
eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
@@ -326,10 +336,10 @@ prefix=$oldprefix
exec_prefix=$oldexec_prefix
## Tcl package
tcl_version=8.5.15
tcl_thread_version=2.7.0
tcl_version=8.5.18
tcl_thread_version=2.7.3
tclx_version=8.4.1
tcllib_version=1.15
tcllib_version=1.17
MP_CONFIG_TARBALL([vendor/tcl${tcl_version}-src.tar.gz], [vendor/tcl${tcl_version}/unix], [--prefix=${macports_libexec_dir} --enable-threads])
VENDOR_TCL_SUBDIR=tcl${tcl_version}/unix
VENDOR_TCL_INSTALL="install-binaries install-libraries"
@@ -389,7 +399,7 @@ STLIB_LD=${TCL_STLIB_LD}
SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
TCLSH=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
INTREE_TCLSH=${TCL_BIN_DIR}/tclsh
INTREE_TCLSH=`(cd vendor; pwd)`/tclsh
# strip possible whitespace at the end of TCL_PACKAGE_PATH
eval "TCL_PACKAGE_PATH=${TCL_PACKAGE_PATH}"
@@ -402,6 +412,7 @@ AC_SUBST(TCL_VERSION)
AC_SUBST(TCL_PACKAGE_PATH)
AC_SUBST(TCL_STUB_LIB_SPEC)
AC_SUBST(TCL_SRC_DIR)
AC_SUBST(TCL_BIN_DIR)
AC_SUBST(TCLSH)
AC_SUBST(INTREE_TCLSH)
@@ -431,6 +442,7 @@ AC_CONFIG_FILES([
src/macports1.0/Makefile
src/macports1.0/macports_autoconf.tcl
src/macports1.0/macports_test_autoconf.tcl
src/mpcommon1.0/Makefile
src/package1.0/Makefile
src/package1.0/package_test_autoconf.tcl
src/pextlib1.0/Makefile
@@ -448,6 +460,7 @@ AC_CONFIG_FILES([
vendor/Makefile
])
AC_CONFIG_FILES([vendor/tclsh], [chmod +x vendor/tclsh])
AC_CONFIG_FILES([src/dedup_portfiles.tcl], [chmod +x src/dedup_portfiles.tcl])
AC_CONFIG_FILES([src/images_to_archives.tcl], [chmod +x src/images_to_archives.tcl])
AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])
doc/Makefile.in
+1 -1
View File
@@ -13,7 +13,7 @@ XSLTPROC= $(wildcard ${prefix}/bin/xsltproc)
DOCBOOK_XSL= $(wildcard ${prefix}/share/xsl/docbook-xsl/manpages/docbook.xsl)
endif
ASCIIDOCFLAGS= -f asciidoc.conf -a manversion=${MACPORTS_VERSION}
ASCIIDOCFLAGS= -f asciidoc.conf -a manversion=${MACPORTS_VERSION} -a revdate="$$(git log -1 --date=short --format=format:%ad -- $< || true)"
XSLTFLAGS= -nonet
MAN1= \
doc/archive_sites.conf
-2
View File
@@ -1,5 +1,3 @@
# $Id$
# MacPorts configuration file for binary archive sources.
# Each source entry consists of one or more fields.
doc/asciidoc.conf
+1 -1
View File
@@ -2,7 +2,7 @@
mansource=MacPorts
#manversion is in the Makefile
manmanual=MacPorts Manual
guideurl=http://guide.macports.org/
guideurl=https://guide.macports.org/
wikiurl=https://trac.macports.org/wiki/
sourceurl=https://trac.macports.org/browser/
doc/base.mtree.in
+2
View File
@@ -23,6 +23,8 @@
..
registry
..
sip-workaround mode=01777
..
software
..
..
doc/macports.conf.5
+4 -3
View File
@@ -1,5 +1,5 @@
'\" t
.TH "MACPORTS\&.CONF" "5" "2014\-08\-03" "MacPorts 2\&.3\&.99" "MacPorts Manual"
.TH "MACPORTS\&.CONF" "5" "2016\-11\-06" "MacPorts 2\&.3\&.99" "MacPorts Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -172,7 +172,8 @@ T}
.PP
portarchivetype
.RS 4
Format of archives in which to store port images\&. This controls both the type of archive cre\- ated locally after building from source, and the type to request from remote servers\&. Changing this will not affect the usability of already installed archives; they can be of any supported type\&.
Format of archives in which to store port images\&. This controls the type of archive created locally after building from source, but not the type to request from remote servers (that is controlled by
\fIarchive_sites\&.conf\fR)\&. Changing this will not affect the usability of already installed archives; they can be of any supported type\&.
.TS
tab(:);
lt lt
@@ -444,7 +445,7 @@ lt lt.
T{
\fBDefault:\fR
T}:T{
release/base/ (which pulls sources for the currently shipping MacPorts release)
macports/release/base/ (which pulls sources for the currently shipping MacPorts release)
T}
.TE
.sp 1
doc/macports.conf.5.txt
+6 -6
View File
@@ -1,7 +1,6 @@
// vim: set et sw=4 ts=8 ft=asciidoc tw=80:
macports.conf(5)
================
$Id$
NAME
----
@@ -74,10 +73,11 @@ buildfromsource::
*Default:*;; ifneeded
portarchivetype::
Format of archives in which to store port images. This controls both the
type of archive cre- ated locally after building from source, and the type
to request from remote servers. Changing this will not affect the usability
of already installed archives; they can be of any supported type.
Format of archives in which to store port images. This controls the
type of archive created locally after building from source, but not the
type to request from remote servers (that is controlled by
'archive_sites.conf'). Changing this will not affect the usability of
already installed archives; they can be of any supported type.
*Supported types:*;; tgz, tar, tbz, tbz2, tlz, txz, xar, zip, cpgz, cpio
*Default:*;; tbz2
@@ -155,7 +155,7 @@ rsync_server::
rsync_dir::
Rsync directory from which to pull MacPorts sources from the rsync server.
*Default:*;; release/base/ (which pulls sources for the currently shipping
*Default:*;; macports/release/base/ (which pulls sources for the currently shipping
MacPorts release)
rsync_options::
doc/macports.conf.in
+1 -3
View File
@@ -1,5 +1,3 @@
# $Id$
# MacPorts system-wide configuration file.
# Commented-out values are defaults unless otherwise noted.
@@ -116,7 +114,7 @@ universal_archs @UNIVERSAL_ARCHS@
# and will be used to verify its integrity. See
# https://trac.macports.org/wiki/Mirrors#MacPortsSource to find the
# correct rsync_dir for a particular rsync_server.
#rsync_dir release/tarballs/base.tar
#rsync_dir macports/release/tarballs/base.tar
# Options to pass to rsync when fetching MacPorts base and the ports tree.
#rsync_options -rtzv --delete-after
doc/port-activate.1
+2 -2
View File
@@ -1,5 +1,5 @@
'\" t
.TH "PORT\-ACTIVATE" "1" "2014\-08\-16" "MacPorts 2\&.3\&.99" "MacPorts Manual"
.TH "PORT\-ACTIVATE" "1" "2016\-11\-06" "MacPorts 2\&.3\&.99" "MacPorts Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -77,5 +77,5 @@ Rainer Mueller <raimue@macports\&.org>
.IP " 1." 4
The MacPorts Guide
.RS 4
\%http://guide.macports.org/#internals.images
\%https://guide.macports.org/#internals.images
.RE

Some files were not shown because too many files have changed in this diff Show More