For my broker addons I've created a skelleton and split the loading into system (*.toc) and addon (pack.xml).
So I can just put the addonfolders into my
BrokerPack which has a xml-list of all pack.xml.
That way I dont need to keep track and can simply change the standalone addon and svn takes care to pull it into the BrokerPack.