diff --no-dereference -Naur -- libexpat.normalized/conftools/config.sub libexpat.srctix/conftools/config.sub
--- libexpat.normalized/conftools/config.sub	2012-03-24 20:12:39.000000000 +0100
+++ libexpat.srctix/conftools/config.sub	2013-04-09 21:32:12.863143908 +0200
@@ -1326,7 +1326,7 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --no-dereference -Naur -- libexpat.normalized/Makefile.in libexpat.srctix/Makefile.in
--- libexpat.normalized/Makefile.in	2012-03-18 23:18:10.000000000 +0100
+++ libexpat.srctix/Makefile.in	2013-04-09 21:38:36.275152571 +0200
@@ -45,7 +45,7 @@
 APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
 LIBRARY = libexpat.la
 
-DESTDIR = $(INSTALL_ROOT)
+DESTDIR ?= $(INSTALL_ROOT)
 
 default:  buildlib xmlwf/xmlwf@EXEEXT@
 
diff --no-dereference -Naur -- libexpat.normalized/tixbuildinfo libexpat.srctix/tixbuildinfo
--- libexpat.normalized/tixbuildinfo	1970-01-01 01:00:00.000000000 +0100
+++ libexpat.srctix/tixbuildinfo	2013-07-25 23:48:54.851072387 +0200
@@ -0,0 +1,5 @@
+tix.version=1
+tix.class=srctix
+pkg.name=libexpat
+pkg.build-system=configure
+pkg.post-install.cmd=tix-eradicate-libtool-la
diff --no-dereference -Naur -- libexpat.normalized/xmlwf/readfilemap.c libexpat.srctix/xmlwf/readfilemap.c
--- libexpat.normalized/xmlwf/readfilemap.c	2009-11-12 17:51:39.000000000 +0100
+++ libexpat.srctix/xmlwf/readfilemap.c	2015-02-07 16:30:52.089270331 +0100
@@ -8,17 +8,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef __WATCOMC__
-#ifndef __LINUX__
-#include <io.h>
-#else
 #include <unistd.h>
-#endif
-#endif
-
-#ifdef __BEOS__
-#include <unistd.h>
-#endif
 
 #ifndef S_ISREG
 #ifndef S_IFREG