<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/384b4022344fd1888f5692e09efe92f3e43a582a">https://github.com/macports/macports-ports/commit/384b4022344fd1888f5692e09efe92f3e43a582a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 384b4022344 mhxd: new port, Hotline client and server
</span>384b4022344 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 384b4022344fd1888f5692e09efe92f3e43a582a
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Apr 21 08:38:29 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> mhxd: new port, Hotline client and server
</span>---
net/mhxd/Portfile | 82 ++++++++++++++++
net/mhxd/files/patch-broken-comments.diff | 73 ++++++++++++++
net/mhxd/files/patch-fix-for-newer-macos.diff | 136 ++++++++++++++++++++++++++
3 files changed, 291 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mhxd/Portfile b/net/mhxd/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a1c2a1514e6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mhxd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name mhxd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description GTK+ Hotline client and server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://hotline.fandom.com/wiki/Clients
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.nus.edu.sg/mirror/gentoo/distfiles/a3/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://ftp.klid.dk/ftp/gentoo/distfiles/a3/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6b9d54c9fa872771f4d90d0441d06929d58b6822 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54906798fd9155cf3f53c171f0d839ed1e5a329fa89e56bbcdfda4ce8dda0b91 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 970664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-broken-comments.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-for-newer-macos.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: GTK and IRC need fixes. KDX missing its target?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-irc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-kdx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-hotline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-hx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-hxd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-hxtrackd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-iconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rundir ${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir [glob ${worksrcpath}/run/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${dir} ${rundir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set srcdir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin [list ${srcdir}/acctedit/acctedit ${srcdir}/conf/genconf ${srcdir}/hxd/hxd] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${bin}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${bin} ${rundir}/hxd/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib [list ${srcdir}/apple/libapple.a ${srcdir}/common/libcommon.a ${srcdir}/conf/libconf.a ${srcdir}/lib/liblib.a ${srcdir}/protocol/libprotocol.a] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${lib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${lib} ${rundir}/hxd/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${rundir}/hxd/bin/hxd ${destroot}${prefix}/sbin/hxd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${srcdir}/hx/hx ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/doc/hxd ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING INSTALL NEWS PROBLEMS README ${destroot}${prefix}/share/doc/hxd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable ${prefix}/sbin/hxd
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mhxd/files/patch-broken-comments.diff b/net/mhxd/files/patch-broken-comments.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cf2bc3504e1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mhxd/files/patch-broken-comments.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hx/files.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hx/files.c 2022-10-25 04:34:57.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -984,8 +984,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xfers[i]->ref == ref) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xfers[i]->queue_pos = pos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hx_printf_prefix(htlc, 0, INFOPREFIX, "queue position for '%s': %d\n", xfers[i]->path, pos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //if (pos == 0 && !xfers[i]->gone)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // xfer_ready_write(xfers[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* if (pos == 0 && !xfers[i]->gone) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* xfer_ready_write(xfers[i]); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hxd/htxf.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hxd/htxf.c 2022-10-25 04:37:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -797,7 +797,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fd_lock_write(f) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(__OpenBSD__)//OpenBSD has different errno references... phew.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__OpenBSD__) /* OpenBSD has different errno references... phew. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != ENOTSUP) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != EOPNOTSUPP) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -859,13 +859,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rsrc_size > rsrc_pos) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (htxf->gone)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- f = resource_open(path, /*O_WRONLY*/O_RDWR|O_CREAT, hxd_cfg.permissions.files);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f = resource_open(path, /*O_WRONLY*/ O_RDWR|O_CREAT, hxd_cfg.permissions.files);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (f < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hxd_log("%s:%d: %s (%d)", __FILE__, __LINE__, strerror(errno), errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fd_lock_write(f) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(__OpenBSD__)//OpenBSD has different errno references... phew.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__OpenBSD__) /* OpenBSD has different errno references... phew. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != ENOTSUP) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (errno != EOPNOTSUPP) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hxd/rcv.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hxd/rcv.c 2022-10-25 04:48:29.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,7 +410,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ htlc->rcv = rcv_file_put;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case HTLC_HDR_KILLDOWNLOAD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- //htlc->rcv = rcv_killdownload;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* htlc->rcv = rcv_killdownload; */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case HTLC_HDR_FILE_GETINFO:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (htlc->access_extra.file_getinfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/hotline.h.orig 2006-09-20 22:48:49.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/hotline.h 2023-04-21 04:30:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,11 +7,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PACKED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//#define PACKED __attribute__((__packed__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #ifdef __GNUC__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #define PACKED __attribute__((__packed__)) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #else */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PACKED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* #endif */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mhxd/files/patch-fix-for-newer-macos.diff b/net/mhxd/files/patch-fix-for-newer-macos.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ef8d0d12279
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mhxd/files/patch-fix-for-newer-macos.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,136 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- autogen.sh.orig 2004-07-26 18:21:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2023-04-25 00:33:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo "Running libtoolize --copy --force --ltdl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libtoolize --copy --force --ltdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "Running glibtoolize --copy --force --ltdl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++glibtoolize --copy --force --ltdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NOCONFIGURE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ . $srcdir/macros/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2023-04-25 00:28:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -764,11 +764,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$ac_cv_coreservices" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(HAVE_CORESERVICES, 1, [Define if you have Apple CoreServices (OSX)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPLELDADD="$APPLELDADD ../apple/libapple.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HXDLDFLAGS="$HXDLDFLAGS -framework coreservices"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HXLDFLAGS="$HXLDFLAGS -framework coreservices"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HXDLDFLAGS="$HXDLDFLAGS -framework CoreServices"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HXLDFLAGS="$HXLDFLAGS -framework CoreServices"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_FUNC(strlcpy, , aclo_strlcpy=yes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_FUNC(strlcpy, AC_DEFINE(HAVE_STRLCPY, 1, [strlcpy]), aclo_strlcpy=yes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HXDLIBLDADD="$HXDLIBLDADD ../lib/strlcpy.o";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HXTRACKDLIBLDADD="$HXTRACKDLIBLDADD ../lib/strlcpy.o";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HXLIBLDADD="$HXLIBLDADD ../lib/strlcpy.o")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hxd/htxf.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hxd/htxf.c 2023-04-25 00:24:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define t_watch_delete(x) watch_delete(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "apple/alias.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "apple/files.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline struct watch *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watch_new (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/hfs.c.orig 2004-07-26 18:21:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/hfs.c 2023-05-26 08:27:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "hfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "apple/alias.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "apple/files.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DIRCHAR '/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UNKNOWN_TYPECREA "TEXTR*ch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hxd/files.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hxd/files.c 2023-05-26 08:45:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sys_net.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "hlserver.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xmalloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +17,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "apple/files.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hlserver.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(CONFIG_ICONV)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "conv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hxd/htxf.c.orig 2004-07-26 18:21:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hxd/htxf.c 2023-05-26 09:29:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,11 +11,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "hlserver.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xmalloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_CORESERVICES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "apple/alias.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "apple/files.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(CONFIG_HFS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hlserver.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "threads.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HTXF_BUFSIZE 0xf000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hx/files.c.orig 2006-09-20 22:49:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hx/files.c 2023-05-26 09:24:52.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hx.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "hxd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "xmalloc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +7,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sys_net.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(CONFIG_HFS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "hxd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(__WIN32__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,10 +28,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "conv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(CONFIG_HFS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "hfs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(CONFIG_SOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sound.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>