git: 4f45b37954e4 - main - textproc/zorba: Remove expired port

From: Rene Ladan <rene_at_FreeBSD.org>
Date: Sat, 01 Mar 2025 16:12:49 UTC
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f45b37954e46919a91256ccd64e64df2652ce72

commit 4f45b37954e46919a91256ccd64e64df2652ce72
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2025-03-01 16:11:51 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2025-03-01 16:12:41 +0000

    textproc/zorba: Remove expired port
    
    2025-02-28 textproc/zorba: Unmaintained, outdated and fails to build with ICU 76.1
---
 MOVED                                              |   1 +
 textproc/Makefile                                  |   1 -
 textproc/zorba/Makefile                            | 112 ------
 textproc/zorba/distinfo                            |   2 -
 textproc/zorba/files/patch-CMakeLists.txt          |  46 ---
 .../patch-bin-debugger_command_line_handler.cpp    |  11 -
 textproc/zorba/files/patch-bin-debugger_main.cpp   |  12 -
 textproc/zorba/files/patch-bin_zorbacmd.cpp        |  11 -
 .../files/patch-cmake_modules_CMakeUseBison.cmake  |  25 --
 .../files/patch-cmake_modules_CMakeUseFlex.cmake   |  30 --
 .../zorba/files/patch-cmake_modules_FindPHP5.cmake |  40 ---
 .../zorba/files/patch-cmake_modules_FindSWIG.cmake |  11 -
 .../files/patch-doc-zorba-xqdoc_CMakeLists.txt     |  36 --
 textproc/zorba/files/patch-doc_CMakeLists.txt      |  37 --
 textproc/zorba/files/patch-icu68                   |  67 ----
 .../zorba/files/patch-include-zorba-config.h.cmake |  11 -
 .../zorba/files/patch-include-zorba-util_time.h    |  14 -
 ...xquery-www-modules-datetime.xq.src_datetime.cpp |  41 ---
 .../files/patch-src-context_dynamic_context.cpp    |  38 ---
 .../zorba/files/patch-src-store-api_item_handle.h  |  11 -
 textproc/zorba/files/patch-src-util_atomic_int.h   | 138 --------
 .../zorba/files/patch-src-util_string_util.cpp     |  48 ---
 textproc/zorba/files/patch-src-util_tracer.h       |  17 -
 textproc/zorba/files/patch-src__api__auditimpl.h   |  10 -
 textproc/zorba/files/patch-src_types_casting.cpp   | 269 ---------------
 .../zorba/files/patch-swig-java_CMakeLists.txt     |  40 ---
 textproc/zorba/files/patch-swig-php_CMakeLists.txt |  33 --
 .../zorba/files/patch-swig-python_CMakeLists.txt   |  26 --
 .../zorba/files/patch-swig-ruby_CMakeLists.txt     |  30 --
 textproc/zorba/files/patch-swig-xqj_CMakeLists.txt |  17 -
 textproc/zorba/files/patch-swig_ZorbaIOStream.i    |  18 -
 .../zorba/files/patch-swig_python_zorba__api.i     |  20 --
 .../patch-test-rbkt-modules-java_CMakeLists.txt    |  16 -
 .../zorba/files/patch-test-rbkt_CMakeLists.txt     |  11 -
 textproc/zorba/pkg-descr                           |   7 -
 textproc/zorba/pkg-plist                           | 378 ---------------------
 36 files changed, 1 insertion(+), 1634 deletions(-)

diff --git a/MOVED b/MOVED
index 7188489a58fd..1712011810c4 100644
--- a/MOVED
+++ b/MOVED
@@ -4176,3 +4176,4 @@ www/py-jsonfield||2025-02-28|Remove expired port
 devel/rubygem-aws-sdk-iot1clickdevicesservice||2025-02-28|Remove expired port
 devel/rubygem-aws-sdk-iot1clickprojects||2025-02-28|Remove expired port
 databases/postgis31||2025-03-01|Has expired: Please use newer versions
+textproc/zorba||2025-03-01|Has expired: Unmaintained, outdated and fails to build with ICU 76.1
diff --git a/textproc/Makefile b/textproc/Makefile
index 095ebe71482a..8e49965e6cd4 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -2223,7 +2223,6 @@
     SUBDIR += ytt
     SUBDIR += zed
     SUBDIR += zenxml
-    SUBDIR += zorba
     SUBDIR += zq
     SUBDIR += zu-aspell
     SUBDIR += zu-hunspell
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
deleted file mode 100644
index 77d86ebbcdfe..000000000000
--- a/textproc/zorba/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-PORTNAME=	zorba
-PORTVERSION=	2.7.0
-PORTREVISION=	42
-CATEGORIES=	textproc java
-MASTER_SITES=	https://launchpadlibrarian.net/119058962/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	General purpose C++ XQuery processor
-WWW=		http://www.zorba.io/
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-DEPRECATED=	Unmaintained, outdated and fails to build with ICU 76.1
-EXPIRATION_DATE=2025-02-28
-
-LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
-		libicudata.so:devel/icu \
-		libcurl.so:ftp/curl \
-		libtidy5.so:www/tidy-html5 \
-		libuuid.so:misc/e2fsprogs-libuuid
-RUN_DEPENDS=	fop:textproc/fop
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS DOXYGEN
-OPTIONS_SUB=	yes
-
-DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS+=	doxygen:devel/doxygen
-JAVA_CATEGORIES=	java
-JAVA_USES=		java
-JAVA_CMAKE_BOOL=	WITH_JAVA
-JAVA_CMAKE_ON=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
-JAVA_CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
-JAVA_VARS=		WITH_SWIG=yes
-PHP_CMAKE_BOOL=		WITH_PHP5
-PYTHON_CMAKE_BOOL=	WITH_PYTHON
-RUBY_CMAKE_BOOL=	WITH_RUBY
-
-# Both install include/xqc.h
-CONFLICTS=	xqilla
-CONFLICTS_BUILD=	bison
-
-USES=		cmake compiler:c++11-lib gnome libedit
-USE_GNOME=	libxml2 libxslt
-USE_LDCONFIG=	yes
-USE_CXXSTD=	c++11
-CXXFLAGS+=	-DU_USING_ICU_NAMESPACE=1
-CXXFLAGS+=	-I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT
-LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		-DLOCALBASE:STRING=${LOCALBASE}
-
-MAKE_JOBS_UNSAFE=	yes # due to consistent failures in bison-generated code compilation
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-
-PLIST_SUB+=	FULLVERSION=${PORTVERSION} \
-		MIDVERSION=${PORTVERSION:R} \
-		MINVERSION=${PORTVERSION:R:R}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPHP}
-USE_PHP=	tokenizer
-USES+=		php:build
-WITH_SWIG=	yes
-CMAKE_ARGS+=	-DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}"
-PLIST_SUB+=	PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}"
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+=		python
-WITH_SWIG=	yes
-CMAKE_ARGS+=	-DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
-PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}
-BROKEN=		Does not stage
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-USES+=	ruby
-WITH_SWIG=	yes
-.endif
-
-.if defined(WITH_SWIG)
-BUILD_DEPENDS+=	swig:devel/swig
-.endif
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/cmake_modules/FindPHP5.cmake
-
-post-patch-DOCS-on:
-	${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \
-		${WRKSRC}/CMakeLists.txt
-
-post-install:
-	${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
-
-post-install-DOCS-on:
-.if !${PORT_OPTIONS:MDOXYGEN}
-	cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba
-.endif
-
-test:	build
-	cd ${BUILD_WRKSRC} && ${MAKE} test
-
-.include <bsd.port.mk>
diff --git a/textproc/zorba/distinfo b/textproc/zorba/distinfo
deleted file mode 100644
index 937a6ff45b78..000000000000
--- a/textproc/zorba/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (zorba-src-2.7.0.tar.gz) = d9b16fb231b45640fd94107b8b8f753650c3f87a2d75323a0527b8ee96b5d18c
-SIZE (zorba-src-2.7.0.tar.gz) = 12867394
diff --git a/textproc/zorba/files/patch-CMakeLists.txt b/textproc/zorba/files/patch-CMakeLists.txt
deleted file mode 100644
index 6a53f85f2d92..000000000000
--- a/textproc/zorba/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- CMakeLists.txt.orig	2012-06-13 06:56:48.000000000 +0200
-+++ CMakeLists.txt	2012-06-22 10:45:57.000000000 +0200
-@@ -39,6 +39,10 @@
-   SET(LINUX "${CMAKE_SYSTEM}")
- ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- 
-+IF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
-+    SET(FREEBSD "${CMAKE_SYSTEM}")
-+ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
-+
- # custom ctest options
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake)
- 
-@@ -317,14 +321,21 @@
- ENDIF(WIN32)
- 
- #
-+# execinfo
-+#
-+IF(FREEBSD)
-+   SET(requiredlibs ${requiredlibs} "/usr/lib/libexecinfo.so")
-+ENDIF(FREEBSD)
-+
-+#
- # SWIG
- #
- IF (NOT ZORBA_SUPPRESS_SWIG)
-   FIND_PACKAGE (SWIG)
- 
--  COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "1.3.40" result)
-+  COMPARE_VERSION_STRINGS("${SWIG_VERSION}" "2.0.7" result)
-   IF(result LESS 0)
--    MESSAGE(WARNING "You need at least SWIG version 1.3.40")
-+    MESSAGE(WARNING "You need at least SWIG version 2.0.7")
-   ENDIF(result LESS 0)
- 
- 
-@@ -504,7 +515,7 @@
-   SET(ZORBA_CMAKE_DIR "cmake" CACHE STRING
-     "Relative path to CMake files in Zorba installation")
- ELSE (WIN32)
--  SET(ZORBA_CMAKE_DIR "share/cmake/zorba-${ZORBA_VERSION}" CACHE STRING
-+  SET(ZORBA_CMAKE_DIR "share/cmake/Modules/zorba-${ZORBA_VERSION}" CACHE STRING
-     "Relative path to CMake files in Zorba installation")
- ENDIF (WIN32)
- 
diff --git a/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp b/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp
deleted file mode 100644
index d16bd1ad0dad..000000000000
--- a/textproc/zorba/files/patch-bin-debugger_command_line_handler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/debugger/command_line_handler.cpp.orig	2014-06-26 18:42:05.000000000 +0200
-+++ bin/debugger/command_line_handler.cpp	2014-06-26 18:40:21.000000000 +0200
-@@ -138,7 +138,7 @@
- 
- template<>
- void
--CommandLineHandler::handle<BreakpointSet>(std::tr1::tuple<bstring, bstring, bint> &aTuple)
-+CommandLineHandler::handle<BreakpointSet>(ZORBA_TR1_NS::tuple<bstring, bstring, bint> &aTuple)
- {
-   DebuggerClient::BreakpointType lType = DebuggerClient::Line;
-   bool lEnabled = true;
diff --git a/textproc/zorba/files/patch-bin-debugger_main.cpp b/textproc/zorba/files/patch-bin-debugger_main.cpp
deleted file mode 100644
index 6ff3f76ee35f..000000000000
--- a/textproc/zorba/files/patch-bin-debugger_main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- bin/debugger/main.cpp.orig	2012-10-04 00:35:17.000000000 +0200
-+++ bin/debugger/main.cpp	2014-09-11 15:46:51.000000000 +0200
-@@ -22,6 +22,9 @@
- #include <unistd.h>
- #endif
- 
-+#include <signal.h>
-+#include <stdlib.h>
-+
- #include <vector>
- 
- #include <zorba/config.h>
diff --git a/textproc/zorba/files/patch-bin_zorbacmd.cpp b/textproc/zorba/files/patch-bin_zorbacmd.cpp
deleted file mode 100644
index b0eb2e126c5e..000000000000
--- a/textproc/zorba/files/patch-bin_zorbacmd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/zorbacmd.cpp.orig	2014-09-12 09:26:04.000000000 +0200
-+++ bin/zorbacmd.cpp	2014-09-12 09:26:23.000000000 +0200
-@@ -16,6 +16,8 @@
- 
- #include "zorbacmdproperties.h"
- 
-+#include <stdlib.h>
-+
- #include <memory>
- #include <iostream>
- #include <fstream>
diff --git a/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake b/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake
deleted file mode 100644
index 309ed7cffa1f..000000000000
--- a/textproc/zorba/files/patch-cmake_modules_CMakeUseBison.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake_modules/CMakeUseBison.cmake.orig	2012-06-28 14:18:14.000000000 +0200
-+++ cmake_modules/CMakeUseBison.cmake	2012-06-28 14:18:33.000000000 +0200
-@@ -40,7 +40,9 @@
- IF(NOT BISON_EXECUTABLE)
-   MESSAGE(STATUS "Looking for bison")
-   FIND_PROGRAM(BISON_EXECUTABLE bison)
--  IF(BISON_EXECUTABLE)
-+ENDIF(NOT BISON_EXECUTABLE)
-+
-+IF(BISON_EXECUTABLE)
-     EXEC_PROGRAM(
- 	    	${BISON_EXECUTABLE}  
-         	ARGS --version
-@@ -55,9 +57,8 @@
-   ELSE (BISON_EXECUTABLE)
-   	SET (BISON_MAJOR_VERSION "0")
- 	SET (BISON_MINOR_VERSION "0")
--  ENDIF(BISON_EXECUTABLE)
--  SET (BISON_VERSION_FULL ${BISON_MAJOR_VERSION}.${BISON_MINOR_VERSION} CACHE STRING "The Bison version"  FORCE)
--ENDIF(NOT BISON_EXECUTABLE)
-+ENDIF(BISON_EXECUTABLE)
-+SET (BISON_VERSION_FULL ${BISON_MAJOR_VERSION}.${BISON_MINOR_VERSION} CACHE STRING "The Bison version"  FORCE)
- 
- IF(BISON_EXECUTABLE)
-   MACRO(BISON_FILE FILENAME)
diff --git a/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake b/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
deleted file mode 100644
index 1fbc85e7a003..000000000000
--- a/textproc/zorba/files/patch-cmake_modules_CMakeUseFlex.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
---- cmake_modules/CMakeUseFlex.cmake.orig	2012-10-04 00:35:17.000000000 +0200
-+++ cmake_modules/CMakeUseFlex.cmake	2012-10-30 09:45:22.000000000 +0100
-@@ -30,7 +30,9 @@
- IF(NOT FLEX_EXECUTABLE)
-   MESSAGE(STATUS "Looking for flex")
-   FIND_PROGRAM(FLEX_EXECUTABLE flex)
--  IF(FLEX_EXECUTABLE)
-+ENDIF(NOT FLEX_EXECUTABLE)
-+
-+IF(FLEX_EXECUTABLE)
-     EXEC_PROGRAM(
-             ${FLEX_EXECUTABLE}
-             ARGS --version
-@@ -51,13 +53,12 @@
-     GET_FILENAME_COMPONENT(_flex_hint "${_flex_path}/../include" ABSOLUTE)
-     FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h HINTS "${_flex_hint}")
- 
--  ELSE (FLEX_EXECUTABLE)
-+ELSE (FLEX_EXECUTABLE)
-     SET (FLEX_MAJOR_VERSION "0")
-     SET (FLEX_MINOR_VERSION "0")
-     SET (FLEX_REVISION_VERSION "0")
--  ENDIF(FLEX_EXECUTABLE)
--  SET (FLEX_VERSION_FULL ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_REVISION_VERSION} CACHE STRING "The Flex version" FORCE)
--ENDIF(NOT FLEX_EXECUTABLE)
-+ENDIF(FLEX_EXECUTABLE)
-+SET (FLEX_VERSION_FULL ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_REVISION_VERSION} CACHE STRING "The Flex version" FORCE)
- 
- IF(FLEX_EXECUTABLE)
-   MACRO(FLEX_FILE FILENAME)
diff --git a/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake b/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake
deleted file mode 100644
index e5f10f69f3d9..000000000000
--- a/textproc/zorba/files/patch-cmake_modules_FindPHP5.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
---- cmake_modules/FindPHP5.cmake.orig	2012-06-21 09:33:11.000000000 +0200
-+++ cmake_modules/FindPHP5.cmake	2012-06-21 09:34:40.000000000 +0200
-@@ -27,15 +27,11 @@
- SET(PHP5_FOUND "NO")
- 
- SET(PHP5_POSSIBLE_INCLUDE_PATHS
--  /usr/include/php5
--  /usr/local/include/php5
--  /usr/include/php
--  /usr/local/include/php
--  /usr/local/apache/php
-+  %%LOCALBASE%%/include/php
-   )
- 
- SET(PHP5_POSSIBLE_LIB_PATHS
--  /usr/lib
-+  %%LOCALBASE%%/lib/php
-   )
- 
- #FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h
-@@ -52,8 +48,7 @@
- FIND_PROGRAM(PHP5_EXECUTABLE
-   NAMES php5 php
-   PATHS
--  /usr/bin
--  /usr/local/bin
-+  %%LOCALBASE%%/bin
-   ${PHP5_BINARY_DIR}
-   )
- MESSAGE(STATUS "Executable: " ${PHP5_EXECUTABLE})
-@@ -116,8 +111,7 @@
- FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
-   NAMES php5-config php-config
-   PATHS
--  /usr/bin
--  /usr/local/bin
-+  %%LOCALBASE%%/bin
-   )
- 
- EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
diff --git a/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake b/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake
deleted file mode 100644
index fc8d59bc8c2b..000000000000
--- a/textproc/zorba/files/patch-cmake_modules_FindSWIG.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake_modules/FindSWIG.cmake.orig	2012-06-22 10:40:43.000000000 +0200
-+++ cmake_modules/FindSWIG.cmake	2012-06-22 10:45:35.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- SET(SWIG_FOUND FALSE)
- 
--FIND_PROGRAM(SWIG_EXECUTABLE swig)
-+FIND_PROGRAM(SWIG_EXECUTABLE swig2.0)
- 
- IF(SWIG_EXECUTABLE)
-   EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib
diff --git a/textproc/zorba/files/patch-doc-zorba-xqdoc_CMakeLists.txt b/textproc/zorba/files/patch-doc-zorba-xqdoc_CMakeLists.txt
deleted file mode 100644
index ee5eebbb75c5..000000000000
--- a/textproc/zorba/files/patch-doc-zorba-xqdoc_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- doc/zorba/xqdoc/CMakeLists.txt.orig	2011-11-29 15:09:45.000000000 +0100
-+++ doc/zorba/xqdoc/CMakeLists.txt	2011-11-29 15:10:06.000000000 +0100
-@@ -17,28 +17,28 @@
- ELSE(NOT ZORBA_WITH_FILE_ACCESS)
- 
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images
--        DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites
-+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites
-         COMPONENT "doc"
-         PATTERN "*.svn" EXCLUDE
-         )
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib
--        DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites
-+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites
-         COMPONENT "doc"
-         PATTERN "*.svn" EXCLUDE
-         )
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/styles
--        DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites 
-+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites 
-         COMPONENT "doc"
-         PATTERN "*.svn" EXCLUDE
-         )
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/templates
--        DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites  
-+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/requisites  
-         COMPONENT "doc"
-         PATTERN "*.svn" EXCLUDE
-         )
- INSTALL(FILES src/xqdoc-html.xq
-               src/xqdoc-xml.xq
--        DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/generator/ 
-+        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqdoc/generator/ 
-         COMPONENT "doc"
-         )
- 
diff --git a/textproc/zorba/files/patch-doc_CMakeLists.txt b/textproc/zorba/files/patch-doc_CMakeLists.txt
deleted file mode 100644
index 7b49a9cfbe37..000000000000
--- a/textproc/zorba/files/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/CMakeLists.txt.orig	2012-08-08 17:14:01.000000000 +0200
-+++ doc/CMakeLists.txt	2012-09-19 17:26:59.000000000 +0200
-@@ -39,12 +39,19 @@
- ADD_SUBDIRECTORY(c)
- 
- IF (SWIG_FOUND)
--  ADD_SUBDIRECTORY(java)
-+  IF (WITH_JAVA)
-+    ADD_SUBDIRECTORY(java)
-+  ENDIF ()
-   ADD_SUBDIRECTORY(xqj)
--  ADD_SUBDIRECTORY(python)
--  ADD_SUBDIRECTORY(ruby)
--  ADD_SUBDIRECTORY(php)
--  ADD_SUBDIRECTORY(csharp)
-+  IF (WITH_PYTHON)
-+    ADD_SUBDIRECTORY(python)
-+  ENDIF ()
-+  IF (WITH_RUBY)
-+    ADD_SUBDIRECTORY(ruby)
-+  ENDIF ()
-+  IF (WITH_PHP)
-+    ADD_SUBDIRECTORY(php)
-+  ENDIF ()
-   
- ENDIF (SWIG_FOUND)
- 
-@@ -98,9 +105,6 @@
-         COMPONENT "doc"
-         DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/xqj)
-         
--  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csharp/html 
--        COMPONENT "doc"
--        DESTINATION share/doc/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER}/csharp)        
- ENDIF (SWIG_FOUND)
- 
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zorba/html 
diff --git a/textproc/zorba/files/patch-icu68 b/textproc/zorba/files/patch-icu68
deleted file mode 100644
index de4bce3f5277..000000000000
--- a/textproc/zorba/files/patch-icu68
+++ /dev/null
@@ -1,67 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-src/util/regex.cpp:454:33: error: use of undeclared identifier 'TRUE'
-  return U_SUCCESS( status ) == TRUE;
-                                ^
-src/util/unicode_util.cpp:2229:33: error: use of undeclared identifier 'TRUE'
-  return U_SUCCESS( status ) == TRUE;
-                                ^
-src/util/unicode_util.cpp:2250:33: error: use of undeclared identifier 'TRUE'
-  return U_SUCCESS( status ) == TRUE;
-                                ^
-src/util/unicode_util.cpp:2292:33: error: use of undeclared identifier 'TRUE'
-  return U_SUCCESS( status ) == TRUE;
-                                ^
-src/util/unicode_util.cpp:2301:33: error: use of undeclared identifier 'TRUE'
-  return U_SUCCESS( status ) == TRUE;
-                                ^
-
---- src/util/regex.cpp.orig	2012-10-03 22:35:16 UTC
-+++ src/util/regex.cpp
-@@ -451,7 +451,7 @@ bool regex::replace_all( string const &in, string cons
-   matcher_->reset( in );
-   UErrorCode status = U_ZERO_ERROR;
-   *out = matcher_->replaceAll( replacement, status );
--  return U_SUCCESS( status ) == TRUE;
-+  return U_SUCCESS( status ) == true;
- }
- 
- bool regex::replace_all( char const *in, char const *replacement,
---- src/util/unicode_util.cpp.orig	2012-10-03 22:35:16 UTC
-+++ src/util/unicode_util.cpp
-@@ -2226,7 +2226,7 @@ bool normalize( string const &in, normalization::type 
-     default                 : icu_mode = UNORM_NONE; break;
-   }
-   Normalizer::normalize( in, icu_mode, 0, *out, status );
--  return U_SUCCESS( status ) == TRUE;
-+  return U_SUCCESS( status ) == true;
- }
- 
- bool strip_diacritics( string const &in, string *out ) {
-@@ -2247,7 +2247,7 @@ bool to_char( char const *in, char_type *out ) {
-   u_strFromUTF8WithSub(
-     out, 1, nullptr, in, utf8::char_length( *in ), SubChar, nullptr, &status
-   );
--  return U_SUCCESS( status ) == TRUE;
-+  return U_SUCCESS( status ) == true;
- }
- 
- #endif /* ZORBA_NO_ICU */
-@@ -2289,7 +2289,7 @@ bool to_string( char const *in, size_type in_len, stri
-   UErrorCode status = U_ZERO_ERROR;
-   u_strFromUTF8( buf, in_len + 1, &buf_len, in, in_len, &status );
-   out->releaseBuffer( buf_len );
--  return U_SUCCESS( status ) == TRUE;
-+  return U_SUCCESS( status ) == true;
- }
- 
- bool to_string( wchar_t const *in, size_type in_len, string *out ) {
-@@ -2298,7 +2298,7 @@ bool to_string( wchar_t const *in, size_type in_len, s
-   size_type buf_len;
-   u_strFromWCS( buf, in_len + 1, &buf_len, in, in_len, &status );
-   out->releaseBuffer( buf_len );
--  return U_SUCCESS( status ) == TRUE;
-+  return U_SUCCESS( status ) == true;
- }
- 
- #endif /* ZORBA_NO_ICU */
diff --git a/textproc/zorba/files/patch-include-zorba-config.h.cmake b/textproc/zorba/files/patch-include-zorba-config.h.cmake
deleted file mode 100644
index b7fbba08339d..000000000000
--- a/textproc/zorba/files/patch-include-zorba-config.h.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/zorba/config.h.cmake.orig	2014-06-13 15:08:16.000000000 +0200
-+++ include/zorba/config.h.cmake	2014-06-13 15:08:29.000000000 +0200
-@@ -126,7 +126,7 @@
- 
- ////////// C++ tr1 include directory & namespace //////////////////////////////
- 
--#if defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 430)
-+#if !defined(__clang__) && defined( __GNUC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 430)
- # define ZORBA_GCC_OLDER_THAN_430 1
- #endif
- 
diff --git a/textproc/zorba/files/patch-include-zorba-util_time.h b/textproc/zorba/files/patch-include-zorba-util_time.h
deleted file mode 100644
index 58299aec7b39..000000000000
--- a/textproc/zorba/files/patch-include-zorba-util_time.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/zorba/util/time.h.orig	2011-09-15 11:16:07.000000000 +0200
-+++ include/zorba/util/time.h	2011-09-15 11:19:48.000000000 +0200
-@@ -73,7 +73,11 @@
- 
-     inline void get_current_cputime (cputime& t)
-     {
-+#if defined( __FreeBSD__ )
-+      clock_gettime(CLOCK_PROF, &t);
-+#else
-       clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t);
-+#endif
-     }
- 
- #elif defined(ZORBA_HAVE_RUSAGE_FUNCTION)
diff --git a/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp b/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp
deleted file mode 100644
index b586666cf870..000000000000
--- a/textproc/zorba/files/patch-modules-com-zorba-xquery-www-modules-datetime.xq.src_datetime.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp.orig	2012-06-21 11:21:17.000000000 +0200
-+++ ./modules/com/zorba-xquery/www/modules/datetime.xq.src/datetime.cpp	2012-06-21 11:03:07.000000000 +0200
-@@ -19,7 +19,9 @@
- #include <zorba/singleton_item_sequence.h>
- 
- #include <time.h>
-+#ifdef WIN21
- #include <sys/timeb.h>
-+#endif
- #ifdef UNIX
- #include <sys/time.h>
- #endif
-@@ -40,16 +42,21 @@
-   lSummerTimeShift = -timebuffer.timezone * 60;
-   if (gmtm.tm_isdst != 0)
-     lSummerTimeShift += 3600;
--#else
--  struct timeb timebuffer;
--  ftime( &timebuffer );
--  localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
--  localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
--  lSummerTimeShift = gmtm.tm_gmtoff;
--#endif
- 
-   timezone = lSummerTimeShift; // in seconds
-   millitm = timebuffer.millitm;
-+#else
-+  struct timeval tv;
-+  struct timezone tz;
-+  gettimeofday( &tv, &tz );
-+  localtime_r(&tv.tv_sec, &gmtm); //thread safe localtime on Unix
-+
-+  if (tz.tz_dsttime != 0)
-+     lSummerTimeShift = 3600;
-+
-+  timezone = -tz.tz_minuteswest * 60 + lSummerTimeShift; // in seconds
-+  millitm = tv.tv_usec / 1000;
-+#endif
- }
- 
- /******************************************************************************
diff --git a/textproc/zorba/files/patch-src-context_dynamic_context.cpp b/textproc/zorba/files/patch-src-context_dynamic_context.cpp
deleted file mode 100644
index 8f0d625d2cb7..000000000000
--- a/textproc/zorba/files/patch-src-context_dynamic_context.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/context/dynamic_context.cpp.orig	2012-06-13 06:56:48.000000000 +0200
-+++ src/context/dynamic_context.cpp	2012-06-21 09:49:08.000000000 +0200
-@@ -18,7 +18,9 @@
- #include "common/common.h"
- #include <assert.h>
- #include <time.h>
-+#ifdef WIN32
- #include <sys/timeb.h>
-+#endif
- #ifdef UNIX
- #include <sys/time.h>
- #include <unistd.h>
-@@ -238,10 +240,10 @@
-   if (gmtm.tm_isdst != 0)
-     lTimeShift += 3600;
- #else
--  struct timeb timebuffer;
--  ftime( &timebuffer );
-+  struct timeval tv;
-+  gettimeofday( &tv, 0 );
-   struct ::tm gmtm;
--  localtime_r(&timebuffer.time, &gmtm); //thread safe localtime on Linux
-+  localtime_r(&tv.tv_sec, &gmtm); //thread safe localtime on Linux
-   lTimeShift = gmtm.tm_gmtoff;
- #endif
- 
-@@ -253,7 +255,11 @@
-                                    static_cast<short>(gmtm.tm_mday),
-                                    static_cast<short>(gmtm.tm_hour),
-                                    static_cast<short>(gmtm.tm_min),
-+#ifdef WIN32
-                                    gmtm.tm_sec + timebuffer.millitm/1000.0,
-+#else
-+                                   gmtm.tm_sec + tv.tv_usec/1000000.0,
-+#endif
-                                    static_cast<short>(theTimezone/3600));
- 
- }
diff --git a/textproc/zorba/files/patch-src-store-api_item_handle.h b/textproc/zorba/files/patch-src-store-api_item_handle.h
deleted file mode 100644
index 8746ce262b4a..000000000000
--- a/textproc/zorba/files/patch-src-store-api_item_handle.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/store/api/item_handle.h.orig	2014-06-13 15:24:23.000000000 +0200
-+++ src/store/api/item_handle.h	2014-06-13 15:34:05.000000000 +0200
-@@ -16,6 +16,8 @@
- #ifndef ZORBA_STORE_ITEM_HANDLE_H
- #define ZORBA_STORE_ITEM_HANDLE_H
- 
-+#include <string>
-+#include <sstream>
- 
- 
- namespace zorba 
diff --git a/textproc/zorba/files/patch-src-util_atomic_int.h b/textproc/zorba/files/patch-src-util_atomic_int.h
deleted file mode 100644
index dccd2c102081..000000000000
--- a/textproc/zorba/files/patch-src-util_atomic_int.h
+++ /dev/null
@@ -1,138 +0,0 @@
---- src/util/atomic_int.h.orig	2011-09-15 10:09:31.000000000 +0200
-+++ src/util/atomic_int.h	2011-09-15 11:15:19.000000000 +0200
-@@ -27,7 +27,10 @@
- // Test first for and prefer gcc's atomic operations over all others since
- // they're an order of magnitude faster.
- //
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+# include <sys/types.h>
-+# include <machine/atomic.h>
-+#elif defined( __GNUC__ )
- # if __GNUC__ * 100 + __GNUC_MINOR__ >= 402
- #   include <ext/atomicity.h>
- # else
-@@ -40,9 +43,6 @@
- # endif
- #elif defined( __APPLE__ )
- # include <libkern/OSAtomic.h>
--#elif defined( __FreeBSD__ )
--# include <sys/types.h>
--# include <machine/atomic.h>
- #elif defined( __NetBSD__ )
- # include <sys/atomic.h>
- #elif defined( __SOLARIS__ )
-@@ -66,12 +66,12 @@
-  */
- class atomic_int {
- public:
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+  typedef int value_type;
-+#elif defined( __GNUC__ )
-   typedef _Atomic_word value_type;
- #elif defined( __APPLE__ ) || defined( __NetBSD__ ) || defined( __SOLARIS__ )
-   typedef int32_t value_type;
--#elif defined( __FreeBSD__ )
--  typedef int value_type;
- #elif defined( _WIN32 )
-   typedef LONG value_type;
- #endif
-@@ -172,7 +172,7 @@
- 
-   value_type load_impl() const {
- #if defined( __FreeBSD__ )
--    return atomic_load_acq_int( &value_ );
-+    return atomic_load_acq_int( (volatile u_int *)&value_ );
- #else
-     value_type const temp = *(value_type volatile*)&value_;
- # if defined( __GNUC__ )
-@@ -192,7 +192,7 @@
- 
-   void store_impl( value_type n ) {
- #if defined( __FreeBSD__ )
--    atomic_store_rel_int( &value_, n );
-+    atomic_store_rel_int( (volatile u_int *)&value_, n );
- #elif defined( _WIN32 )
-     InterlockedExchange( &value_, n );
- #else
-@@ -210,12 +210,12 @@
-   }
- 
-   value_type add( value_type n ) {
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+    return atomic_fetchadd_int( (volatile u_int*)&value_, n ) + n;
-+#elif defined( __GNUC__ )
-     return GNU_EXCHANGE_AND_ADD( &value_, n ) + n;
- #elif defined( __APPLE__ )
-     return OSAtomicAdd32( n, &value_ );
--#elif defined( __FreeBSD__ )
--    return atomic_fetchadd_int( &value_, n ) + n;
- #elif defined( __NetBSD__ )
-     return (value_type)atomic_add_32_nv( (uint32_t*)&value_, n );
- #elif defined( __SOLARIS__ )
-@@ -226,12 +226,12 @@
-   }
- 
-   value_type pre_dec() {
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+    return atomic_fetchadd_int( (volatile u_int *)&value_, -1 ) - 1;
-+#elif defined( __GNUC__ )
-     return GNU_EXCHANGE_AND_ADD( &value_, -1 ) - 1;
- #elif defined( __APPLE__ )
-     return OSAtomicDecrement32( &value_ );
--#elif defined( __FreeBSD__ )
--    return atomic_fetchadd_int( &value_, -1 ) - 1;
- #elif defined( __NetBSD__ )
-     return (value_type)atomic_add_int_nv( (uint32_t*)&value_, -1 );
- #elif defined( __SOLARIS__ )
-@@ -242,12 +242,12 @@
-   }
- 
-   value_type pre_inc() {
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+    return atomic_fetchadd_int( (volatile u_int *)&value_, 1 ) + 1;
-+#elif defined( __GNUC__ )
-     return GNU_EXCHANGE_AND_ADD( &value_, 1 ) + 1;
- #elif defined( __APPLE__ )
-     return OSAtomicIncrement32( &value_ );
--#elif defined( __FreeBSD__ )
--    return atomic_fetchadd_int( &value_, 1 ) + 1;
- #elif defined( __NetBSD__ )
-     return (value_type)atomic_add_int_nv( (uint32_t*)&value_, 1 );
- #elif defined( __SOLARIS__ )
-@@ -258,12 +258,12 @@
-   }
- 
-   value_type post_dec() {
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+    return atomic_fetchadd_int( (volatile u_int *)&value_, -1 );
-+#elif defined( __GNUC__ )
-     return GNU_EXCHANGE_AND_ADD( &value_, -1 );
- #elif defined( __APPLE__ )
-     return OSAtomicDecrement32( &value_ ) + 1;
--#elif defined( __FreeBSD__ )
--    return atomic_fetchadd_int( &value_, -1 );
- #elif defined( __NetBSD__ )
-     return (value_type)atomic_add_int_nv( (uint32_t*)&value_, -1 ) + 1;
- #elif defined( __SOLARIS__ )
-@@ -274,12 +274,12 @@
-   }
- 
-   value_type post_inc() {
--#if defined( __GNUC__ )
-+#if defined( __FreeBSD__ )
-+    return atomic_fetchadd_int( (volatile u_int *)&value_, 1 );
-+#elif defined( __GNUC__ )
-     return GNU_EXCHANGE_AND_ADD( &value_, 1 );
- #elif defined( __APPLE__ )
-     return OSAtomicIncrement32( &value_ ) - 1;
--#elif defined( __FreeBSD__ )
--    return atomic_fetchadd_int( &value_, 1 );
- #elif defined( __NetBSD__ )
-     return (value_type)atomic_add_int_nv( (uint32_t*)&value_, 1 ) - 1;
- #elif defined( __SOLARIS__ )
diff --git a/textproc/zorba/files/patch-src-util_string_util.cpp b/textproc/zorba/files/patch-src-util_string_util.cpp
deleted file mode 100644
index 315c9958bd7a..000000000000
--- a/textproc/zorba/files/patch-src-util_string_util.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/util/string_util.cpp.orig	2012-10-04 00:35:16.000000000 +0200
-+++ src/util/string_util.cpp	2014-09-12 11:43:08.000000000 +0200
-@@ -18,6 +18,9 @@
- #include <cerrno>
- #include <cstdlib>
- 
-+#include <stdlib.h>
-+#include <limits.h>
-+
- #include "ascii_util.h"
- #include "cxx_util.h"
- #include "string_util.h"
-@@ -92,7 +95,11 @@
- float atof( char const *s ) {
-   char *end;
-   errno = 0;
-+#ifdef WIN32
-   float result = std::strtof( s, &end );
-+#else
-+  float result = strtof( s, &end );
-+#endif
-   check_parse_number( s, end, &result );
-   return result;
- }
-@@ -100,7 +107,11 @@
- long long atoll( char const *s ) {
-   char *end;
-   errno = 0;
-+#ifdef WIN32
-   long long const result = std::strtoll( s, &end, 10 );
-+#else
-+  long long const result = strtoll( s, &end, 10 );
-+#endif
-   check_parse_number( s, end, static_cast<long long*>( nullptr ) );
-   return result;
- }
-@@ -114,7 +125,11 @@
- 
-   char *end;
-   errno = 0;
-+#ifdef WIN32
-   unsigned long long const result = std::strtoull( s, &end, 10 );
-+#else
-+  unsigned long long const result = strtoull( s, &end, 10 );
-+#endif
-   check_parse_number( s, end, static_cast<unsigned long long*>( nullptr ) );
- 
-   if ( minus && result ) {
diff --git a/textproc/zorba/files/patch-src-util_tracer.h b/textproc/zorba/files/patch-src-util_tracer.h
deleted file mode 100644
index b5cba3ace151..000000000000
--- a/textproc/zorba/files/patch-src-util_tracer.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/util/tracer.h.orig	2014-06-13 15:42:33.000000000 +0200
-+++ src/util/tracer.h	2014-06-13 15:42:58.000000000 +0200
-@@ -21,12 +21,12 @@
- 
- 
- #if !defined WIN32 && !defined WINCE
--#define TRACE __PRETTY_FUNCTION__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
-+#define TRACE __PRETTY_FUNCTION__<<" ("<<__FILE__<<':'<<std::dec<<__LINE__<<")"
- #define LOCATION	(__oss.str(""), \
-                    __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__PRETTY_FUNCTION__, \
- 									 __oss.str())
- #elif defined WIN32
--#define TRACE __FUNCSIG__<<" ("__FILE__<<':'<<std::dec<<__LINE__<<")"
-+#define TRACE __FUNCSIG__<<" ("<<__FILE__<<':'<<std::dec<<__LINE__<<")"
- #define LOCATION	(__oss.str(""), \
-                    __oss<<__FILE__<<":"<<std::dec<<__LINE__<<"::"<<__FUNCTION__, \
- 									 __oss.str())
diff --git a/textproc/zorba/files/patch-src__api__auditimpl.h b/textproc/zorba/files/patch-src__api__auditimpl.h
deleted file mode 100644
index d38fc30da312..000000000000
--- a/textproc/zorba/files/patch-src__api__auditimpl.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/api/auditimpl.h.orig	2014-09-01 14:22:29.528842989 -0400
-+++ ./src/api/auditimpl.h	2014-09-01 14:22:55.741771989 -0400
-@@ -18,6 +18,7 @@
- #ifndef ZORBA_API_AUDIT_IMPL_H
- #define ZORBA_API_AUDIT_IMPL_H
- 
-+#include <sys/types.h>
- #include <zorba/audit.h>
- #include <zorba/audit_scoped.h>
- #include <map>
diff --git a/textproc/zorba/files/patch-src_types_casting.cpp b/textproc/zorba/files/patch-src_types_casting.cpp
deleted file mode 100644
index d739380e5dc2..000000000000
--- a/textproc/zorba/files/patch-src_types_casting.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
---- src/types/casting.cpp.orig	2020-08-28 21:44:53 UTC
-+++ src/types/casting.cpp
-@@ -199,7 +199,7 @@ T1_TO_T2(str, flt)
-   catch (std::invalid_argument const&) 
-   {
-     throwTypeException(err::FORG0001, aErrorInfo);
--    return NULL;
*** 924 LINES SKIPPED ***