<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f5446247d6ef1ebdbb6b315ea5d1a28b589b3e3">https://github.com/macports/macports-ports/commit/7f5446247d6ef1ebdbb6b315ea5d1a28b589b3e3</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 7f5446247d6 fsvs: Update to 1.2.12
</span>7f5446247d6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f5446247d6ef1ebdbb6b315ea5d1a28b589b3e3
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 18 00:32:53 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> fsvs: Update to 1.2.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/60599
</span>---
devel/fsvs/Portfile | 56 ++++++++++++++--------
devel/fsvs/files/Makefile.in.patch | 38 +++++++++++++++
.../{patch-configure.diff => configure.in.patch} | 18 +++----
devel/fsvs/files/implicit.patch | 46 ++++++++++++++++++
devel/fsvs/files/patch-src-Makefile.in.diff | 36 --------------
5 files changed, 128 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fsvs/Portfile b/devel/fsvs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33554cbddbc..edb07609a98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fsvs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fsvs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup phmarek fsvs 1.2.12 fsvs-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c078fc7637ee27111159368e1fc5653138177374 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 464512ceab6e14978a35ee6a35bfbe8e055597eee23e63b9dca1e0b02e072523 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 526284
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name fsvs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,29 +21,40 @@ long_description FSVS is a complete backup/restore/versioning tool \
</span> backend. Think of it like tar or rsync with \
versioned storage.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://fsvs.tigris.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://download.fsvs-software.org/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://download.fsvs-software.org/old/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1205fc2899990e14324939c652f0a00b77102761 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6353dfe3c63bd0c290ea0bb825ccb405535537ab61f5207d363e37e497ad44c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 429091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:subversion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:apr \
</span> port:gdbm \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:subversion
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure script in repository and no release tarballs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/phmarek/fsvs/issues/20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/phmarek/fsvs/issues/22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoconf yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -fnested-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No config.guess or config.sub in repository and no release tarballs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/phmarek/fsvs/issues/20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/phmarek/fsvs/issues/22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${automake_dir}/config.guess ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}
</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;'>+patchfiles configure.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.in.patch
</span>
configure.universal_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/phmarek/fsvs/issues/23
</span> build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/phmarek/fsvs/issues/25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append VERSION=${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.keepdirs ${destroot}${prefix}/etc/fsvs \
${destroot}${prefix}/var/spool/fsvs \
${destroot}${prefix}/etc/fsvs/svn/auth/svn.simple \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,12 +62,12 @@ destroot.keepdirs ${destroot}${prefix}/etc/fsvs \
</span> ${destroot}${prefix}/etc/fsvs/svn/auth/ssl.client-passphrase
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.5] ${destroot}${prefix}/share/man/man5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 {*}[glob ${worksrcpath}/doc/*.5] ${destroot}${prefix}/share/man/man5
</span>
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> CHANGES \
LICENSE \
README \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fsvs/files/Makefile.in.patch b/devel/fsvs/files/Makefile.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4cf41ee5391
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fsvs/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.in.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.in 2024-07-17 22:05:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix = @prefix@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mandir = @mandir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir -p $(DESTDIR)/etc/fsvs $(DESTDIR)/var/spool/fsvs $(DESTDIR)$(bindir) $(DESTDIR)/etc/fsvs/svn/auth/svn.simple $(DESTDIR)/etc/fsvs/svn/auth/svn.ssl.server $(DESTDIR)/etc/fsvs/svn/auth/svn.ssl.client-passphrase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir -p $(DESTDIR)$(prefix)/etc/fsvs $(DESTDIR)$(prefix)/var/spool/fsvs $(DESTDIR)$(bindir) $(DESTDIR)$(prefix)/etc/fsvs/svn/auth/svn.simple $(DESTDIR)$(prefix)/etc/fsvs/svn/auth/svn.ssl.server $(DESTDIR)$(prefix)/etc/fsvs/svn/auth/svn.ssl.client-passphrase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 0755 $(DEST) $(DESTDIR)/$(bindir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install -m 0644 ../doc/fsvs.1 $(DESTDIR)/(mandir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,14 +146,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################################ Rules ######################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %.o: %.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo " CC $<"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if the Makefile has changed, the output will (at least sometimes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # change, too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DEST): $(C_FILES:%.c=%.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo " Link $@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (@ENABLE_RELEASE@, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -strip $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,8 +167,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ############################### Dependencies ################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deps: $(D_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .%.d: %.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo " deps for $<"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(D_FILES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/fsvs-chrooter: tools/fsvs-chrooter.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fsvs/files/patch-configure.diff b/devel/fsvs/files/configure.in.patch
</span>similarity index 59%
rename from devel/fsvs/files/patch-configure.diff
rename to devel/fsvs/files/configure.in.patch
<span style='display:block; white-space:pre;color:#808080;'>index 8ddee411325..d3005c9d532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fsvs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fsvs/files/configure.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-12-30 05:30:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-12-31 11:27:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4263,7 +4263,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2024-07-17 22:02:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(APR_PATH)
</span>
##################################### Header files
-INCDIRS="/usr/local/include /usr/include /openpkg/include "
+INCDIRS=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The subversion headers do a #include <apr_pools.h>, so the APR libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The subversion headers do a #include <apr_pools.h>, so the APR libraries
</span> # *have* to be directly specified.
# Furthermore there's apr-1/ as directory name, depending on apr version.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4345,7 +4345,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me: \"CFLAGS=$CFLAGS\"" >&6;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_NOTICE(["CFLAGS=$CFLAGS"])
</span>
##################################### Linker
-LIBDIRS="/usr/local/lib /openpkg/lib"
+LIBDIRS=""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check whether --with-aprlib was given.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_ARG_WITH(aprlib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-aprlib=PATH],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fsvs/files/implicit.patch b/devel/fsvs/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c8a65a1a983
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fsvs/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'sleep' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'unlink' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/phmarek/fsvs/issues/24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/add_unvers.c.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/add_unvers.c 2024-07-18 00:00:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,7 @@
</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;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "global.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "add_unvers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cp_mv.c.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cp_mv.c 2024-07-18 00:02:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <search.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "global.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "cp_mv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hash_ops.c.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hash_ops.c 2024-07-18 00:07:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.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 <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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "global.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "waa.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/resolve.c.orig 2023-12-13 06:06:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/resolve.c 2024-07-18 00:10:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/uio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mman.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</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;'>+ #include "global.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fsvs/files/patch-src-Makefile.in.diff b/devel/fsvs/files/patch-src-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3fc31b1a6fe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fsvs/files/patch-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2018-06-06 08:48:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2018-06-13 14:14:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix = @prefix@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mandir = @mandir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p /etc/fsvs /var/spool/fsvs $(bindir) /etc/fsvs/svn/auth/svn.{simple,ssl.server,ssl.client-passphrase}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(prefix)/etc/fsvs $(DESTDIR)$(prefix)/var/spool/fsvs $(DESTDIR)$(bindir) $(DESTDIR)$(prefix)/etc/fsvs/svn/auth/svn.{simple,ssl.server,ssl.client-passphrase}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 0755 $(DEST) $(DESTDIR)/$(bindir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install -m 0644 ../doc/fsvs.1 $(DESTDIR)/(mandir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,13 +148,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ################################ Rules ######################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %.o: %.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo " CC $<"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(CFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if the Makefile has changed, the output will (at least sometimes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # change, too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(DEST): $(C_FILES:%.c=%.o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo " Link $@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (@ENABLE_RELEASE@, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -strip $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deps: $(D_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .%.d: %.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo " deps for $<"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @$(CC) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(D_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/fsvs-chrooter: tools/fsvs-chrooter.c
</span></pre><pre style='margin:0'>
</pre>