On Fri, 6 Feb 2009, Antoine Jacoutot wrote:
> There are some missing bits in your diff, such as @pkgpath markers.
> Anyway, I'll look into it and wait for maintainer's answer.
So, I gave this diff more thought and this is what I ended up doing
instead.
* remove the clearlook engine related files from gtk2-clearlooks-engine
but make it run_depends on gtk-engines2 which already provides this
engine
* remove Clearlooks index.theme from gnome-themes and add
gtk2-clearlooks-engine as run_depends
* tweak DESCR to reflect this change
* add/modify @pkgpath and @conflict markers so that now,
gnome-themes+gtk-engines2+gtk2-clearlooks-engine can be installed at the
same time
* remove gtk-thinice-engine because it is provided by gtk-engines2
already
I think it is simpler this way, no subpackage, no conflict.
Testing appreciated ;)
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/Makefile,v
retrieving revision 1.367
diff -u -r1.367 Makefile
--- Makefile 2 Feb 2009 22:59:28 -0000 1.367
+++ Makefile 6 Feb 2009 12:21:15 -0000
@@ -86,7 +86,6 @@
SUBDIR += gtk+extra
SUBDIR += gtk-chtheme
SUBDIR += gtk-engines2
- SUBDIR += gtk-thinice-engine
SUBDIR += gtk-vnc
SUBDIR += gtk2-clearlooks-engine
SUBDIR += gtk2-murrine-engine
Index: gtk2-clearlooks-engine/Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk2-clearlooks-engine/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- gtk2-clearlooks-engine/Makefile 15 Sep 2007 20:04:20 -0000 1.13
+++ gtk2-clearlooks-engine/Makefile 6 Feb 2009 12:21:15 -0000
@@ -11,7 +11,7 @@
MAINTAINER= Douglas Santos <[email protected]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -20,17 +20,18 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clearlooks/}
EXTRACT_SUFX= .tar.bz2
-WANTLIB= ICE SM Xext Xrender freetype m X11 fontconfig z png \
- atk-1.0 gmodule-2.0 gobject-2.0 glib-2.0 \
- pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo glitz
-
-MODULES= devel/gettext
-LIB_DEPENDS=
gdk-x11-2.0.>=600.10,gdk_pixbuf-2.0.>=600.10,gtk-x11-2.0.>=600.10::x11/gtk+2
+BUILD_DEPENDS= ::x11/gtk+2
+RUN_DEPENDS= :gtk-engines2->=2.16.1p1:x11/gtk-engines2
SHARED_ONLY= Yes
USE_LIBTOOL= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu
+
+# we remove files already provided by gtk-engines2
+post-install:
+ rm -rf ${PREFIX}/lib/
+ rm -f ${PREFIX}/share/themes/Clearlooks/gtk-2.0/gtkrc
.include <bsd.port.mk>
Index: gtk2-clearlooks-engine/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/gtk2-clearlooks-engine/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- gtk2-clearlooks-engine/pkg/DESCR 29 Oct 2005 11:26:25 -0000 1.1.1.1
+++ gtk2-clearlooks-engine/pkg/DESCR 6 Feb 2009 12:21:15 -0000
@@ -1,3 +1,5 @@
Clearlooks is a GTK+ 2.x engine written in C that transforms your
GNOME/XFCE desktop into a modern looking environment. It is fast and
easy on the eyes.
+This package only provides the icons and themes for Clearlooks GTK+
+2.x, the engine itself is provided by the gtk-engines2 package.
Index: gtk2-clearlooks-engine/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gtk2-clearlooks-engine/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- gtk2-clearlooks-engine/pkg/PLIST 7 May 2007 08:45:22 -0000 1.4
+++ gtk2-clearlooks-engine/pkg/PLIST 6 Feb 2009 12:21:15 -0000
@@ -1,9 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2007/05/07 08:45:22 bernd Exp $
-...@conflict gtk-engines2-*
-...@conflict gnome-themes-*
-lib/gtk-2.0/2.10.0/engines/libclearlooks.a
-lib/gtk-2.0/2.10.0/engines/libclearlooks.la
-lib/gtk-2.0/2.10.0/engines/libclearlooks.so
+...@conflict gtk-engines2-<2.16.1p1
+...@conflict gnome-themes-<2.24.3p0
share/icons/Clearlooks/
share/icons/Clearlooks/16x16/
share/icons/Clearlooks/16x16/gtk/
@@ -41,7 +38,6 @@
share/icons/Clearlooks/24x24/gtk/gtk-ok.png
share/icons/Clearlooks/24x24/gtk/gtk-refresh.png
share/icons/Clearlooks/index.theme
-share/themes/Clearlooks/
share/themes/Clearlooks-DeepSky/
share/themes/Clearlooks-DeepSky/gtk-2.0/
share/themes/Clearlooks-DeepSky/gtk-2.0/gtkrc
@@ -51,6 +47,4 @@
share/themes/Clearlooks-Quicksilver/
share/themes/Clearlooks-Quicksilver/gtk-2.0/
share/themes/Clearlooks-Quicksilver/gtk-2.0/gtkrc
-share/themes/Clearlooks/gtk-2.0/
-share/themes/Clearlooks/gtk-2.0/gtkrc
share/themes/Clearlooks/index.theme
Index: gtk-thinice-engine/Makefile
===================================================================
RCS file: gtk-thinice-engine/Makefile
diff -N gtk-thinice-engine/Makefile
--- gtk-thinice-engine/Makefile 1 Feb 2008 21:38:27 -0000 1.17
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-# $OpenBSD: Makefile,v 1.17 2008/02/01 21:38:27 steven Exp $
-
-SHARED_ONLY= Yes
-
-COMMENT= simple, clean theme engine for GTK+2
-
-VERSION= 2.0.2
-DISTNAME= gtk-thinice-engine-${VERSION}
-PKGNAME= ${DISTNAME}p6
-CATEGORIES= x11
-
-HOMEPAGE= http://thinice.sourceforge.net/
-
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xrender atk-1.0 fontconfig m z Xrandr expat \
- Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama \
- freetype glib-2.0 gmodule-2.0 gobject-2.0 glitz png pcre \
- pango-1.0 pangocairo-1.0 pangoft2-1.0 cairo
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=thinice/}
-
-LIB_DEPENDS=
gdk-x11-2.0.>=400.0,gdk_pixbuf-2.0.>=400.0,gtk-x11-2.0.>=400.0::x11/gtk+2
-
-MODULES= devel/gettext
-
-USE_X11= Yes
-USE_LIBTOOL= Yes
-LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-
-.include <bsd.port.mk>
Index: gtk-thinice-engine/distinfo
===================================================================
RCS file: gtk-thinice-engine/distinfo
diff -N gtk-thinice-engine/distinfo
--- gtk-thinice-engine/distinfo 5 Apr 2007 17:36:21 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (gtk-thinice-engine-2.0.2.tar.gz) = OVZ4fl5XCUb4kwvfQgmQIw==
-RMD160 (gtk-thinice-engine-2.0.2.tar.gz) = HkQ/4RKWFPuAUoShVFf/kXoLTFM=
-SHA1 (gtk-thinice-engine-2.0.2.tar.gz) = Mc27oqJOEw6UzR4oxedj+2VafX0=
-SHA256 (gtk-thinice-engine-2.0.2.tar.gz) =
Vb3WR5bEReb/Fw4NrL+zbM6Z55mLwCH+qU5jegoCBNs=
-SIZE (gtk-thinice-engine-2.0.2.tar.gz) = 177021
Index: gtk-thinice-engine/pkg/DESCR
===================================================================
RCS file: gtk-thinice-engine/pkg/DESCR
diff -N gtk-thinice-engine/pkg/DESCR
--- gtk-thinice-engine/pkg/DESCR 15 Dec 2003 21:55:48 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-ThinIce is a flat theme without distracting eye-candy.
Index: gtk-thinice-engine/pkg/PLIST
===================================================================
RCS file: gtk-thinice-engine/pkg/PLIST
diff -N gtk-thinice-engine/pkg/PLIST
--- gtk-thinice-engine/pkg/PLIST 1 May 2007 17:34:01 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.9 2007/05/01 17:34:01 bernd Exp $
-...@conflict gtk-engines2-*
-lib/gtk-2.0/2.10.0/engines/libthinice.la
-lib/gtk-2.0/2.10.0/engines/libthinice.so
-lib/pkgconfig/gtk-thinice-engine-2.pc
-share/themes/ThinIce/
-share/themes/ThinIce/ICON.png
-share/themes/ThinIce/README.html
-share/themes/ThinIce/gtk-2.0/
-share/themes/ThinIce/gtk-2.0/gtkrc
Index: gtk-engines2/Makefile
===================================================================
RCS file: /cvs/ports/x11/gtk-engines2/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- gtk-engines2/Makefile 22 Nov 2008 12:23:47 -0000 1.30
+++ gtk-engines2/Makefile 6 Feb 2009 12:21:15 -0000
@@ -7,7 +7,7 @@
V= 2.16.1
GNOME_PROJECT= gtk-engines
GNOME_VERSION= ${V}
-PKGNAME= gtk-engines2-${V}p0
+PKGNAME= gtk-engines2-${V}p1
CATEGORIES= x11
HOMEPAGE= http://www.gnome.org/
Index: gtk-engines2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gtk-engines2/pkg/PLIST,v
retrieving revision 1.22
diff -u -r1.22 PLIST
--- gtk-engines2/pkg/PLIST 22 Nov 2008 12:23:47 -0000 1.22
+++ gtk-engines2/pkg/PLIST 6 Feb 2009 12:21:15 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.22 2008/11/22 12:23:47 ajacoutot Exp $
+...@pkgpath x11/gtk-thinice-engine
@conflict gtk-thinice-engine-*
-...@conflict gtk2-clearlooks-engine-*
+...@conflict gtk2-clearlooks-engine-<0.6.2p6
@conflict gnome-themes-<2.10
lib/gtk-2.0/2.10.0/engines/libclearlooks.a
lib/gtk-2.0/2.10.0/engines/libclearlooks.la
Index: gnome/themes/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/themes/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- gnome/themes/Makefile 12 Jan 2009 17:48:59 -0000 1.32
+++ gnome/themes/Makefile 6 Feb 2009 12:21:15 -0000
@@ -4,6 +4,7 @@
GNOME_PROJECT= gnome-themes
GNOME_VERSION= 2.24.3
+PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
# LGPLv2.1
@@ -17,10 +18,15 @@
BUILD_DEPENDS= ${RUN_DEPENDS} \
:icon-naming-utils->=0.8.7:x11/icon-naming-utils
RUN_DEPENDS= :gettext-*:devel/gettext \
- :gtk-engines2->=2.9:x11/gtk-engines2
+ :gtk-engines2->=2.9:x11/gtk-engines2 \
+
:gtk2-clearlooks-engine->=0.6.2p6:x11/gtk2-clearlooks-engine
USE_X11= Yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+# remove file already provided by gtk2-clearlooks-engine
+post-install:
+ rm -f ${PREFIX}/share/themes/Clearlooks/index.theme
.include <bsd.port.mk>
Index: gnome/themes/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnome/themes/pkg/PLIST,v
retrieving revision 1.25
diff -u -r1.25 PLIST
--- gnome/themes/pkg/PLIST 12 Jan 2009 17:48:59 -0000 1.25
+++ gnome/themes/pkg/PLIST 6 Feb 2009 12:21:18 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.25 2009/01/12 17:48:59 jasper Exp $
-...@conflict gtk2-clearlooks-engine-*
+...@conflict gtk2-clearlooks-engine-<0.6.2p6
share/icons/Crux/
share/icons/Crux/16x16/
share/icons/Crux/16x16/actions/
@@ -2850,7 +2850,6 @@
share/locale/zh_HK/LC_MESSAGES/gnome-themes.mo
share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
share/themes/
-share/themes/Clearlooks/index.theme
share/themes/Clearlooks/metacity-1/
share/themes/Clearlooks/metacity-1/metacity-theme-1.xml
share/themes/ClearlooksClassic/
--
Antoine
