Maintaining Freebsd Ports

# All my git repositories are kept under ~/repos
cd ~/repos

# Clone official FreeBSD port tree
git clone https://git.FreeBSD.org/ports.git freebsd-ports
# Create a work ports tree
doas poudriere ports -c -m null -M /home/baptiste/repos/freebsd-ports -p work

# create a new local overlay to use in poudriere when creating ports
git clone git@github.com:gwarf/freebsd-ports-custom.git
doas poudriere ports -c -m null -M /home/baptiste/repos/freebsd-ports-custom -p custom

# Check existing port trees
doas poudriere ports -l
 
# Setup work env to point to local clone
export PORTSDIR=$HOME/repos/freebsd-ports
export DISTDIR=$PORTSDIR/distfiles
export PORT_DBDIR=$HOME/var/db/ports

# Create a branch or checkout existing one to work with
cd $PORTSDIR
doas git branch my_port
doas git checkout -b my_port

# Copy files from the port overlay if needed
cp -rv ~/repos/freebsd-ports-custom/security/my_port $PORTSDIR/security/
# Compare files if needed
diff -ur ~/repos/freebsd-ports-custom/security/my_port $PORTSDIR/security/my_port

# Open port work directory
cd $PORTSDIR/security/my_port

# Do work to create or update the port
# Edit the Makefile, bump version and so on
vim Makefile
# Update distfiles and checksums
make makesum

# Upate go depencencies
make gomod-vendor > Makefile.deps.new
# Copy changes, omitting changes on dexidp:dex (to be confiremd)
vimdiff Makefile.deps.new Makefile.deps
# Do changes as needed if next commands encoutner errors
# It may be required to fix some versions
# looking at the proper version info at the upstream repos, ex:
# https://github.com/open-telemetry/opentelemetry-go-contrib/releases
# https://github.com/googleapis/google-cloud-go/releases?expanded=true&page=4&q=compute
# https://github.com/search?q=repo%3Afreebsd%2Ffreebsd-ports
# Update distfiles checksums for go modules
# Update distfiles checksums for go modules
make makesum

# Update cargo crates
make cargo-crates >> Makefile
# Merge cargo-crates update

# Check if plist changed
make makeplist

# Lint port
portlint -A
# Test using poudriere testport, and our work port tree
doas poudriere testport -j 14-1-amd64 -p work -o security/rbw
# If failing, it's possible to launch an interactive session
doas poudriere testport -j 14-1-amd64 -p work -o security/rbw -i -v -v

# Clean port work directory once finalised
make clean
diff -ur $PORTSDIR/security/rbw ~/repos/freebsd-ports-custom/security/rbw
cp -rv $PORTSDIR/security/rbw ~/repos/freebsd-ports-custom/security/

# Commit changes to the work branch
doas git add .
doas git status
doas git commit -am 'Bump rbw to 1.12.1'

# Create a patch
doas git format-patch origin/main

# Switch back to main branch
doas git checkout main
doas git pull

# Rebase rbw work branch from main to get latest changes
doas git pull rebase origin/main rbw

cd ~/repos/freebsd-ports-custom/security/rbw
# Update version
vim Makefile

# Review and commit changes
git commit -am 'Update rbw to 1.12.1'
# Push changes remotely
git push
# Update and merge portshaker repositories
doas portshaker
# Test updated port, moving to interactive use to be able to update the Makefile
doas poudriere testport -j 14-1-amd64 -p main -o security/rbw -i
su -
# Update cargo crates
# FIXME: this reports issues
# Not validating first entry in CATEGORIES due to being outside of PORTSDIR.
make cargo-crates >> Makefile
# Merge cargo-crates update
vim Makefile
# Update sums
make makesum
#XXX: get changes from the jail to update the ports tree outside of the Jail

# Push changes to customised branch
cd ~/repos/freebsd-ports/security/rbw/
cp -rv ~/repos/freebsd-ports-custom/security/rbw/* .

# Commit changes to rbw branch or to a new branch
git fetch
git rebase origin/main rbw
# Squash changes if the updated port is not yet in the tree
git rebase -i ...
# Review changes
git diff origin/main
# Create a patch
git format-patch origin/main

cd ~/repos/freebsd-ports
# Update main branch
git checkout main
git pull
# Create a new branch
git checkout -b rbw
# Rebase the branch for main if it was already created
git rebase origin/main rbw
# Add changes from personal repo
cp -riv ~/repos/freebsd-ports-custom/security/rbw  ~/repos/freebsd-ports/security/ 
# Commit changes
git add security/rbw
git commit -am 'Add rbw port'
# Create a patch from origin
git format-patch origin/main
# Propose 0001-Add-rbw-port.patch via bugzilla