(pkgtools) wip/revbump (+ replace-commonbump)

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Hi,
I've been playing with wip/revbump.
The first insentive was
  1. It took me serveral minutes or more 
    to understand what to do the following part of revbump man page.

| grep -e Makefile.common -e mk$ allbump | grep -v -e buildlink3.mk -e options.mk > commonbump

| [read commonbump and replace entries with all packages including the
| corresponding Makefile.common or *.mk file]

  2. Automate this step (and replace-commonbump is the one for it).

Some improvement on revbump itself not to make dropout
(avoid manual edit).

I'm testing attached shell script for graphics/cairo revbump.
(Check if doing correct thing and edit following lines).

Now I have to edit following anyway :-)

h87@makoto 23:16:30/141111(..wip/revbump)% grep py27 /usr/pkgsrc/cvs-diff 
+BUILDLINK_ABI_DEPENDS.py-cairo?=       py27-cairo>=1.10.0nb3
+BUILDLINK_ABI_DEPENDS.py-notify-python?=       py27-notify-python>=0.1.1nb25
+BUILDLINK_ABI_DEPENDS.pygnome2+=       py27-gnome2>=2.28.1nb28
+BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=      py27-gnome2-desktop>=2.32.0nb37
+BUILDLINK_ABI_DEPENDS.pygnome2ex+=     py27-gnome2-extras>=2.25.3nb26
+BUILDLINK_ABI_DEPENDS.pygtk2+= py27-gtk2>=2.24.0nb18
+BUILDLINK_ABI_DEPENDS.py-vte+= py27-vte>=0.28.1nb16
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=       py27-wxWidgets>=2.8.12.0
h87@makoto 23:16:47/141111(..wip/revbump)% grep ruby200  /usr/pkgsrc/cvs-diff
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?=      ruby200-gnome2-pango>=2.2.3
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gdk3?=       ruby200-gnome2-gdk3>=2.2.3
+BUILDLINK_ABI_DEPENDS.ruby-rcairo+=    ruby200-rcairo>=1.12.9nb1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk+=        ruby200-gnome2-gtk>=2.2.3
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3?=       ruby200-gnome2-gtk3>=2.2.3

Thank you for your attention,
---
mef%NetBSD.org@localhost
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

#!/bin/sh
# ----------------------------------------------
# You need edit account name and patch file name
# ----------------------------------------------

if [ .$1 = .''  ] ; then
PACKAGE=graphics/cairo
else
PACKAGE=$1
fi

echo    " *** Package is ${PACKAGE}, now erasing ** /usr/pkgsrc **, are you really OK ?"
read -p ' *** Type ^C to abort, 'yes' to continue [yes/NO] ' yes_no
if [ .$yes_no != .'yes' ] ; then echo ' *** User aborted.' ; exit 1
fi			     
cd /usr
rm -rf pkgsrc/*
# checkout
time -c  cvs -Q -d :ext:useridf%cvs.netbsd.org@localhost:/cvsroot co pkgsrc
#                       === EDIT here
# patch
cd /usr/pkgsrc
patch -s -p0 < ~/public_html/pkgsrc/graphics/cairo-1.14.0
#              ==== . . . . . . .                   ==== EDIT here

#      U S U A L L Y    S T A R T   H E R E
# revbump
finddepends ${PACKAGE} | sort -u > allbump
#           ========== category/package_directory
grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' > bl3bump
grep -e Makefile.common -e mk$ allbump | grep -v -e buildlink3.mk -e options.mk > commonbump

replace-commonbump  | tee replace-commonbump.manual
echo    ' *** replace-commonbump.manual shown above (if exists),'
#read -p ' *** Type return to continue, or ^Z to edit.' yes_no

cat allbump commonbump.replaced | sed 's,/[^/]*$,,' | sort -u > makebump
# time -c  revbump < makebump | tee  makebump.manual
echo    ' *** makebump.manual shown above (if exists)'
#read -p ' *** Type return to continue, or ^Z to edit.' yes_no

## [if a package is listed in makebump.manual, handle the PKGREVISION bump manually]
blbump < bl3bump | tee bl3bump.manual
echo    ' *** bl3bump.manual show above (if exists)'
#read -p ' *** Type return to continue, or ^Z to edit.' yes_no

## [handle the *ABI_DEPENDS* bumps in bl3bump.manual manually, usually none]
rm -f cvs-diff
cvs diff `cat makebump` > cvs-diff 2>&1

read -p ' *** browse file cvs-diff, type return to continue, or ^Z to edit.' yes_no
## [look for PYPKGPREFIX -> py27
## and RUBY_PKGPREFIX -> ruby200 expansions
## in buildlink files and any unrelated diffs you have in your
## local tree, and fix them]
cvs diff `cat bl3bump makebump` 

#  cvs commit `cat bl3bump makebump`
#  rm allbump bl3bump* makebump* commonbump