BUG: gtk-engines2 & gnome-themes conflict

[danchr@…]

There is a conflict between gtk-engines2 and gnome-themes because they contain some of the same themes. The following patch disables the duplicated themes in gtk-engine, and upgrades gnome-themes to 2.8.2.

Index: x11/gtk-engines2/Portfile =================================================================== RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/x11/gtk-engines2/Portfile,v retrieving revision 1.8 diff -a -u -u -r1.8 Portfile --- x11/gtk-engines2/Portfile 2 Jan 2005 06:05:03 -0000 1.8 +++ x11/gtk-engines2/Portfile 13 Jan 2005 17:58:10 -0000 @@ -3,6 +3,7 @@

PortSystem 1.0 name gtk-engines2 version 2.6.0

+revision 1

categories x11 maintainers mij@… description Theme engine for gtk2

@@ -11,7 +12,10 @@

long_description gtk-engines2 is a theme engine for GTK+ 2. It provides \

the ability to change the way widgets, buttons, etc. \

• look when using GTK+ 2 applications.

+ look when using GTK+ 2 applications. \ + \ + Please note that this port only includes the themes not \ + included in the 'gnome-themes' port.

master_sites gnome:sources/gtk-engines/2.6

@@ -22,5 +26,8 @@

depends_lib lib:libgtk.2:gtk2

+configure.args --disable-crux --disable-hc --disable-industrial \ + --disable-lighthouseblue --disable-mist --disable-smooth \ + --disable-thinice

configure.env LDFLAGS="-L${prefix}/lib" CFLAGS="-I${prefix}/include" \

CPPFLAGS="-I${prefix}/include -no-cpp-precomp"

Index: gnome/gnome-themes/Portfile =================================================================== RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/gnome/gnome-themes/Portfile,v retrieving revision 1.6 diff -a -u -u -r1.6 Portfile --- gnome/gnome-themes/Portfile 19 Sep 2004 18:25:31 -0000 1.6 +++ gnome/gnome-themes/Portfile 13 Jan 2005 17:58:10 -0000 @@ -1,7 +1,7 @@

# $Id: Portfile,v 1.6 2004/09/19 18:25:31 olegb Exp $ PortSystem 1.0 name gnome-themes

-version 2.8.0 +version 2.8.2

description A collection of themes and icons for GNOME 2 designed \

for accessibility.

long_description New package of default themes for GNOME, \

@@ -12,11 +12,13 @@

platforms darwin homepage ​http://www.gnome.org/ master_sites gnome:sources/gnome-themes/2.8/

-checksums md5 f40cd7f3d6af3bb1aeab09ca84c146dc +checksums md5 822899efe7170ca59e04144d94d85741

depends_lib lib:gtk-engines2:gtk-engines2 \

lib:libstartup-notification-1:startup-notification

# Should be depends_extract, but that isn't implemented depends_build bin:gnutar:gnutar use_bzip2 yes extract.post_args |gnutar -xf -

+ +configure.args --enable-all-themes

configure.env CPPFLAGS="-L${prefix}/lib -I${prefix}/include"