- Update to 1.82

- Convert to USES gnustep and unbreak
- Regenerate patches to silence portlint warnings

PR:		200496
Submitted by:	lightside at gmx.com

11 files changed, 86 insertions, 143 deletions

diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index be647176ecec..eba47f492128 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -2,18 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=		oolite
-PORTVERSION=		1.80
-PORTREVISION=		2
+PORTVERSION=		1.82
 CATEGORIES=		games gnustep
-MASTER_SITES=		http://github.com/OoliteProject/oolite/releases/download/1.80b/
+MASTER_SITES=		http://github.com/OoliteProject/oolite/releases/download/1.82/
 DISTNAME=		${PORTNAME}-source-${PORTVERSION}
 DIST_SUBDIR=		oolite
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Trade and combat space simulator, clone of Elite
 
-BROKEN=			Not converted to USES=gnustep
-
 LICENSE=		CCBYNCSAv3 GPLv2 ZLIB
 LICENSE_COMB=		multi
 LICENSE_NAME_CCBYNCSAv3=	Creative Commons Attribution-NonCommercial-ShareAlike License version 3.0
@@ -28,16 +25,18 @@ LIB_DEPENDS=		libespeak.so:${PORTSDIR}/audio/espeak \
 			libpng.so:${PORTSDIR}/graphics/png \
 			libminizip.so:${PORTSDIR}/archivers/minizip
 
-USES=			gmake openal:al perl5 python:build tar:bzip2
+USES=			gnustep openal:al perl5 python:build tar:bzip2
 USE_GL=			yes
 USE_SDL=		sdl
-USE_GNUSTEP=		yes
-USE_GNUSTEP_BASE=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_MAKEFILE=		yes
+USE_GNUSTEP=		base build
+# Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE
+# without possibility to change it, as it was done in the previous implementation
+DO_MAKE_BUILD=		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
 ALL_TARGET=		release-deployment
 USE_PERL5=		build
 
+GNUSTEP_LOCAL_APPS=	${GNUSTEP_LOCAL_ROOT}/Applications
+
 SUB_FILES=	oolite
 SUB_LIST=	GNUSTEP_SYSTEM_TOOLS="${GNUSTEP_SYSTEM_TOOLS}"
 
@@ -55,33 +54,36 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900014
-BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
-CC=		${LOCALBASE}/bin/clang34
-CXX=		${LOCALBASE}/bin/clang++34
-CPP=		${LOCALBASE}/bin/clang-cpp34
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900014
+WITH_PORTS_CLANG=	yes
 .elif exists(${CC})
 CCVERSION!=	${CC} --version
 COMPILER_VERSION=	${CCVERSION:M[0-9].[0-9]*:C/([0-9]).?/\1/g}
 COMPILER_IS_CLANG=	${CCVERSION:Mclang}
-
 # Check for LLVM/Clang v3.4.1
 .if ${COMPILER_IS_CLANG} && ${COMPILER_VERSION} == 341
-# Force to use optimization for size, because of speed optimization error(s)
+# Use compiler from ports, because of errors
 # for ${WRKSRC}/src/Core/Scripting/OOJavaScriptEngine.m file
-ADD_OBJCFLAGS=	s|-std=c99|-std=c99 -Os|
+WITH_PORTS_CLANG=	yes
 .endif
 .endif
 
+.if defined(WITH_PORTS_CLANG)
+BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
+CC=		${LOCALBASE}/bin/clang34
+CXX=		${LOCALBASE}/bin/clang++34
+CPP=		${LOCALBASE}/bin/clang-cpp34
+.endif
+
 post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \
 		s/sdl-config/$${SDL_CONFIG}/ ; \
-		s|-lstdc++|`$${SDL_CONFIG} --libs` -lstdc++| ; \
+		s|-lstdc++|`$${SDL_CONFIG} --libs` &| ; \
 		s|:src/Core/MiniZip|| ; \
 		s|-Isrc/Core/MiniZip|-I$${LOCALBASE}/include/minizip| ; \
 		s|-lz|-lminizip| ; \
 		/ioapi.c/d ; /unzip.c/d ; \
-		s|/usr/X11R6|$${LOCALBASE}| ; ${ADD_OBJCFLAGS}' \
+		s|/usr/X11R6|$${LOCALBASE}|' \
 		${WRKSRC}/GNUmakefile
 # Conversion needed for unsigned int type for using isfinite function
 	${REINPLACE_CMD} -e 's|isfinite(uValue)|isfinite((long double)uValue)|' \
@@ -91,11 +93,13 @@ post-patch: .SILENT
 		${WRKSRC}/src/Core/NSFileManagerOOExtensions.h
 
 do-install:
-	cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
+	(cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${RELEASEDIR}/oolite ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite.desktop ${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps
-	cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/installers/FreeDesktop/oolite-icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
+	(cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
diff --git a/games/oolite/distinfo b/games/oolite/distinfo
index c0728d4192cf..4b4875ab6c25 100644
--- a/games/oolite/distinfo
+++ b/games/oolite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oolite/oolite-source-1.80.tar.bz2) = a9bea03435cd7fd05b4519a44345e4ff4857a799aef79913733ddc5d7a537bdf
-SIZE (oolite/oolite-source-1.80.tar.bz2) = 139397592
+SHA256 (oolite/oolite-source-1.82.tar.bz2) = aa7ac77ea3d81d8ee13602f1490aef9cc60434c8083b1b7c8ff8ff9f2a8ca7d8
+SIZE (oolite/oolite-source-1.82.tar.bz2) = 139691456
diff --git a/games/oolite/files/patch-deps_mozilla-bug771281 b/games/oolite/files/patch-deps_mozilla-bug771281
index 8296772ad9a0..271fe4942e87 100644
--- a/games/oolite/files/patch-deps_mozilla-bug771281
+++ b/games/oolite/files/patch-deps_mozilla-bug771281
@@ -1,6 +1,6 @@
 diff -ruN deps.orig/mozilla/js/src/shell/Makefile.in deps/mozilla/js/src/shell/Makefile.in
---- deps.orig/mozilla/js/src/shell/Makefile.in	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/Makefile.in	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/Makefile.in	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/Makefile.in
 @@ -47,7 +47,6 @@
  PROGRAM         = js$(BIN_SUFFIX)
  CPPSRCS		= \
@@ -10,8 +10,8 @@ diff -ruN deps.orig/mozilla/js/src/shell/Makefile.in deps/mozilla/js/src/shell/M
  
  DEFINES         += -DEXPORT_JS_API
 diff -ruN deps.orig/mozilla/js/src/shell/js.cpp deps/mozilla/js/src/shell/js.cpp
---- deps.orig/mozilla/js/src/shell/js.cpp	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/js.cpp	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/js.cpp	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/js.cpp
 @@ -91,8 +91,6 @@
  #endif /* JSDEBUGGER_C_UI */
  #endif /* JSDEBUGGER */
@@ -85,8 +85,8 @@ diff -ruN deps.orig/mozilla/js/src/shell/js.cpp deps/mozilla/js/src/shell/js.cpp
      if (jsdc) {
  #ifdef JSDEBUGGER_C_UI
 diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej deps/mozilla/js/src/shell/jsworkers.cpp.rej
---- deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej	1970-01-01 03:00:00.000000000 +0300
-+++ deps/mozilla/js/src/shell/jsworkers.cpp.rej	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej	1970-01-01 00:00:00 UTC
++++ deps/mozilla/js/src/shell/jsworkers.cpp.rej
 @@ -0,0 +1,1281 @@
 +@@ -1,1280 +0,0 @@
 +-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1370,8 +1370,8 @@ diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.cpp.rej deps/mozilla/js/src/s
 +-
 +-#endif /* JS_THREADSAFE */
 diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.h deps/mozilla/js/src/shell/jsworkers.h
---- deps.orig/mozilla/js/src/shell/jsworkers.h	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/shell/jsworkers.h	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/shell/jsworkers.h	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/shell/jsworkers.h
 @@ -1,93 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 - * vim: set ts=8 sw=4 et tw=99:
@@ -1467,8 +1467,8 @@ diff -ruN deps.orig/mozilla/js/src/shell/jsworkers.h deps/mozilla/js/src/shell/j
 -
 -#endif /* jsworkers_h___ */
 diff -ruN deps.orig/mozilla/js/src/tests/browser.js deps/mozilla/js/src/tests/browser.js
---- deps.orig/mozilla/js/src/tests/browser.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/browser.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/browser.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/browser.js
 @@ -767,17 +767,6 @@
    document.write(s);
  }
@@ -1488,8 +1488,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/browser.js deps/mozilla/js/src/tests/br
  {
    // gDelayTestDriverEnd is used to
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/jstests.list
 @@ -1,13 +1,6 @@
  url-prefix ../../jsreftest.html?test=js1_8_5/extensions/
  script typedarray.js
@@ -1505,8 +1505,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/jstests.list deps/mo
  script array-length-protochange.js
  script parseInt-octal.js
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.js
 @@ -1,9 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1518,8 +1518,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-child.j
 -    throw new Error("fail");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
 @@ -1,16 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1538,8 +1538,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propaga
 -    w.postMessage(n - 1 + "");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propagation.js
 @@ -1,20 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1562,8 +1562,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error-propaga
 -    reportCompare(0, 0, " PASSED! Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js
 @@ -1,21 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1587,8 +1587,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-error.js deps
 -    reportCompare(0, 0, "Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js
 @@ -1,27 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1618,8 +1618,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib-child.js
 -    }
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js
 @@ -1,18 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1640,8 +1640,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-fib.js deps/m
 -    reportCompare(0, 0, "Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js
 @@ -1,8 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1652,8 +1652,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init-child.js
 -postMessage('do your worst');
 -for (;;) ;
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js
 @@ -1,19 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1675,8 +1675,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-init.js deps/
 -    reportCompare(0, 0, "Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.js
 @@ -1,8 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1687,8 +1687,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple-child.
 -
 -onmessage = function (event) { postMessage(event.data); };
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js
 @@ -1,20 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1711,8 +1711,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-simple.js dep
 -    reportCompare(0, 0, "Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-child.js
 @@ -1,13 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1728,8 +1728,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-chi
 -    postMessage("killed");
 -};
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
 @@ -1,9 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1741,8 +1741,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate-ilo
 -for (;;)
 -    ;
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js
 @@ -1,37 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1782,8 +1782,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-terminate.js
 -    reportCompare(0, 0, "Test skipped. Shell workers required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child.js
 @@ -1,9 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1795,8 +1795,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout-child
 -for (;;)
 -    ;
 diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js
---- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js
 @@ -1,18 +0,0 @@
 -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 -/*
@@ -1817,8 +1817,8 @@ diff -ruN deps.orig/mozilla/js/src/tests/js1_8_5/extensions/worker-timeout.js de
 -    reportCompare(0, 0, "Test skipped. Shell workers and timeout required.");
 -}
 diff -ruN deps.orig/mozilla/js/src/tests/shell.js deps/mozilla/js/src/tests/shell.js
---- deps.orig/mozilla/js/src/tests/shell.js	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/tests/shell.js	2014-09-23 07:59:03.000000000 +0400
+--- deps.orig/mozilla/js/src/tests/shell.js	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/tests/shell.js
 @@ -833,18 +833,6 @@
    }
  }
diff --git a/games/oolite/files/patch-deps_mozilla_js_src_configure b/games/oolite/files/patch-deps_mozilla_js_src_configure
index 51805bbfe745..bce3004e632c 100644
--- a/games/oolite/files/patch-deps_mozilla_js_src_configure
+++ b/games/oolite/files/patch-deps_mozilla_js_src_configure
@@ -1,5 +1,5 @@
---- deps/mozilla/js/src/configure.orig	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/configure	2014-09-24 04:01:12.000000000 +0400
+--- deps/mozilla/js/src/configure.orig	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/configure
 @@ -9547,7 +9547,8 @@
  
  echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
diff --git a/games/oolite/files/patch-deps_mozilla_js_src_configure.in b/games/oolite/files/patch-deps_mozilla_js_src_configure.in
index ade411ed12e4..a6fb4dad22cb 100644
--- a/games/oolite/files/patch-deps_mozilla_js_src_configure.in
+++ b/games/oolite/files/patch-deps_mozilla_js_src_configure.in
@@ -1,5 +1,5 @@
---- deps/mozilla/js/src/configure.in.orig	2014-06-30 12:54:39.000000000 +0400
-+++ deps/mozilla/js/src/configure.in	2014-09-23 08:13:19.000000000 +0400
+--- deps/mozilla/js/src/configure.in.orig	2014-06-30 08:54:39 UTC
++++ deps/mozilla/js/src/configure.in
 @@ -3378,7 +3378,8 @@
                         rm -f conftest.{c,S}
                         ])
diff --git a/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h b/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h
index f8b9a109a15a..c2bf931d5974 100644
--- a/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h
+++ b/games/oolite/files/patch-deps_mozilla_js_src_jsscript.h
@@ -5,8 +5,8 @@
 # Parent  284ebc48b2cb8e35dc04482ede700e717d8d214f
 Bug 662962 - Silence the clang warnings issued because of alignment requirements increase when compiling jsscript.h; r=Waldo
 
---- deps/mozilla/js/src/jsscript.h.orig	2011-04-01 06:08:36.000000000 +1100
-+++ deps/mozilla/js/src/jsscript.h	2013-05-26 00:23:16.202260566 +1000
+--- deps/mozilla/js/src/jsscript.h.orig	2011-03-31 19:08:36 UTC
++++ deps/mozilla/js/src/jsscript.h
 @@ -496,32 +496,32 @@
  
      JSObjectArray *objects() {
diff --git a/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp b/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp
index bfd9c10150f8..0ada310b0206 100644
--- a/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp
+++ b/games/oolite/files/patch-deps_mozilla_js_src_jsstr.cpp
@@ -5,8 +5,8 @@
 # Parent  cecc5adfc44068fb6f11b9baa78cb5fddc100b27
 Bug 662961 - Silence the clang warnings issued because of alignment requirements increase when compiling jsstr.cpp; r=Waldo
 
---- deps/mozilla/js/src/jsstr.cpp.orig	2013-05-26 00:44:33.383765764 +1000
-+++ deps/mozilla/js/src/jsstr.cpp	2013-05-26 00:46:35.842211859 +1000
+--- deps/mozilla/js/src/jsstr.cpp.orig	2013-05-25 14:44:33 UTC
++++ deps/mozilla/js/src/jsstr.cpp
 @@ -3147,7 +3147,7 @@
   */
  #define R(c) {                                                                \
diff --git a/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m b/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m
deleted file mode 100644
index 8748d58b839b..000000000000
--- a/games/oolite/files/patch-src_Core_Materials_OOPNGTextureLoader.m
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Core/Materials/OOPNGTextureLoader.m.orig	2014-06-30 08:50:36 UTC
-+++ src/Core/Materials/OOPNGTextureLoader.m
-@@ -31,9 +31,6 @@ SOFTWARE.
- #import "OOCPUInfo.h"
- #import "NSDataOOExtensions.h"
- 
--void png_error(png_structp, png_const_charp) NO_RETURN_FUNC;
--
--
- static void PNGError(png_structp png, png_const_charp message);
- static void PNGWarning(png_structp png, png_const_charp message);
- static void PNGRead(png_structp png, png_bytep bytes, png_size_t size);
diff --git a/games/oolite/files/patch-src_Core_OOMaths.h b/games/oolite/files/patch-src_Core_OOMaths.h
index 1901079b124e..b37760140876 100644
--- a/games/oolite/files/patch-src_Core_OOMaths.h
+++ b/games/oolite/files/patch-src_Core_OOMaths.h
@@ -1,5 +1,5 @@
---- src/Core/OOMaths.h.orig	2014-06-30 12:50:36.000000000 +0400
-+++ src/Core/OOMaths.h	2014-10-14 07:20:31.000000000 +0400
+--- src/Core/OOMaths.h.orig	2014-06-30 08:50:36 UTC
++++ src/Core/OOMaths.h
 @@ -48,7 +48,8 @@
  #endif
  
diff --git a/games/oolite/files/patch-src_Core_OOOXZManager.m b/games/oolite/files/patch-src_Core_OOOXZManager.m
deleted file mode 100644
index 3c97079dd83a..000000000000
--- a/games/oolite/files/patch-src_Core_OOOXZManager.m
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/Core/OOOXZManager.m.orig	2014-06-30 12:50:36.000000000 +0400
-+++ src/Core/OOOXZManager.m	2014-09-25 08:46:25.000000000 +0400
-@@ -215,13 +215,45 @@
- 	}
- 	if (!exists)
- 	{
-+#if OOLITE_MAC_OS_X
- 		if (![fmgr oo_createDirectoryAtPath:path attributes:nil])
- 		{
- 			OOLog(kOOOXZErrorLog, @"Could not create folder %@.", path);
- 			return NO;
- 		}
-+#else
-+		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES);
-+		NSString *appPath = [paths objectAtIndex:0];
-+		if (appPath == nil)
-+		{
-+			OOLog(kOOOXZErrorLog, @"Could not create folder %@.", path);
-+			return NO;
-+		}
-+		else
-+		{
-+			if (![fmgr fileExistsAtPath:appPath] && ![fmgr oo_createDirectoryAtPath:appPath attributes:nil])
-+			{
-+				OOLog(kOOOXZErrorLog, @"Could not create folder %@.", path);
-+				return NO;
-+			}
-+			appPath = [appPath stringByAppendingPathComponent:@"Oolite"];
-+			if (![fmgr fileExistsAtPath:appPath] && ![fmgr oo_createDirectoryAtPath:appPath attributes:nil])
-+			{
-+				OOLog(kOOOXZErrorLog, @"Could not create folder %@.", path);
-+				return NO;
-+			}
-+			/* GNUStep uses "ApplicationSupport" rather than "Application
-+			 * Support" so match convention by not putting a space in the
-+			 * path either */
-+			appPath = [appPath stringByAppendingPathComponent:@"ManagedAddOns"];
-+			if (![fmgr fileExistsAtPath:appPath] && ![fmgr oo_createDirectoryAtPath:appPath attributes:nil])
-+			{
-+				OOLog(kOOOXZErrorLog, @"Could not create folder %@.", path);
-+				return NO;
-+			}
-+		}
-+#endif
- 	}
--	
- 	return YES;
- }
- 
diff --git a/games/oolite/files/patch-src_Core_OOPointMaths.h b/games/oolite/files/patch-src_Core_OOPointMaths.h
index 7cf3832b7a69..a5510133338c 100644
--- a/games/oolite/files/patch-src_Core_OOPointMaths.h
+++ b/games/oolite/files/patch-src_Core_OOPointMaths.h
@@ -1,5 +1,5 @@
---- src/Core/OOPointMaths.h.orig	2014-06-30 12:50:36.000000000 +0400
-+++ src/Core/OOPointMaths.h	2014-10-16 13:51:36.000000000 +0400
+--- src/Core/OOPointMaths.h.orig	2014-06-30 08:50:36 UTC
++++ src/Core/OOPointMaths.h
 @@ -1,5 +1,6 @@
  #import "OOFunctionAttributes.h"
 -#include <tgmath.h>