1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
Commit Graph

1181 Commits

Author SHA1 Message Date
Mathieu Arnold
6f4d50b306 Make sure the merge is done on the latest branch.
Also, make the branch argument optional.

Discussed with:	swills
Sponsored by:	Absolight
2017-01-03 18:33:19 +00:00
Mathieu Arnold
9d7a606915 Use make(1) to extract variables from a Makefile, not grep.
PR:		212486
Submitted by:	mat
Approved by:	crees (maintainer)
Sponsored by:	Absolight
2016-09-08 12:49:02 +00:00
Matthew Seaman
27114e8d9c Fix the '-a' option to ${PORTSDIR}/Tools/scripts/addport
Summary:
Currently addport -a ends up running a command line like:

   make  PORTSDIR="/tmp/ap.BsOuZJBy" clean check-categories

where the temporary directory has only parts of the ports tree
(specifically bits under ${PORTSDIR}/Mk) checked out.  This can't work
as 'make check-categories' needs to see the entire ports tree checked
out.

Instead, run the checks specified by '-a' and '-t' with the value of
$PORTSDIR from the environment.

Reviewers: crees

Reviewed By: crees

Subscribers: mat

Differential Revision: https://reviews.freebsd.org/D7525
2016-08-17 09:14:35 +00:00
Mathieu Arnold
ab87b34d4e Echo where the merge was done, so one can go and have a look.
Sponsored by:	Absolight
2016-08-15 10:01:58 +00:00
Mathieu Arnold
e47d0d2e02 fixup last updates, and try to be better with slave ports.
the case $? needs to have the exit status of the grep, not the awk line,
so remove the awk line, it was not really helpful anyway.

Also, with slave ports, most of the time, they don't have
(PORT|DIST)VERSION,  try to use CATEGORIES, PKGNAMEPREFIX or
PKGNAMESUFFIX.

PR:		211243
Submitted by:	mat
Approved by:	maintainer timeout
Sponsored by:	Absolight
2016-08-03 13:27:47 +00:00
Antoine Brodin
47c247f2d7 MFportsindexbuild:
- build INDEX-12
- remove no longer used scp/ssh
2016-07-17 12:26:00 +00:00
Mathieu Arnold
75a1df13c5 Refactor a bit.
Sponsored by:	Absolight
2016-06-17 14:58:36 +00:00
Sofian Brabez
0789531c19 - Update to last version
Differential Revision:	https://reviews.freebsd.org/D6827
2016-06-13 15:22:32 +00:00
Mathieu Arnold
7fcd63424c Add a script to indent make(1)'s .if/.for blocks.
Sponsored by:	Absolight
2016-06-02 14:13:57 +00:00
Rene Ladan
6544d8b819 Remove a stale comment in Tools/scripts/rmport 2016-05-17 17:53:11 +00:00
Rene Ladan
8e33c1e0fa As a frequent user of the rmport script, it was time for some improvements:
- allow PORTSDIR to be a symbolic link when looking for expired ports or
  dependent ports
- allow for trailing slashes when specifying ports as cat/name. This prevents
  the port being a false positive for itself when the Makefile mentions the
  port name (e.g., in PLIST_FILES)
- fetch possibly open PRs via Bugzilla, GNATS is long gone. Remove the
  version that used freefall. Thanks to crees for pretty-printing the results.
- forcibly delete the temporary checkout to prevent rm(1) from asking for
  confirmation on each file in .svn
- add myself as author

Approved by:	maintainer (crees)
Differential Revision:	https://reviews.freebsd.org/D6396
2016-05-17 17:51:59 +00:00
Antoine Brodin
b7f3384cc4 MFportsindexbuild: build INDEX-9 with fmake 2016-05-01 08:04:32 +00:00
Mathieu Arnold
21bc5c0345 Remove USE_SQLITE from bsd.databases.mk, replaced by USES=sqlite.
While there replace USE_SQLITE=x by USES=sqlite:x.

PR:		208971
Submitted by:	mat
Exp-run by:	antoine
With hat:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D5951
2016-04-25 16:13:38 +00:00
Matthias Andree
1d10e55b18 Revert escaped un-approved commit.
This was not meant to be applied yet, as it is not yet completely developed.
See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192706
2016-04-12 06:31:59 +00:00
Matthias Andree
4b7fc05407 Drop maintainership.
If portmgr@ needs to commit against better advise, two years after this was
first discussed without any motion of the upstream.

Drop a few more maintainerships along the way.
2016-04-12 05:54:17 +00:00
John Marino
4b4fde4cf6 redundant-opt-files script: Fix deleted port output
The last change was flawed; for deleted ports it was writing out the
origin, but it should be writing out the appropriate ports cache
database directory.
2016-03-24 21:33:36 +00:00
John Marino
4a68b19d0e redundant-opt-files script: Handle cache for deleted ports
The redundant-opt-file scripts assumes that if options are cached,
then the port that it was created by still exists.  This, of course, is
a terrible assumption.

If the cached options refer to a port that has since been deleted or
otherwise no longer exists, just print the origin and continue.  The
normal use case is that the origin will be piped to xargs rm -rf which
will purge the obsolete directory as desired.
2016-03-24 20:16:59 +00:00
John Marino
aafd191750 redundant-opt-files.sh script: validate PORTSDIR value
Before checking validity of $db_dir, verify $portdir is valid and eject if
it is not.  This provides a better error message when PORTSDIR is invalid.
2016-03-17 13:18:21 +00:00
Olli Hauer
21b3db57df - add Approved by: line 2016-03-15 16:52:10 +00:00
John Marino
75229eb39f Add new tool script: redundant-opt-files.sh
I got a request to make Synth identify "redundant" cached option files,
where "redundant" means the saved port options are identical to the
default options.  For Synth (and portmaster?) which use the port's
cache options, these redundant files are somewhat of a liability.  At
best they do nothing (Synth assumes default options) and at worst they
will cause a future build to stop if the maintainer changes the port
options later.

This situation is avoidable.  Rather than build detection into Synth,
I decided to write a generic shell script for ports.  When run, it
will display the full path to the port's options directory if the
cached options are the same as the defaults.  This output is suitable
to pipe to "xargs rm -rf" to remove all the redundant options in a
single command.
2016-02-14 09:59:08 +00:00
Erwin Lansing
a97ccb88cb Remove spurious quotation mark.
PR:		205304
Submitted by:	Stig Inge Lea Bjoernsen <stiginge@pvv.org>
Sponsored by:	DK Hostmaster A/S
2015-12-22 13:31:14 +00:00
Mathieu Arnold
d984ba9704 Allow running this with a negative revision number, to backout a commit.
Sponsored by:	Absolight
2015-12-18 15:29:38 +00:00
Ruslan Makhmatkhanov
ea6db28b34 Let addport script to use svnlite if available
1. Check if svnlite is available and use it by default, else: use svn
2. Dehardcode svn binary name in shell calls, to make both svn/svnlite
work

Approved by:	crees (maintainer)
2015-09-25 19:29:48 +00:00
Christian Weisgerber
11982cf73b Default to repo.FreeBSD.org for commits, as urged by our repo meister.
Approved by:	portmgr (mat)
2015-09-20 20:56:59 +00:00
Christian Weisgerber
4399edafd2 Default to repo.FreeBSD.org for commits, as urged by our repo meister.
Approved by:	crees
2015-09-15 15:31:54 +00:00
Mathieu Arnold
1124f4f901 Actually allow only one revision to be merged.
Pointy hat to:	mat
Sponsored by:	Absolight
2015-09-07 12:25:29 +00:00
Mathieu Arnold
628561d9c8 Support merging multiple revisions in one go with mfh.
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3553
2015-09-07 12:23:51 +00:00
Mathieu Arnold
21a283f3be Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336
2015-08-17 14:20:40 +00:00
Erwin Lansing
53695d99c4 Drop building 8.x
Sponsored by:	DK Hostmaster A/S
2015-08-01 09:58:21 +00:00
Emanuel Haupt
6fd5465bd2 Invoke perl with /usr/bin/env 2015-07-09 06:49:28 +00:00
John Marino
23683f5155 Tools/scripts: Add size offenders report generator
This is the script that generated the "20 ports account for X% of the
Ports collection by size" report.  This shells script  is useful to
identify obscenely large ports: top-size-offenders.sh
2015-05-20 16:35:00 +00:00
Alex Kozlov
c9575fbfdc - Remove a few more scripts from Tools/scripts:
chkdepschain.py: doesn't support pkgng
explicit_lib_depends.sh: doesn't support pkgng
plist: obsolete; searches for /etc/mtree/BSD.local.dist, add @dirrm, doesn't know about man pages in the plist
release: unused and obsolete
resolveportsfromlibs.sh: doesn't support pkgng

Approved by:	portmgr (bapt)
2015-04-10 07:05:45 +00:00
Alex Kozlov
4a5d17fd60 - Obsolete and made unusable by changes in the Ports Collection 2015-04-09 04:45:25 +00:00
Rodrigo Osorio
88944e3161 Add getpatch.sh, a shell script only tool to download patch attachments on bug tracking systems 2015-03-30 21:13:12 +00:00
Baptiste Daroussin
fde955558c This scripts is not useful anymore 2015-03-18 20:38:44 +00:00
Bartek Rutkowski
ab6c260d33 Tools/scripts/bump-revision.sh: fix regression introduced in r380431
- Fix regression mistakenly introduced in r380431
- Handle multiple tabs in PORTREVISION
- Handle PORTREVISION being a variable name
- Handle multiple PORTREVISION values
- Get rid of bash-like syntax
- Grammar corrections

PR:		192910
Reviewed by:	danfe, mandree, mat
2015-03-04 23:21:59 +00:00
Bartek Rutkowski
e9b9c710a6 Tools/scripts/bump-revision.sh: various fixes
- Write nicer code replacing fix introduced by mandree
- Catch up some more edge cases

PR:		192910
2015-03-04 12:07:40 +00:00
Pawel Pekala
bff25072b2 Support non default ports path.
PR:		194423
Submitted by:	myself
Approved by:	maintainer timeout (4 months), trivial - just fix it
2015-02-20 16:30:26 +00:00
Mathieu Arnold
16c7163fe6 Don't add ports/ to the PR line.
Sponsored by:	Absolight
2015-01-27 13:38:01 +00:00
Alex Kozlov
76d714945f - Remove vestiges of cvs annotate support 2014-12-07 17:51:12 +00:00
Alex Kozlov
b905046ff4 - Doesn't support Bugzilla bugtracker 2014-11-24 18:50:04 +00:00
Mathieu Arnold
9a22293c2e Make this work with any amount of tabulations between the = and the value of PORTREVISION.
Sponsored by:	Absolight
2014-11-18 16:26:09 +00:00
Mathieu Arnold
f10048320e Fix if PORTREVISION is not already there.
Sponsored by:	Absolight
2014-11-18 16:03:40 +00:00
Baptiste Daroussin
91a1caa242 Reset miwi's maintainership per his demand
Hope to see you back! Thank for all the work!
2014-11-18 09:37:31 +00:00
Matthias Andree
f8f8110e2a Catch and report substitution failure on lines such as PORTREVISION=${SOME_VAR}. 2014-08-22 07:13:51 +00:00
Bryan Drewery
5d24089a65 - Eat excess newline at the end of the commit log. 2014-08-21 18:47:33 +00:00
Matthias Andree
b58318d59c Add a BerkeleyDB upgrade helper script in preparation of 4...4.7 removal. 2014-08-21 15:56:14 +00:00
Sofian Brabez
ffad0a1b50 - Better handling when custom encoding is specified in details
- Use only one request to retreive patchs

CR:	D400
CR:	D401
Submitted by:	rakuco
2014-07-23 12:14:32 +00:00
Bartek Rutkowski
43baa4d6be New script: Tools/scripts/bump-revision.sh
This script, requested by bapt@, is a pure sh tool to increase one
or more ports PORTREVISION value or to add one, if the port havent
had one already.

Approved by:	swills (mentor), bapt
2014-06-26 17:15:39 +00:00
Matthias Andree
dd683e1c3a ports/Tools/scripts/mfh revision:
- use proper quoting
- use fewer svn invocations
- optionally drop to a shell before committing,
  to manually fix up a botched merge.
- svnserver can be overridden in the environment.
- Finally, we use sh's trap builtin to make sure we always clean up.

PR:		186256
Approved by:	portmgr (bapt@)
2014-06-25 19:04:31 +00:00