From 49b1fd259f36a06de603993f45425f6bb0405758 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 30 Apr 2012 12:48:11 +0000 Subject: [PATCH] Update to gtk-xfce-engine 3.0.0. Split into -main for the Gtk2 engine and -gtk3 for the optional Gtk3 engine. --- x11/xfce4/gtk-xfce-engine/Makefile | 22 ++++++--- x11/xfce4/gtk-xfce-engine/distinfo | 10 ++-- x11/xfce4/gtk-xfce-engine/pkg/DESCR | 1 - x11/xfce4/gtk-xfce-engine/pkg/DESCR-gtk3 | 1 + x11/xfce4/gtk-xfce-engine/pkg/DESCR-main | 1 + x11/xfce4/gtk-xfce-engine/pkg/PFRAG.shared | 2 - x11/xfce4/gtk-xfce-engine/pkg/PLIST-gtk3 | 47 +++++++++++++++++++ .../gtk-xfce-engine/pkg/{PLIST => PLIST-main} | 5 +- 8 files changed, 71 insertions(+), 18 deletions(-) delete mode 100644 x11/xfce4/gtk-xfce-engine/pkg/DESCR create mode 100644 x11/xfce4/gtk-xfce-engine/pkg/DESCR-gtk3 create mode 100644 x11/xfce4/gtk-xfce-engine/pkg/DESCR-main delete mode 100644 x11/xfce4/gtk-xfce-engine/pkg/PFRAG.shared create mode 100644 x11/xfce4/gtk-xfce-engine/pkg/PLIST-gtk3 rename x11/xfce4/gtk-xfce-engine/pkg/{PLIST => PLIST-main} (95%) diff --git a/x11/xfce4/gtk-xfce-engine/Makefile b/x11/xfce4/gtk-xfce-engine/Makefile index 78d42b87c52..c837ce92cdc 100644 --- a/x11/xfce4/gtk-xfce-engine/Makefile +++ b/x11/xfce4/gtk-xfce-engine/Makefile @@ -1,10 +1,14 @@ -# $OpenBSD: Makefile,v 1.34 2011/10/14 11:37:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.35 2012/04/30 12:48:11 landry Exp $ -COMMENT= Xfce4 theme engine for Gtk+2 +COMMENT-main= Xfce4 theme engine for Gtk+2 +COMMENT-gtk3= Xfce4 theme engine for Gtk+3 XFCE_PROJECT= gtk-xfce-engine -XFCE_VERSION= 2.8.1 -REVISION= 1 +XFCE_VERSION= 3.0.0 + +MULTI_PACKAGES = -main -gtk3 +PKGNAME-main = ${PKGNAME} +PKGNAME-gtk3 = gtk3-xfce-engine-${XFCE_VERSION} HOMEPAGE= http://www.xfce.org/projects/ @@ -16,12 +20,16 @@ PERMIT_PACKAGE_FTP= Yes MODULES= x11/xfce4 -LIB_DEPENDS= x11/gtk+2 +LIB_DEPENDS-main = x11/gtk+2 +LIB_DEPENDS-gtk3 = x11/gtk+3>=3.2 WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes GL Xxf86vm drm xcb-shm \ - Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ + Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig stdc++ \ freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png z pthread-stubs xcb \ - gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 gthread-2.0 xcb-render ffi + gdk_pixbuf-2.0 gthread-2.0 xcb-render ffi + +WANTLIB-main = ${WANTLIB} gdk-x11-2.0 gtk-x11-2.0 +WANTLIB-gtk3 = ${WANTLIB} cairo-gobject gdk-3 gtk-3 .include diff --git a/x11/xfce4/gtk-xfce-engine/distinfo b/x11/xfce4/gtk-xfce-engine/distinfo index b9fb4785853..a9afd51fd53 100644 --- a/x11/xfce4/gtk-xfce-engine/distinfo +++ b/x11/xfce4/gtk-xfce-engine/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/gtk-xfce-engine-2.8.1.tar.bz2) = imUnthsFVM2hHQb2alZzFA== -RMD160 (xfce4/gtk-xfce-engine-2.8.1.tar.bz2) = 58CtXJwNqtG3bRiDi4apaaPihYs= -SHA1 (xfce4/gtk-xfce-engine-2.8.1.tar.bz2) = 13efB8x2WFvgY7wl+pHmYOH9nJc= -SHA256 (xfce4/gtk-xfce-engine-2.8.1.tar.bz2) = fLClLXTN7VxqholLq9IU3nI7z2h3EZXbbZSs9RYb5hc= -SIZE (xfce4/gtk-xfce-engine-2.8.1.tar.bz2) = 304096 +MD5 (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = wC3sE/BjwoXeRNU4iQKCKg== +RMD160 (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = JEkGqIwzTnBN0wJ8/mf8UcqgQxc= +SHA1 (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = vDWib8NyOQjiZCNPEuOEF1d50Yw= +SHA256 (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = kOCPzozORSZWxAkPlK+3qjWgqSWXQS8xlSa3iZ1Ug40= +SIZE (xfce4/gtk-xfce-engine-3.0.0.tar.bz2) = 367860 diff --git a/x11/xfce4/gtk-xfce-engine/pkg/DESCR b/x11/xfce4/gtk-xfce-engine/pkg/DESCR deleted file mode 100644 index 5b212e0ff34..00000000000 --- a/x11/xfce4/gtk-xfce-engine/pkg/DESCR +++ /dev/null @@ -1 +0,0 @@ -gtk-xfce-theme-engine is a theme engine for GTK2. diff --git a/x11/xfce4/gtk-xfce-engine/pkg/DESCR-gtk3 b/x11/xfce4/gtk-xfce-engine/pkg/DESCR-gtk3 new file mode 100644 index 00000000000..e30b2b3d11f --- /dev/null +++ b/x11/xfce4/gtk-xfce-engine/pkg/DESCR-gtk3 @@ -0,0 +1 @@ +gtk3-xfce-engine is a theme engine for GTK3. diff --git a/x11/xfce4/gtk-xfce-engine/pkg/DESCR-main b/x11/xfce4/gtk-xfce-engine/pkg/DESCR-main new file mode 100644 index 00000000000..4fd50d94ae7 --- /dev/null +++ b/x11/xfce4/gtk-xfce-engine/pkg/DESCR-main @@ -0,0 +1 @@ +gtk-xfce-engine is a theme engine for GTK2. diff --git a/x11/xfce4/gtk-xfce-engine/pkg/PFRAG.shared b/x11/xfce4/gtk-xfce-engine/pkg/PFRAG.shared deleted file mode 100644 index aee9576a769..00000000000 --- a/x11/xfce4/gtk-xfce-engine/pkg/PFRAG.shared +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2007/04/23 16:40:04 steven Exp $ -lib/gtk-2.0/2.10.0/engines/libxfce.so diff --git a/x11/xfce4/gtk-xfce-engine/pkg/PLIST-gtk3 b/x11/xfce4/gtk-xfce-engine/pkg/PLIST-gtk3 new file mode 100644 index 00000000000..c0a3345f7ec --- /dev/null +++ b/x11/xfce4/gtk-xfce-engine/pkg/PLIST-gtk3 @@ -0,0 +1,47 @@ +@comment $OpenBSD: PLIST-gtk3,v 1.1 2012/04/30 12:48:11 landry Exp $ +lib/gtk-3.0/ +lib/gtk-3.0/3.0.0/ +lib/gtk-3.0/3.0.0/theming-engines/ +@comment lib/gtk-3.0/3.0.0/theming-engines/libxfce.a +@comment lib/gtk-3.0/3.0.0/theming-engines/libxfce.la +lib/gtk-3.0/3.0.0/theming-engines/libxfce.so +share/themes/Xfce-4.0/gtk-3.0/ +share/themes/Xfce-4.0/gtk-3.0/gtk.css +share/themes/Xfce-4.2/gtk-3.0/ +share/themes/Xfce-4.2/gtk-3.0/gtk.css +share/themes/Xfce-4.4/gtk-3.0/ +share/themes/Xfce-4.4/gtk-3.0/gtk.css +share/themes/Xfce-4.6/gtk-3.0/ +share/themes/Xfce-4.6/gtk-3.0/gtk.css +share/themes/Xfce-b5/gtk-3.0/ +share/themes/Xfce-b5/gtk-3.0/gtk.css +share/themes/Xfce-basic/gtk-3.0/ +share/themes/Xfce-basic/gtk-3.0/gtk.css +share/themes/Xfce-cadmium/gtk-3.0/ +share/themes/Xfce-cadmium/gtk-3.0/gtk.css +share/themes/Xfce-curve/gtk-3.0/ +share/themes/Xfce-curve/gtk-3.0/gtk.css +share/themes/Xfce-dawn/gtk-3.0/ +share/themes/Xfce-dawn/gtk-3.0/gtk.css +share/themes/Xfce-dusk/gtk-3.0/ +share/themes/Xfce-dusk/gtk-3.0/gtk.css +share/themes/Xfce-kde2/gtk-3.0/ +share/themes/Xfce-kde2/gtk-3.0/gtk.css +share/themes/Xfce-kolors/gtk-3.0/ +share/themes/Xfce-kolors/gtk-3.0/gtk.css +share/themes/Xfce-light/gtk-3.0/ +share/themes/Xfce-light/gtk-3.0/gtk.css +share/themes/Xfce-orange/gtk-3.0/ +share/themes/Xfce-orange/gtk-3.0/gtk.css +share/themes/Xfce-redmondxp/gtk-3.0/ +share/themes/Xfce-redmondxp/gtk-3.0/gtk.css +share/themes/Xfce-saltlake/gtk-3.0/ +share/themes/Xfce-saltlake/gtk-3.0/gtk.css +share/themes/Xfce-smooth/gtk-3.0/ +share/themes/Xfce-smooth/gtk-3.0/gtk.css +share/themes/Xfce-stellar/gtk-3.0/ +share/themes/Xfce-stellar/gtk-3.0/gtk.css +share/themes/Xfce-winter/gtk-3.0/ +share/themes/Xfce-winter/gtk-3.0/gtk.css +share/themes/Xfce/gtk-3.0/ +share/themes/Xfce/gtk-3.0/gtk.css diff --git a/x11/xfce4/gtk-xfce-engine/pkg/PLIST b/x11/xfce4/gtk-xfce-engine/pkg/PLIST-main similarity index 95% rename from x11/xfce4/gtk-xfce-engine/pkg/PLIST rename to x11/xfce4/gtk-xfce-engine/pkg/PLIST-main index bb93b66f0d8..2a9229fe676 100644 --- a/x11/xfce4/gtk-xfce-engine/pkg/PLIST +++ b/x11/xfce4/gtk-xfce-engine/pkg/PLIST-main @@ -1,11 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.8 2011/01/18 21:34:58 ajacoutot Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST-main,v 1.1 2012/04/30 12:48:11 landry Exp $ lib/gtk-2.0/ lib/gtk-2.0/2.10.0/ lib/gtk-2.0/2.10.0/engines/ @comment lib/gtk-2.0/2.10.0/engines/libxfce.a @comment lib/gtk-2.0/2.10.0/engines/libxfce.la -share/themes/ +lib/gtk-2.0/2.10.0/engines/libxfce.so share/themes/Xfce/ share/themes/Xfce-4.0/ share/themes/Xfce-4.0/gtk-2.0/