Commit Graph

5741 Commits

Author SHA1 Message Date
Joshua Root 2ad669ef90 merge https://trac.macports.org/changeset/112529 from trunk:
2.2.1 release date

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112530 d073be05-634f-4543-b044-5fe20cf6d1d6
v2.2.1
2013-10-25 13:12:01 +00:00
Joshua Root 806642f83f bump branch version to 2.2.1
git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112528 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-25 13:09:24 +00:00
Joshua Root d6350be683 merge https://trac.macports.org/changeset/108045, https://trac.macports.org/changeset/109246, https://trac.macports.org/changeset/109894, https://trac.macports.org/changeset/112483 from trunk:
update ChangeLog

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112486 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-24 13:20:06 +00:00
Clemens Lang 171c652f13 release_2_2: revert https://trac.macports.org/changeset/112424 fixing https://trac.macports.org/ticket/40150 due to a number of issues with the change to be fixed on trunk
git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112461 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-23 21:27:22 +00:00
Clemens Lang 946fb71c14 Merge https://trac.macports.org/changeset/109649 from trunk to fix https://trac.macports.org/ticket/40150 in 2.2.1
git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112424 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 18:13:58 +00:00
Joshua Root e2c0f9502f merge https://trac.macports.org/changeset/112067 from trunk:
in mportdepends, skip mport refs that have been closed by a recursive call (https://trac.macports.org/ticket/40721)

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112421 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 13:37:57 +00:00
Joshua Root dc6c60c267 merge https://trac.macports.org/changeset/111641 from trunk:
silliness--

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112420 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 13:32:52 +00:00
Joshua Root 2cab04f177 merge https://trac.macports.org/changeset/111377 from trunk:
fix warnings

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112419 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 13:29:42 +00:00
Joshua Root 5285f13611 merge https://trac.macports.org/changeset/111254 from trunk:
-Wused-but-marked-unused

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112418 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 13:23:02 +00:00
Joshua Root 3d4fd9505c merge https://trac.macports.org/changeset/110985 from trunk:
fix overlap check aborts

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@112417 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-10-22 13:21:29 +00:00
Lawrence Velázquez 0fc9d3e4c1 Merge https://trac.macports.org/changeset/108037, https://trac.macports.org/changeset/108039, https://trac.macports.org/changeset/108040 from trunk, supporting
"macports-dragonegg-X.Y-gcc-A.B" compiler values.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@109893 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-08-21 14:37:40 +00:00
Lawrence Velázquez 7e09322a68 Merge https://trac.macports.org/changeset/107973, https://trac.macports.org/changeset/107976, https://trac.macports.org/changeset/107987, https://trac.macports.org/changeset/109026 from trunk, adding
configure.universal_objcflags, configure.objcxx, configure.objcxxflags,
and configure.universal_objcxxflags options.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@109892 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-08-21 14:31:06 +00:00
Joshua Root 9753a9b883 merge https://trac.macports.org/changeset/109869 from trunk:
fix dir in fetch_port

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@109870 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-08-21 02:21:55 +00:00
Clemens Lang d2a0e24256 Cherry-pick https://trac.macports.org/changeset/106810 from trunk: startupitem.autostart support for the certsync port (https://trac.macports.org/ticket/35474)
git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@109245 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-08-11 11:51:15 +00:00
Joshua Root f5ea1dd9ee merge https://trac.macports.org/changeset/108406 from trunk:
2.2.0 release date

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@108407 d073be05-634f-4543-b044-5fe20cf6d1d6
v2.2.0
2013-07-23 00:04:40 +00:00
Lawrence Velázquez 9b45e59c3a Merge base/doc/macports.conf.in from trunk, undoing prior merge https://trac.macports.org/changeset/108009:
- https://trac.macports.org/changeset/108041: macports.conf.in: Revert https://trac.macports.org/log/?revs=108004-108005, removing mention of delete_la_files.

See https://lists.macosforge.org/pipermail/macports-dev/2013-July/023287.html.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@108047 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-11 06:19:13 +00:00
Lawrence Velázquez 15003cbe88 Merge https://trac.macports.org/changeset/108011 from trunk:
archive_sites.conf, macports.conf.in: Adjust whitespace.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@108012 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-10 19:22:33 +00:00
Lawrence Velázquez 09b3254844 Merge documentation of delete_la_files from trunk.
- https://trac.macports.org/changeset/108004: macports.conf.in: Document delete_la_files.
- https://trac.macports.org/changeset/108005: macports.conf.in: Clarify purpose of delete_la_files.
- https://trac.macports.org/changeset/108007: ChangeLog: Note changesets adding delete_la_files.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@108009 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-10 19:02:54 +00:00
Joshua Root f7397e5423 bump branch version to 2.2.0
git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107884 d073be05-634f-4543-b044-5fe20cf6d1d6
v2.2.0-rc1
2013-07-08 12:36:09 +00:00
Lawrence Velázquez d46ee32afa Merge base/doc from trunk.
- https://trac.macports.org/changeset/107129: archive_sites.conf: Restore suggestion for disabling default
  archive source.
- https://trac.macports.org/changeset/107860: macports.conf.in: Fix typo.

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107861 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-07 21:00:00 +00:00
Joshua Root 61ecaa31c4 merge https://trac.macports.org/changeset/107753 from trunk:
Fallback on macports-clang-3.3 rather than macports-clang-3.2

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107774 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-05 16:39:03 +00:00
Joshua Root eab1f24451 merge https://trac.macports.org/changeset/107674 from trunk:
temporary workaround for pkg target failure on 10.8: disable sandboxing for that target

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107678 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-04 07:22:12 +00:00
Joshua Root a3c9fbd963 merge https://trac.macports.org/changeset/107527 from trunk:
Default to delete_la_files being on for Mavericks, this will require rebuilding on Mavericks

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107677 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-04 06:54:28 +00:00
Joshua Root dc63ac0476 merge https://trac.macports.org/changeset/107106 from trunk:
exclude sites with no urls from return value of portarchivefetch::filter_sites (https://trac.macports.org/ticket/39455)

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107675 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-04 06:46:23 +00:00
Joshua Root 97676bef61 merge https://trac.macports.org/changeset/107465 from trunk:
Make delete_la_files an option for macports.conf

git-svn-id: https://svn.macports.org/repository/macports/branches/release_2_2/base@107491 d073be05-634f-4543-b044-5fe20cf6d1d6
2013-07-01 15:00:40 +00:00