08:18 Baptiste Daroussin (bapt) 

Tools/scripts/bump-revision.sh: insert PORTREVISION after DISTVERSIONSUFFIX

When a port has a DISTVERSIONSUFFIX, PORTREVISION was inserted right
after DISTVERSION, before DISTVERSIONSUFFIX, which breaks the variable
order required by portlint.  Insert PORTREVISION after the last version
line (DISTVERSIONSUFFIX if present, otherwise DISTVERSION/PORTVERSION).

PR:		259289

    c2b3fcd

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

00:39 gerald 

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

 

09:17 gerald 

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

 

13:27 mat 

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

 

23:21 robak 

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

 

12:07 robak 

Tools/scripts/bump-revision.sh: various fixes

- Write nicer code replacing fix introduced by mandree
- Catch up some more edge cases

PR:		192910

 

16:26 mat 

Make this work with any amount of tabulations between the = and the value of
PORTREVISION.

Sponsored by:	Absolight

 

16:03 mat 

Fix if PORTREVISION is not already there.

Sponsored by:	Absolight

 

07:13 mandree 

Catch and report substitution failure on lines such as PORTREVISION=${SOME_VAR}.

 

17:15 robak 

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