jsa

#!/bin/sh

# This is largely unnecessary, but is a variant of what I designed to suit my needs.
# It overcomes some issue that annoyed me, and makes the process one easy command
# This assumes that marcusmerge is in your path

# Uninstall all installed marcusom portage if present
marcusmerge -U

# CHANGE THIS to your ports-supfile
csup /PATH/TO/PORTS-SUPFILE

# CHANGE THIS to your general marcuscom direcotry
# example: /usr/mcom/
cd /PATH/TO/MARCUSOM-PORTS


# There will be two subdirectories under the general directory, ports and ports-stable
cvs -z3 -q -d :pserver:anonymous@creme-brulee.marcuscom.com:/space/cvs/marcuscom-cvs \
        up -Pd ports-stable ports

# This line fetches the INDEX file for your branch
marcusmerge -i

# First, merge ports-stable, then merge marcuscom ports, order probably doesn't matter
marcusmerge -m ports-stable
marcusmerge -m ports

# This lists all the ports that are out of date, just for convenience
marcusmerge -l