Commit Graph

1212 Commits

Author SHA1 Message Date
Rene Ladan
88f198beed rmport: usability fixes:
- only write the message to edit the log once
- show the log itself instead of the temporary filename
2018-09-16 09:20:37 +00:00
Rene Ladan
00c81ca48c Tools/scrips/rmport: improve usability
- if svn is not found, look for svnlite
- improve workflow of removing ports

Submitted by:	blackend via email
Approved by:	maintainer (crees)
2018-09-02 11:30:20 +00:00
Gerald Pfeifer
4623a87843 Use 'make -C' instead of saving the current working directory and then
restoring that in the new code to add a safety belt that came in via
revision 477561.  This is quite a bit simpler and shorter.

Reported by:	adamw
PR:		226926
2018-08-20 00:39:32 +00:00
Gerald Pfeifer
8c7bf827a6 Add a stronger safety belt to this script by comparing the actual
PORTREVISION (using the Ports Collection framework, not just looking at
one Makefile individually at a time) before and after the bump.  If the
version after the bump isn't actually increased, flag that as an error.

As an example, before revision r464215 (cf. bug #226533) this script
would have wreaked wreak havoc on the multimedia/avidemux* ports.
This hardly can be blamed on bump-revision.sh, but with the additional
safety belt it does now detect such cases.

How to reproduce:

  % cd $PORTSDIR
  % svn up -r 464036 multimedia/
  % Tools/scripts/bump-revision.sh multimedia/avidemux*

With this patch we print:

  INFO: multimedia/avidemux PORTREVISION=	9 found, bumping it by 1.
  INFO: multimedia/avidemux-cli PORTREVISION not found, adding PORTREVISION= 1
  ERROR: multimedia/avidemux-cli PORTREVISION went backwards from 5 to 1!
  INFO: multimedia/avidemux-plugins PORTREVISION not found, adding PORTREVISION= 1
  ERROR: multimedia/avidemux-plugins PORTREVISION went backwards from 5 to 1!
  INFO: multimedia/avidemux-qt4 PORTREVISION not found, adding PORTREVISION= 1
  ERROR: multimedia/avidemux-qt4 PORTREVISION went backwards from 5 to 1!

The beauty of this approach is that it goes beyond a simple text search,
and leverages what the ports framework itself does.

PR:		226926, 226533
Approved by:	maintainer timeout (20+ weeks)
Reviewed by:	mandree, riggs
2018-08-19 09:17:56 +00:00
Eugene Grosbein
dfa53b2308 rmport: provide default for EDITOR varialble to prevent
an error "svnlog: not found" when EDITOR is undefined.

Reported by:	Matthias Fechner <idefix@fechner.net>
Approved by:	portmgr (crees)
2018-08-04 16:29:31 +00:00
Mathieu Arnold
5b4fcd0676 Also report the previous line when going backwards in time.
This is because half of the time, the previous line is the one that is
wrong, so you get redirected to line X, where X-1 has the error, and you
wonder because line X looks just fine.

Sponsored by:	Absolight
2018-07-02 16:19:50 +00:00
Mathieu Arnold
8543f37ef5 Remove an extra dot messing up copy and paste.
Sponsored by:	Absolight
2018-06-14 15:55:24 +00:00
Rene Ladan
376faa4991 Return Tools/scripts/portsvar.sh to the pool. 2018-06-01 20:25:45 +00:00
Eitan Adler
eac1d5f88c Tools: add LEGALlint
This checks 'LEGAL' for common errors, It is inspired by MOVEDLint.
2018-05-27 05:02:06 +00:00
Sofian Brabez
8c7b5028b3 - Do not download obsolete attachments
Submitted by:		gonzo
Approved by:		myself
Differential Revision:	https://reviews.freebsd.org/D14550
2018-05-21 18:57:34 +00:00
Rene Ladan
affecc3c06 Detect flavored dependencies in Tools/scripts/rmport and add myself to the copyright. 2018-03-26 16:55:52 +00:00
Bryan Drewery
d7b83ead05 Show errors for duplicate source entries. 2018-01-25 20:56:18 +00:00
Mathieu Arnold
fb30d2bf17 Run Tools/scripts/mfh through devel/hs-ShellCheck.
SC2068: Double quote array expansions to avoid re-splitting elements.
SC2034: revs appears unused. Verify it or export it.
SC2039: In POSIX sh, XXX is undefined.
    type     -> command -v
    echo -n  -> printf
    read -p  -> printf + read

SC2162: read without -r will mangle backslashes.
SC2086: Double quote to prevent globbing and word splitting.

Sponsored by:	Absolight
2018-01-23 15:53:56 +00:00
Mathieu Arnold
033977e70f Follow up on last commit and actually allow editing
the commit message again.

PR:		224634
Reported by:	yuri
Sponsored by:	Absolight
2017-12-29 13:20:47 +00:00
Mathieu Arnold
30c4ca5784 Generic FLAVORS work.
- Enable FLAVORS.
- Make make describe flavors aware.
- Add a qa check for unique package names amongst flavors.
- Make MOVEDlint understand flavors.
- Add a bit of sanity check to make sure FLAVORS stay lowercase.
- Various fixes.

Reviewed by:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D12577
2017-11-30 15:33:29 +00:00
Mathieu Arnold
c77bdeb9c9 Commit the actual patch I tested
Sponsored by:	Absolight
2017-11-10 12:01:33 +00:00
Mathieu Arnold
4bcdfb8685 Cleanup resurrected processing.
There is no need to have a resurrected array, it is only used once, so
move the resurrected printf where it belongs.

Sponsored by:	Absolight
2017-11-10 11:59:28 +00:00
Mathieu Arnold
0f100e6d8d Don't blame the person that removed a resurrected.
Sponsored by:	Absolight
2017-11-10 11:59:25 +00:00
Mathieu Arnold
6dbe1c10eb Add braces around all if/else.
Sponsored by:	Absolight
2017-11-10 11:59:17 +00:00
Mathieu Arnold
48fc012063 Re-enable blame (was annotate) with svn and git support.
ak@ asked that I remove the unused error array, and I went to have a
look at what it was actually used for back in the day.  It seemed better
to re-enable the blame feature instead of removing it.

Sponsored by:	Absolight
2017-10-30 13:56:49 +00:00
Mathieu Arnold
47ceacdd9d The final sort was missing from some places.
Sponsored by:	Absolight
2017-10-30 11:23:17 +00:00
Mathieu Arnold
dba0d85150 Do not add $FreeBSD$ to the patch files.
Sponsored by:	Absolight
2017-08-23 13:59:41 +00:00
Bryan Drewery
51eb8c5226 Fix resurrected ports not being warned about if they have a new dest entry.
This now warns about these 2 ports as needing to be marked as resurrected:

    archivers/brotli|archivers/py-brotli|2016-11-24|Brotli is a python module
    devel/libbrotli|archivers/brotli|2017-07-12|meta project no longer required to build libs

    www/rubygem-jquery-rails||2017-01-07|Has expired: Depends on deprecated www/rubygem-railties
    www/rubygem-jquery-rails4|www/rubygem-jquery-rails|2017-03-27|Remove PKGNAMESUFFIX
2017-08-07 17:32:31 +00:00
Bryan Drewery
5bb2bd091b Allow editing commit message on failure and save it somewhere if declined.
With hat:       portmgr
2017-06-12 17:31:56 +00:00
Mathieu Arnold
2249c20332 Fix some FreeBSD.org case of bad case.
Sponsored by:	Absolight
2017-05-04 14:58:54 +00:00
Adam Weinberger
bde099625e Add some usage instructions to the top of the mfh script. In particular,
note that multiple revisions should appear chronologically.
2017-05-01 01:06:15 +00:00
Larry Rosenman
62de852b7f Update Tools/scripts/rmport to ignore commented out EXPIRATION_DATE lines
Reviewed by: 	crees (maintainer)
Approved by:	rene (portmgr, mentor), adamw (portmgr, mentor), crees (maintainer)
Differential Revision:	https://reviews.freebsd.org/D10548
2017-04-30 17:45:31 +00:00
Emanuel Haupt
f361fdd649 Fix shebang. If /usr/bin/env is used the -w flag can't be passed after perl.
Use 'use warnings;' instead.

While here remove distinfochecker. It's not needed anymore as it was written
for a simple purpose eleven years ago.
2017-04-24 17:27:58 +00:00
Rene Ladan
4697095586 Reset pgollucci@ as maintainer after 19 months of inactivity
With hat:	portmgr-secretary
2017-03-29 20:33:05 +00:00
Rene Ladan
4d57cc4370 Set maintainer of these scripts to portmgr as the previous maintainers retired. 2017-02-12 20:43:04 +00:00
Tijl Coosemans
6d324c1f70 - Remove inclusion of bsd.default-versions.mk from ftp/curl/Makefile so
bsd.default-versions.mk can rely on ARCH being defined.
- In bsd.port.mk move inclusion of bsd.default-versions.mk from the
  pre-makefile section to the options section so the variables can be used
  earlier.  Also put the bit of code sitting between the options section and
  the pre-makefile section into the options section.
- Remove last few cases where ports set WITH_OPENSSL_PORT.  This variable is
  handled in bsd.default-versions.mk and some ports were setting it after
  including bsd.port.options.mk.  After FreeBSD 9 EoL all but a few ports,
  and then only when setting non-default options, work without setting that
  variable.

PR:		215996
Exp-run by:	antoine
Approved by:	portmgr (antoine)
2017-02-05 21:20:24 +00:00
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