Commit graph

211 commits

Author SHA1 Message Date
Bryan Drewery
ad40b192bb Update to 3.17.8.
Changes:
  - Fixes handling of PORTSDIR when /usr/ports is a symlink after head
    r272363 and stable/10 r287334.

Reported by:	dhw
2015-09-03 17:13:54 +00:00
Adam Weinberger
0f89153b96 Use OPTIONS helpers, add a newline to quiet a half dozen portlint
fatal messages, and make the installation commands more consistent.
2015-08-20 18:52:02 +00:00
Bryan Drewery
8b25d0a634 I'm really not working on this. Please direct questions to ports@FreeBSD.org.
If someone else would like to maintain this please discuss with me and I will
get you access to the github account where the code lives.
2015-04-09 15:20:31 +00:00
Bryan Drewery
37a1520519 For the new USE_GITHUB with only GH_TAGNAME set default DISTNAME to
include GH_PROJECT/GH_ACCOUNT/GH_TAGNAME. This prevents the distfile
having the same name despite changing one of these values and causing
a bad checksum.

Differential Revision:	https://reviews.freebsd.org/D2103
Reviewed by:	mat
With hat:	bdrewery
2015-03-20 20:07:50 +00:00
Bryan Drewery
511fe251f8 Convert my ports to the new USE_GITHUB 2015-03-20 01:42:36 +00:00
Bryan Drewery
5b5a90256d Update USE_GITHUB so it does not require GH_COMMIT.
Using this new scheme allows only setting the _tag_ or _commit hash_ in
GH_TAGNAME and not having to know the hash for a tag.  This scheme will
download a tarball that has a different checksum than before due to a changed
directory name for extraction.

The following MASTER_SITES are provided to retain the old checksum and
directory structure (that require GH_COMMIT):
  GH -> GHL
  GITHUB -> GITHUB_LEGACY

Differential Revision:	https://reviews.freebsd.org/D748
Submitted by:	amdmi3
Reviewed by:	mat, swills, antoine, bdrewery
With hat:	portmgr
2015-03-19 16:44:57 +00:00
Baptiste Daroussin
c73851221a cleanup plist 2014-12-20 19:30:54 +00:00
Bryan Drewery
1fdb4ed0a7 - Update to 3.17.7
Changes:
  * Use PM_SU_CMD for pkg set -o
2014-08-27 16:33:21 +00:00
Bryan Drewery
7b879fa85a - Update to 3.17.6
Changes:
  * Speedup --list-origins with pkg
  * Use proper /usr/local/etc/portmaster.rc path in portmaster.8
  * Fix running from deleted dirs.
  * Fix losing control of building run-depends of staged ports
    (thus breaking -g and counts). [1]

PR:		189398 [1]
2014-06-19 00:36:18 +00:00
Bryan Drewery
a8b719b6ab - Update to 3.17.5
Changes:
  * Fix some issues with killing child processes
  * Use builtin kill(1)
2014-05-24 19:04:30 +00:00
Bryan Drewery
0d3e691cd0 - Update to 3.17.4
Changes:
  - Fix --check-depends with pkg [1]
  - Allow installing DEPRECATED ports

PR:		ports/186915 [1]
Submitted by:	kaltheat <kaltheat@gmail.com> [1] (based on)
2014-03-15 18:29:41 +00:00
Bryan Drewery
11e80ffd08 - Update to 3.17.3
Changes:
 * Fix with pkg-devel which has broken pkg-info -O compatibility
2013-11-19 15:05:20 +00:00
Bryan Drewery
da8811d66a - Support STAGEDIR 2013-09-23 11:23:47 +00:00
Bryan Drewery
2324655f20 - Add NO_STAGE until validated to be safe for upcoming staging support 2013-09-20 15:58:09 +00:00
Bryan Drewery
e4ce57f02e - Update to 3.17.2
Changes:
 - Fix detection of pkg-devel

PR:		ports/181813 [1]
Reported by:	Takanori Saneto <sanewo@ba2.so-net.ne.jp> [1], eadler
2013-09-14 12:32:14 +00:00
Bryan Drewery
0c28ddccc8 - Update to 3.17.1
Changes:
  * Fix --check-port-dbdir support after ports r321785 changed
    to /var/db/ports/category_port (OPTIONS_NAME) instead of
    UNIQUENAME [1]

Reported by:	many
2013-07-22 00:41:45 +00:00
Bryan Drewery
dc8f131329 - Update to 3.17
Changes:
  - Fix completion scripts when ports are not checked out.

PR:		ports/179098
Reported by:	Doug Barton <dougb@dougbarton.us>
2013-06-22 16:38:09 +00:00
Bryan Drewery
f579b30bcd - Remove temporary WRKSRC hack
- Rename distfile and fix checksum errors. These errors
  were due to renaming the upstream account, which changed
  which directory the distfile untarred in.
- Shuffle MASTER_SITES so that FreeBSD.org and other more
  reliable mirrors come before github
2013-06-08 11:28:13 +00:00
Bryan Drewery
4484e1151b - Fix build with temporary fix
Reported by:	John Ko <john@johnko.ca>
2013-06-04 01:47:18 +00:00
Bryan Drewery
830c8be52b Update MASTER_SITE to github.com/freebsd 2013-06-03 10:49:41 +00:00
Bryan Drewery
ab2198cf03 - Update to 3.16
This fixes a regression with non-pkgng usage that would invoke
the bootstrapper when upgrading ports. My testing did not
cover systems with the bootstrapper that did not use pkgng, so
this was missed.

The impact of this was just a hung build during deinstall.

Reported by:	mandree
Pointyhat to:	bdrewery
2013-03-29 23:48:02 +00:00
Bryan Drewery
8dd2f7091d Mark BROKEN as I fix a reported regression 2013-03-29 23:31:25 +00:00
Bryan Drewery
3b9dc59b3f - Update to 3.15
- Add extra mirror
- Remove PKGNGPATCH option

Changes:
  - The pkgng patch has been fully integrated upstream with its
    history copied from the pkgng repo over to portmaster's repo
  - Add extra messages before/after killing background processes so
    that 'Terminated' messages look less unexpected
  - Fix running from / trying to build the entire tree
  - pkgng: Fix -s not respecting the automatic flag
  - Fix "Argument list too long" errors
  - Add PM_SU_CMD documentation to the sample config file [1]
  - Fix -o not showing the specified origin [pkgng patch bug]

Submitted by: Oleg Pudeyev <oleg@bsdpower.com> [1]
2013-03-29 20:43:54 +00:00
Bryan Drewery
282a9890b6 Remove standard descriptions for BASH/ZSH
Suggested by:	danfe
2013-03-23 11:21:50 +00:00
Bryan Drewery
d8d3b88b2b - Enable pkgng support by default. This is safe for
non-pkgng users as well.
2013-03-23 02:07:26 +00:00
Bryan Drewery
8d9524b3b8 - Remove use of bsd.port.pre.mk
- Reword pkg-message to try to be more clear
2013-03-14 22:11:47 +00:00
Eitan Adler
cc483cb5b0 Make it clear that pkgng is optional
Submitted by:	wblock
Approved by:	bdrewery (maintainer)
2013-02-06 02:35:29 +00:00
Alex Kozlov
05a9235c98 - Fix all cases of 'No newline at end of file' in ports tree
Approved by: portmgr (bapt)
2013-02-01 15:04:00 +00:00
Bryan Drewery
39224de87d - Don't force pkg as a RUN_DEPENDS. The patch should be
safe for non-pkgng usage.
  I am in the process of testing this and will be fully
  integrating the patch upstream soon.
2013-01-25 19:30:25 +00:00
Bryan Drewery
8416505cff - Add upstream patch for fixing bash completions with PKGNG
and to respect env PORTSDIR/PKG_DBDIR

Feature safe:	yes
2012-12-06 17:46:10 +00:00
Bryan Drewery
4522cd5f2f - Fix PKGNG patch trying to call pkg(8) when not
actually using pkgng due to improper short-circuit
  logic

Submitted by:	John Hein <jhein@symmetricom.com>
Feature safe:	yes
2012-10-29 19:06:13 +00:00
Bryan Drewery
fc79661a53 - Update ZSH completions to work on CURRENT with pkgng [1]
- Don't depend on ports-mgmt/pkg on 7.x with PKGNGPATCH option

Submitted by:	ume [1]
Feature safe:	yes
2012-10-20 19:26:34 +00:00
Bryan Drewery
2e25939099 - Fix WITH_PKGNG detection on CURRENT, as it may
not be defined in /etc/make.conf.

Submitted by:	dim
Feature safe:	yes
2012-10-18 16:02:29 +00:00
Bryan Drewery
138760a2b8 - Update ZSH completions with pkgng support [1]
- Enable the PKGNG patch by default if WITH_PKGNG
  is defined.

Submitted by:	ume [1]
Feature safe:	yes
2012-10-16 03:00:00 +00:00
Bryan Drewery
395142568b - Add ports-mgmt/pkg as a RUN_DEPENDS if enabling pkgng support
- Add UPDATING entry and pkg-message to assist in converting

Feature safe:	yes
2012-10-15 16:14:35 +00:00
Bryan Drewery
c3b5b180ed - Rename PKGNG option to PKGNGPATCH to fix
this port confusing bsd.pkgng.mk into thinking
  that WITH_PKGNG is defined and pkg(8) shoul be
  used to register.

Pointyhat to:	bdrewery
Feature safe:	yes
2012-10-15 15:50:21 +00:00
Bryan Drewery
300c0a9c56 - Add backup non-https mirror
- Add PKGNG option to apply pkgng support patch. This will
  be fully integrated upstream in the next version. This
  functionality is only enabled when WITH_PKGNG is defined
  in make.conf (or a recent CURRENT by default, see
  UPDATING 20121010). Due to the compat OPTION handling,
  defining WITH_PKGNG will also apply the patch by default.
  The pkgng patch is contributed by avilla@

Feature safe:	yes
2012-10-15 06:10:44 +00:00
Bryan Drewery
7821cd7798 - Move to new home, http://github.com/portmaster
- Take maintainership
- Convert to new options framework
- Use USE_GITHUB for fetching
- Add DISTNAME to avoid conflict with existing distfile as
  the checksum of the distfile has changed now that it is
  no longer modified for release.
- Remove use of bsd.port.pre.mk
2012-10-10 13:03:04 +00:00
Carlo Strub
5630f5f09c Add a temporary mirror 2012-10-08 11:22:10 +00:00
Doug Barton
deda664425 Throw my ports back in the pool, and make my intentions clear for the
various ports that I've created.

I bid fond fare well
A chapter closes for me
What opens for you?
2012-10-08 10:38:47 +00:00
Doug Barton
6e5b73e7b1 Fix the problem of background fetches hanging forever when the background
process to read the distinfo files encounters a fatal error.
2012-10-01 08:40:16 +00:00
Doug Barton
22aca7c98c Update to 3.13.13:
Minor improvements:
===================
* Improve messages for processing of dependent ports when -r
* If there is an installed version, always print that message, not just
  when we're in the parent
* Optimize determination of $new_port:
 - When first set, let it be global
 - Use a function to incorporate/optimize the various tests from the
   2 different places that it was being set
* Use a more robust method of determining portdir from $PWD. This also
  works for bare 'portmaster' with no arguments now, if you're in a port
  directory.
* Various additional code cleanups

Bug fix:
========
Do read_distinfos() in the background for multiport() too, oops
2012-07-24 20:48:17 +00:00
Doug Barton
323e0ff2eb Update to version 3.13.1
Minor fixes/improvements
========================
* Turns out there are a non-zero number of distinfo files that have SIZE
  listed first, so in the code that parses them for the data to put into
  /var/db/pkg/$port/distfiles, handle this situation gracefully.

* If we trap while working on a child port do not remove that child from
  the PM_NEEDS_UPDATE list so that when it gets printed in the parent
  that child is still on the list.

* Use the count of total ports as $num_of_deps for -Faf

* For -av, add num_{roots|trunks|branches|leaves} values to the headers

* In multiport(), decrement the number of ports to work on and print a -v
  message if we have already seen a port in the worklist as a dependency
  of another port in the list.

* Many other minor code cleanups

Performance enhancement
=======================
* In read_distinfos*() use while read instead of grep. Avoids the fork
  and reduces the total time for building the list(s) of distfiles by 25%
2012-07-17 07:38:27 +00:00
Doug Barton
f428599ca5 Upgrade to version 3.13
Major updates/fixes to the distfile handling code
=================================================
* Make all parts of the code SUBDIR-safe (most were already)
  - Fix a few places where the relativity of the cwd was not respected,
    most often resulting in files not being deleted that should be
* Move the storage of the distfile info back to /var/db/pkg where it
  should have been all along. Mostly for correctness, but also to deal
  with the problem of non-UNIQUENAMEs causing the wrong files to be
  deleted with -d.
* Clean up the old /var/db/ports/*/distfiles files after reading them,
  and delete the directory if it's empty. Since we are doing this
  unconditionally now, there is no longer a need for delete_dist_list().
  The new ones will live and die with the rest of the package directory.
* Update some of the messages printed out for distfile-related things
  to make it more clear what's going on.
* Check DI_FILES to see if the distfile could be valid for another port
  in more places, so add a function to deal with the common ones.
* When checking DI_FILES, anchor the grep pattern with a ^ to
  avoid false positives

Other code changes
==================
* Make the whitespace more consistent
* Various minor improvements, mostly to avoid unnecessary forking

UI Change
=========
* When using -i and there is an +IGNOREME file, the default should be no
2012-07-07 12:16:20 +00:00
Doug Barton
b3b3c80e67 Minor improvements
==================
* Restore the line from -av that prints each port as we work on it.
* Print more useful information about ports that don't have distfiles,
  or distfiles we're skipping due to duplicates when -F (especially
  with -a).

Bug fixes
=========
* Consolidate all writing to the IPC_SAVE file into safe_exit()
  so that it always gets called. Also, zero out the file after
  reading it so that a parent process doesn't inadvertently
  read stale data during a trap (unlikely, but not impossible).
2012-06-26 01:51:19 +00:00
Doug Barton
f18b7d0bbb Upgrade to 3.12.1, removes pgrep since it's not safe to use on older
versions of FreeBSD
2012-06-15 06:10:18 +00:00
Doug Barton
7fb2b1acb3 New Features
============
Print the same progress update that goes to the term title in-line,
and apply various improvements to that code.

Move 'make clean' to the background. There is no point waiting around
for it to finish. In the case of very large work directories this may
cause some I/O contention during the unpacking of the next port to
build, but in most cases this should be lost in the noise.

Other Improvements
==================
Speed up the determination of WRKDIRPREFIX, and do not bother looking
for empty directories if we exited abnormally.

Add code to detect dependency loops created by moving part of a port
into another port, and CONFLICT'ing on previous versions of that port
(ala textproc/p5-XML-SAX -> p5-XML-SAX-Base). When a loop is detected
suggest that the user try pkg_updating.

Bug Fixes
=========
Improve error handling for mktemp

Improve handling of abnormal exits (such as ^C, failed port, etc.),
especially when the first exit happens in a child process.

If the second argument to -o is something that is completely non-existent,
report in the error message what the user typed on the command line.
Reported by:	avilla

In clean_build_only_list() remove ports that are already installed
when using --delete-build-only to prevent them from being spuriously
removed.
Reported by:	avilla
2012-06-13 11:39:23 +00:00
Doug Barton
d8dcc077e7 Fix plist for bash completion file. Bump PORTREVISION for it as well.
Submitted by:	sunpoet
2012-01-24 09:46:18 +00:00
Doug Barton
7d6ad43b14 Move the Bash completion file to ${PREFIX}/etc/bash_completion.d
Bump PORTREVISION for the WITH_BASH case

While here, remove the license info
2012-01-20 10:19:00 +00:00
Doug Barton
3e80fc4345 New Features
============
1. Add a feature to allow users to list files that should be
   preserved across upgrades.

Various Improvements
====================
1. Add a verbose message for cleaning WRKDIRPREFIX

2. Improve the handling of the -F option with packages, especially with
   --packages-only:

 * In update_port() do better at saying what we're launching a child to do
 * In post_first_pass() make clear that we are fetch'ing, not building,
   installing, etc.
 * In multiport() call check_fetch_only when we're done
 * In the main body add fetch'ed ports to the CUR_DEPS list so that they
   are only fetched once.

3. Various typo fixes for the man page.

Bug Fixes
=========
1. If an update fails in a child port the parent needs to source the
   $IPC_SAVE file before it bails out to make sure that various lists are
   updated in the parent.  This is particularly important for the list(s)
   of work already completed, and especially to update PM_NEEDS_UPDATE for
   the message of how to resume from the point of failure.

2. For multiple -r, don't add a port to the list of dependents to rebuild
   if it was itself specified as a -r port.

3. In parent_exit() run the code to kill background processes if we're
   called with a non-zero exit code.  That will trigger it (for example)
   where the user answers no to the confirmation prompt and is either
   using -D, or the generation of the list of valid distfiles did not
   complete.

4. Until I can revamp the way dependencies are tracked, include all 3
   forms of CONFLICTS to make sure we catch alternates.
2011-12-13 07:47:21 +00:00