4 files changed, 65 insertions, 23 deletions

diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index 297b95c16d48..ce872ac5caf8 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oxygen
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-gtk2/${PORTVERSION}/src/
@@ -22,12 +22,4 @@ USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USES=		cmake pkgconfig
 
-.include <bsd.port.pre.mk>
-
-# FreeBSD SVN r205606 was only MFC'ed to 8.1+, so we need to match
-# the old function signature on previous versions.
-.if ${OSVERSION} < 801000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-demo-oxygengtkdeco_main.cpp
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/gtk-oxygen-engine/distinfo b/x11-themes/gtk-oxygen-engine/distinfo
index 0e3972985ace..dc5c5f951fc6 100644
--- a/x11-themes/gtk-oxygen-engine/distinfo
+++ b/x11-themes/gtk-oxygen-engine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oxygen-gtk2-1.3.4.tar.bz2) = b2521b62c4b55545a216dfbebe8aa62805419b0fe33d2b17ff354308f034040b
-SIZE (oxygen-gtk2-1.3.4.tar.bz2) = 195123
+SHA256 (oxygen-gtk2-1.4.0.tar.bz2) = 84e24b78c71a73c38bfe41da609524307344060fe7e74fa9790380da234e1734
+SIZE (oxygen-gtk2-1.4.0.tar.bz2) = 198415
diff --git a/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp b/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp
deleted file mode 100644
index 43a8adc64f18..000000000000
--- a/x11-themes/gtk-oxygen-engine/files/extra-patch-demo-oxygengtkdeco_main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- demo/oxygengtkdeco_main.cpp~	2011-06-26 11:15:05.000000000 -0300
-+++ demo/oxygengtkdeco_main.cpp	2011-06-26 11:16:02.000000000 -0300
-@@ -118,7 +118,7 @@ int dh=0;
- gboolean initLib()
- {
-     void* library;
--    char* error=0;
-+    const char* error=0;
-     char* moduleDir=gtk_rc_get_module_dir();
-     if(moduleDir)
-     {
diff --git a/x11-themes/gtk-oxygen-engine/files/patch-git_14571f1 b/x11-themes/gtk-oxygen-engine/files/patch-git_14571f1
new file mode 100644
index 000000000000..70755aeef0e3
--- /dev/null
+++ b/x11-themes/gtk-oxygen-engine/files/patch-git_14571f1
@@ -0,0 +1,61 @@
+commit 14571f123ad56909986f795c26ae48e42b0ceb26
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date:   Sat Aug 31 16:12:49 2013 +0300
+
+    Use g_mkdir() instead of different versions of mkdir().
+    
+    The current code was erroneously relying on the _POSIX_C_SOURCE macro to
+    decide whether to use mkdir() with the signature present in POSIX-compliant
+    systems or with the Windows signature.
+    
+    It turns out POSIX.1 expects the applications to define _POSIX_C_SOURCE to
+    certain values. Only glibc resorts to defining it to a value by default,
+    opposing what the standard says. It would then break systems that use
+    another libc, such as the BSDs, OS X and maybe even other Linux libc
+    implementations.
+    
+    Work around the issue by just relying on glib's g_mkdir(), which has the
+    proper means to decide which mkdir() function to call. We still need to
+    check for whether we are on Windows, though, since some of the mode
+    constants are not defined on it.
+    
+    REVIEW:		112402
+
+diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp
+index 9027d30..10ebdf8 100644
+--- src/oxygenqtsettings.cpp
++++ src/oxygenqtsettings.cpp
+@@ -28,6 +28,8 @@
+ #include "oxygentimeline.h"
+ #include "config.h"
+ 
++#include <glib.h>
++#include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ 
+ #include <algorithm>
+@@ -38,7 +40,6 @@
+ #include <fstream>
+ #include <iostream>
+ #include <sstream>
+-#include <unistd.h>
+ 
+ namespace Oxygen
+ {
+@@ -330,11 +331,12 @@ namespace Oxygen
+         struct stat st;
+         if( stat( _userConfigDir.c_str(), &st ) != 0 )
+         {
+-
+-            #if _POSIX_C_SOURCE
+-            mkdir( _userConfigDir.c_str(), S_IRWXU|S_IRWXG|S_IRWXO );
++            #ifdef G_OS_WIN32
++            // S_IRWXG and S_IRWXO are undefined on Windows, and g_mkdir()
++            // ignores its second parameter on Windows anyway.
++            g_mkdir( _userConfigDir.c_str(), 0 );
+             #else
+-            mkdir( _userConfigDir.c_str() );
++            g_mkdir( _userConfigDir.c_str(), S_IRWXU|S_IRWXG|S_IRWXO );
+             #endif
+         }
+