<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2279bf89821a986f654b7dcf93964550f6562280">https://github.com/macports/macports-ports/commit/2279bf89821a986f654b7dcf93964550f6562280</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 2279bf8 sftl: Add universal variant; arch flags; cleanup
</span>2279bf8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2279bf89821a986f654b7dcf93964550f6562280
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon May 4 12:18:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> sftl: Add universal variant; arch flags; cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Numerous cleanups and fixes for this old port:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Use the right -arch flags and add a universal variant.
</span><span style='display:block; white-space:pre;color:#404040;'> * Specify CPPFLAGS in their own env var so they're put in the right
</span><span style='display:block; white-space:pre;color:#404040;'> place, after rather than before the project's own -I flags.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove unnecessary parts of the Makefile patch.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove the part of the patch that added CFLAGS and LDLIBS when
</span><span style='display:block; white-space:pre;color:#404040;'> generating Makefile.deps. They're not needed there and it causes
</span><span style='display:block; white-space:pre;color:#404040;'> warnings to be emitted.
</span><span style='display:block; white-space:pre;color:#404040;'> * Separate the macOS-specific parts of the Makefile patch into their own
</span><span style='display:block; white-space:pre;color:#404040;'> file, included only on Darwin.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use the -dynamiclib flag to create the dylib rather than the -shared
</span><span style='display:block; white-space:pre;color:#404040;'> flag that old versions of macOS don't understand.
</span><span style='display:block; white-space:pre;color:#404040;'> * Don't use the unnecessary -Wl flag.
</span><span style='display:block; white-space:pre;color:#404040;'> * Use the $(libdir) variable to define the install_name rather than
</span><span style='display:block; white-space:pre;color:#404040;'> hardcoding "lib".
</span><span style='display:block; white-space:pre;color:#404040;'> * Don't hardcode -Os optimization. Use whatever flag MacPorts says to.
</span>---
devel/stfl/Portfile | 16 ++++-
.../files/{patch-Makefile.diff => dylib.patch} | 54 +++-------------
devel/stfl/files/patch-Makefile.diff | 73 ++++------------------
3 files changed, 35 insertions(+), 108 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stfl/Portfile b/devel/stfl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91ab4e0..f01b897 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stfl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stfl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name stfl
version 0.24
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
license LGPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +38,18 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant universal {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPPFLAGS=${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDLIBS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dylib.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type regex
livecheck.url ${homepage}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stfl/files/patch-Makefile.diff b/devel/stfl/files/dylib.patch
</span>similarity index 50%
copy from devel/stfl/files/patch-Makefile.diff
copy to devel/stfl/files/dylib.patch
<span style='display:block; white-space:pre;color:#808080;'>index 64b3808..1391226 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stfl/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stfl/files/dylib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-08-11 12:50:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-08-11 17:44:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,14 +20,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include Makefile.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--export CC = gcc -pthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--export LDLIBS += -lncursesw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+export LDLIBS += $(LD_FLAGS) -lncursesw -liconv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Build a macOS dylib rather than a UNIX shared library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2015-02-12 07:14:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-05-04 11:54:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7+27,11 @@
</span> SONAME := libstfl.so.0
VERSION := 0.24
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +14,7 @@
</span>
example: libstfl.a example.o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,24 +40,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,9 +41,9 @@
</span> ar qc $@ $^
ranlib $@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +22,11 @@
</span> +$(SONAMEV): public.o base.o parser.o dump.o style.o binding.o iconv.o \
$(patsubst %.c,%.o,$(wildcard widgets/*.c))
- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $(LDLIBS) $^
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -shared -Wl -install_name $(prefix)/lib/$@ -o $@ $(LDLIBS) $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -dynamiclib -install_name $(prefix)/$(libdir)/$@ -o $@ $(LDLIBS) $^
</span>
clean:
rm -f libstfl.a example core core.* *.o Makefile.deps
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f widgets/*.o spl/mod_stfl.so spl/example.db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd perl5 && perl Makefile.PL && make clean && rm -f Makefile.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f perl5/stfl_wrap.c perl5/stfl.pm perl5/build_ok
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f python/stfl.py python/stfl.pyc python/_stfl.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f python/stfl.py python/stfl.pyc python/_stfl.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +54,7 @@
</span> rm -f python/stfl_wrap.c python/stfl_wrap.o
rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,14 +34,8 @@
</span> + rm -f stfl.pc $(SONAME) $(SONAME0) $(SONAMEV)
Makefile.deps: *.c widgets/*.c *.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -I. -MM *.c > Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -I. -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LDLIBS) -MM *.c > Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LDLIBS) -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv -f Makefile.deps_new Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: all stfl.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,8 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) -I. -MM *.c > Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,8 +67,8 @@
</span> install -m 644 libstfl.a $(DESTDIR)$(prefix)/$(libdir)
install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
install -m 644 stfl.pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,22 +46,3 @@
</span>
stfl.pc: stfl.pc.in
sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,18 +76,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include spl/Makefile.snippet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(FOUND_SWIG)$(FOUND_PERL5),11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include perl5/Makefile.snippet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(FOUND_SWIG)$(FOUND_PYTHON),11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include python/Makefile.snippet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(FOUND_SWIG)$(FOUND_RUBY),11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include ruby/Makefile.snippet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: all clean install install_spl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include Makefile.deps
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stfl/files/patch-Makefile.diff b/devel/stfl/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 64b3808..9b76213 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stfl/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stfl/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-08-11 12:50:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2015-08-11 17:44:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,14 +20,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't include optimization flags here; MacPorts will supply its own.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add forgotten flag to link with libiconv.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not build language bindings with swig.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2015-02-12 07:14:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-05-04 11:54:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,8 +21,8 @@
</span> include Makefile.cfg
<span style='display:block; white-space:pre;background:#ffe0e0;'>--export CC = gcc -pthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export CC = gcc -pthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
</span> -export LDLIBS += -lncursesw
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+export LDLIBS += $(LD_FLAGS) -lncursesw -liconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export CFLAGS += -I. -Wall -ggdb -D_GNU_SOURCE -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export LDLIBS += -lncursesw -liconv
</span>
SONAME := libstfl.so.0
VERSION := 0.24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--all: libstfl.so.$(VERSION) libstfl.a example
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SONAME := libstfl.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SONAME0 := libstfl.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SONAMEV := libstfl.$(VERSION).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: $(SONAMEV) libstfl.a example
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- example: libstfl.a example.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,24 +40,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar qc $@ $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ranlib $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libstfl.so.$(VERSION): public.o base.o parser.o dump.o style.o binding.o iconv.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$(SONAMEV): public.o base.o parser.o dump.o style.o binding.o iconv.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(patsubst %.c,%.o,$(wildcard widgets/*.c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $(LDLIBS) $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -shared -Wl -install_name $(prefix)/lib/$@ -o $@ $(LDLIBS) $^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f libstfl.a example core core.* *.o Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f widgets/*.o spl/mod_stfl.so spl/example.db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd perl5 && perl Makefile.PL && make clean && rm -f Makefile.old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f perl5/stfl_wrap.c perl5/stfl.pm perl5/build_ok
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f python/stfl.py python/stfl.pyc python/_stfl.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f python/stfl.py python/stfl.pyc python/_stfl.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f python/stfl_wrap.c python/stfl_wrap.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f stfl.pc libstfl.so libstfl.so.*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f stfl.pc $(SONAME) $(SONAME0) $(SONAMEV)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile.deps: *.c widgets/*.c *.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -I. -MM *.c > Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -I. -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LDLIBS) -MM *.c > Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) $(CFLAGS) $(LDLIBS) -MM widgets/*.c | sed 's,^wt_[^ ]*\.o: ,widgets/&,' >> Makefile.deps_new
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv -f Makefile.deps_new Makefile.deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: all stfl.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,8 +66,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 libstfl.a $(DESTDIR)$(prefix)/$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 stfl.pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -m 644 libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -m 644 $(SONAMEV) $(DESTDIR)$(prefix)/$(libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs $(SONAMEV) $(DESTDIR)$(prefix)/$(libdir)/$(SONAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stfl.pc: stfl.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,18 +76,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,18 +73,6 @@
</span> include spl/Makefile.snippet
endif
</pre><pre style='margin:0'>
</pre>