6 files changed, 25 insertions, 29 deletions

diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 26a65201fe79..10326589cb0e 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -97,6 +97,7 @@
     SUBDIR += gtk-qt-engine
     SUBDIR += gtk-qt4-engine
     SUBDIR += gtk-xfce-engine
+    SUBDIR += gtk3-oxygen-engine
     SUBDIR += icon-bluecurve-theme
     SUBDIR += icon-naming-utils
     SUBDIR += icons-buuf
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index aada37c86893..3e0ead3512db 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oxygen
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk2/${PORTVERSION}/src/
diff --git a/x11-themes/gtk-oxygen-engine/pkg-plist b/x11-themes/gtk-oxygen-engine/pkg-plist
index 11a652e66073..a36fce90e2a7 100644
--- a/x11-themes/gtk-oxygen-engine/pkg-plist
+++ b/x11-themes/gtk-oxygen-engine/pkg-plist
@@ -11,8 +11,5 @@ share/themes/oxygen-gtk/gtk-2.0/special-icons/standardbutton-closetab-down-16.pn
 share/themes/oxygen-gtk/gtk-2.0/special-icons/standardbutton-closetab-hover-16.png
 @dirrm share/themes/oxygen-gtk/gtk-2.0/special-icons
 @dirrm share/themes/oxygen-gtk/gtk-2.0
-@dirrm share/themes/oxygen-gtk
+@dirrmtry share/themes/oxygen-gtk
 @dirrmtry share/themes
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
-@dirrmtry lib/gtk-2.0
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index aada37c86893..a3dd1d507a1f 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	oxygen
-PORTVERSION=	1.2.0
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk2/${PORTVERSION}/src/
-PKGNAMEPREFIX=	gtk-
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk3/${PORTVERSION}/src/
+PKGNAMEPREFIX=	gtk3-
 PKGNAMESUFFIX=	-engine
-DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
+DISTNAME=	${PORTNAME}-gtk3-${PORTVERSION}
 
 MAINTAINER=	rakuco@FreeBSD.org
-COMMENT=	Oxygen-Gtk engine and theme
+COMMENT=	Oxygen GTK+ 3 engine and theme
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 USE_BZIP2=	yes
-USE_GNOME=	gtk20 pkgconfig
+USE_GNOME=	gtk30 pkgconfig
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/x11-themes/gtk3-oxygen-engine/distinfo b/x11-themes/gtk3-oxygen-engine/distinfo
index 23d89c8f0ce1..b4bc3e65e1e8 100644
--- a/x11-themes/gtk3-oxygen-engine/distinfo
+++ b/x11-themes/gtk3-oxygen-engine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oxygen-gtk2-1.2.0.tar.bz2) = 3742fb5bd65dad1a26e973fcf0488f35f824f92660b67066536ba480b6b4ad8f
-SIZE (oxygen-gtk2-1.2.0.tar.bz2) = 191654
+SHA256 (oxygen-gtk3-1.0.0.tar.bz2) = 9a89e4767d0afedb7a7b6b580cba74dcc14c72ab898c1d70376619d9675f2642
+SIZE (oxygen-gtk3-1.0.0.tar.bz2) = 185889
diff --git a/x11-themes/gtk3-oxygen-engine/pkg-plist b/x11-themes/gtk3-oxygen-engine/pkg-plist
index 11a652e66073..0c0476c70ed6 100644
--- a/x11-themes/gtk3-oxygen-engine/pkg-plist
+++ b/x11-themes/gtk3-oxygen-engine/pkg-plist
@@ -1,18 +1,15 @@
-bin/oxygen-gtk-deco
-bin/oxygen-gtk-demo
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/liboxygen-gtk.so
-share/themes/oxygen-gtk/gtk-2.0/argb-apps.conf
-share/themes/oxygen-gtk/gtk-2.0/gtkrc
-share/themes/oxygen-gtk/gtk-2.0/icons4
-share/themes/oxygen-gtk/gtk-2.0/kdeglobals
-share/themes/oxygen-gtk/gtk-2.0/oxygenrc
-share/themes/oxygen-gtk/gtk-2.0/special-icons/standardbutton-closetab-16.png
-share/themes/oxygen-gtk/gtk-2.0/special-icons/standardbutton-closetab-down-16.png
-share/themes/oxygen-gtk/gtk-2.0/special-icons/standardbutton-closetab-hover-16.png
-@dirrm share/themes/oxygen-gtk/gtk-2.0/special-icons
-@dirrm share/themes/oxygen-gtk/gtk-2.0
-@dirrm share/themes/oxygen-gtk
+bin/oxygen-gtk3-demo
+lib/gtk-3.0/%%GTK3_VERSION%%/theming-engines/liboxygen-gtk.so
+share/themes/oxygen-gtk/gtk-3.0/argb-apps.conf
+share/themes/oxygen-gtk/gtk-3.0/gtk.css
+share/themes/oxygen-gtk/gtk-3.0/icons4
+share/themes/oxygen-gtk/gtk-3.0/kdeglobals
+share/themes/oxygen-gtk/gtk-3.0/oxygenrc
+share/themes/oxygen-gtk/gtk-3.0/special-icons/standardbutton-closetab-16.png
+share/themes/oxygen-gtk/gtk-3.0/special-icons/standardbutton-closetab-down-16.png
+share/themes/oxygen-gtk/gtk-3.0/special-icons/standardbutton-closetab-hover-16.png
+@dirrm share/themes/oxygen-gtk/gtk-3.0/special-icons
+@dirrm share/themes/oxygen-gtk/gtk-3.0
+@dirrmtry share/themes/oxygen-gtk
 @dirrmtry share/themes
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
-@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
-@dirrmtry lib/gtk-2.0
+@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/theming-engines