<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/09c1d774397182a55914a528a8595d9a6b5772c1">https://github.com/macports/macports-ports/commit/09c1d774397182a55914a528a8595d9a6b5772c1</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 09c1d774397 sc: fix compilation, use debian patches
</span>09c1d774397 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 09c1d774397182a55914a528a8595d9a6b5772c1
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Wed Apr 26 18:53:12 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> sc: fix compilation, use debian patches
</span>---
finance/sc/Portfile | 25 ++++++++++++-------------
finance/sc/files/Makefile.diff | 33 +++++++++++++--------------------
finance/sc/files/patch-sc.h.diff | 23 +++++++++++++++++++++++
3 files changed, 48 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/finance/sc/Portfile b/finance/sc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79126ab2bc9..3d2fa7b107c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/finance/sc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/finance/sc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,9 @@ PortSystem 1.0
</span>
name sc
version 7.16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit e84d756c0b398e437020d58e15b89abfae64f69f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license public-domain
</span> maintainers nomaintainer
categories finance
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,26 +17,23 @@ platforms darwin
</span>
homepage http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://salsa.debian.org/debian/sc/-/archive/master/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${git_commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-master-${git_commit}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bcaffd292bc3d0868e5be870fee743c6b3294377 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4feb67769f96a4dc31bc211343e1a47ddcee9eeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c51d1b6d00058beaf92f80a18f0b37bc29d06c55f7c8bb26959c8a2da7ba785c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 175814
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sc.h.diff
</span>
depends_lib port:ncurses \
port:bison
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: This is a real bug that clang is complaining about.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix it rather than just working around it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match "*clang*" ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -Wno-error=return-type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args-append CC="${configure.cc} ${configure.cppflags} ${configure.cflags} [get_canonical_archflags]"
destroot.destdir-append prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/finance/sc/files/Makefile.diff b/finance/sc/files/Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a2d33f8ff76..fd4c526bd1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/finance/sc/files/Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/finance/sc/files/Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +1,35 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2002-09-14 05:39:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-01-27 11:03:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,13 +26,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2022-05-27 15:45:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2023-04-29 08:03:15.037784865 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span> EXDIR=${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # This is where the man page goes.
-MANDIR=${prefix}/man/man1
+MANDIR=${prefix}/share/man/man1
MANEXT=1
MANMODE=644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is where the library file (tutorial) goes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #LIBDIR=/usr/local/share/$(name) # reno
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR=${prefix}/lib/$(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBDIR=${prefix}/share/doc/$(name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY=-DLIBDIR=\"${LIBDIR}\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @@ -499,32 +499,32 @@
$(MANDIR)/p$(name).$(MANEXT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(EXDIR)/$(name): $(name)
- cp $(name) $(EXDIR)
- strip $(EXDIR)/$(name)
+ cp $(name) $(DESTDIR)$(EXDIR)/
+ strip $(DESTDIR)$(EXDIR)/$(name)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(EXDIR)/$(name)qref: $(name)qref
- cp $(name)qref $(EXDIR)
- strip $(EXDIR)/$(name)qref
+ cp $(name)qref $(DESTDIR)$(EXDIR)/
+ strip $(DESTDIR)$(EXDIR)/$(name)qref
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(EXDIR)/p$(name): p$(name)
- cp p$(name) $(EXDIR)
- strip $(EXDIR)/p$(name)
+ cp p$(name) $(DESTDIR)$(EXDIR)/
+ strip $(DESTDIR)$(EXDIR)/p$(name)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(LIBDIR)/tutorial: tutorial.sc $(LIBDIR)
- -mkdir -p $(LIBDIR)/plugins
- cp tutorial.sc $(LIBDIR)/tutorial.$(name)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,22 +37,22 @@
</span> + -mkdir -p $(DESTDIR)$(LIBDIR)/plugins
+ cp tutorial.sc $(DESTDIR)$(LIBDIR)/tutorial.$(name)
+ chmod $(MANMODE) $(DESTDIR)$(LIBDIR)/tutorial.$(name)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(LIBDIR):
- mkdir $(LIBDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(MANDIR)/$(name).$(MANEXT): $(name).1
- cp $(name).1 $(MANDIR)/$(name).$(MANEXT)
- chmod $(MANMODE) $(MANDIR)/$(name).$(MANEXT)
+ cp $(name).1 $(DESTDIR)$(MANDIR)/$(name).$(MANEXT)
+ chmod $(MANMODE) $(DESTDIR)$(MANDIR)/$(name).$(MANEXT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> $(MANDIR)/p$(name).$(MANEXT): p$(name).1
- cp p$(name).1 $(MANDIR)/p$(name).$(MANEXT)
- chmod $(MANMODE) $(MANDIR)/p$(name).$(MANEXT)
+ cp p$(name).1 $(DESTDIR)$(MANDIR)/p$(name).$(MANEXT)
+ chmod $(MANMODE) $(DESTDIR)$(MANDIR)/p$(name).$(MANEXT)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> uninstall:
rm -f $(EXDIR)/$(name)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/finance/sc/files/patch-sc.h.diff b/finance/sc/files/patch-sc.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3b82f8c4d59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/finance/sc/files/patch-sc.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sc.h.old 2023-04-26 18:42:31.790081128 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sc.h 2023-04-26 18:42:46.452346995 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -614,6 +614,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void yankr(struct ent *v1, struct ent *v2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void ljustify(int sr, int sc, int er, int ec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void rjustify(int sr, int sc, int er, int ec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void center(int sr, int sc, int er, int ec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void add_abbr(char *string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void yankrow(int arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void getframe(int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void yankcol(int arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void getrange(char *name, int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void doeval(struct enode *e, char *fmt, int row, int col, int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void doseval(struct enode *e, int row, int col, int fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void dogetkey();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void list_frames(FILE *f);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void gotonote();
</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;'>+ #if BSD42 || SYSIII
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>