On Tue, Jun 14, 2005 at 05:45:13PM +0200, Geert Hendrickx wrote:
> > Hmm... you'd also rename the .desktop file and the icon.  There should
> > be no problem in doing this, aside some more work ;)
> 
> The previous -gtk version already renamed them (s/-gnome-/-gtk-/).  The
> problem is that you said the patch for the .desktop file has to be in
> ../distcc/patches/.  This patch replaced s/-gnome-/-gtk-/ in the
> .desktop file, but would then apply to all three packages, also the
> -gnome one.  
> 
> I'll look into doing this using SUBST, in distcc-gtk/Makefile, then the
> problem will be gone.  

This is (hopefully =) the final package: 

http://lori.mine.nu:5190/pkgsrc/distcc-final.tgz

It fulfills all requirements: 

* distcc/Makefile is split into Makefile.common and Makefile
* distcc-gtk depends on distcc, adds distccmon-gtk, and -gtk-icon.png
  and modified (using SUBST) -gtk.desktop.  It uses Makefile.common and
  patches/ from distcc.  
* distcc-gnome is mostly identical to -gtk, but has more dependencies.
  It doesn't rename nor modify the icon and .desktop file.  

All three packages can be installed concurrently without conflicts.  

GH

-- 
:wq