<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e14992de17daa0f60663583a2a8b9040a963fa1">https://github.com/macports/macports-ports/commit/9e14992de17daa0f60663583a2a8b9040a963fa1</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 9e14992de17 analog: update to 6.0.18
</span>9e14992de17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e14992de17daa0f60663583a2a8b9040a963fa1
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Fri Dec 27 09:59:07 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> analog: update to 6.0.18
</span>---
www/analog/Portfile | 21 ++++---
www/analog/files/patch-src-Makefile.diff | 96 ++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/analog/Portfile b/www/analog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6cb4f3e408..509dccb051a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/analog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/analog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup c-amie analog-ce 6.0.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup c-amie analog-ce 6.0.18
</span> name analog
revision 0
categories www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,23 +18,28 @@ platforms darwin
</span>
homepage http://www.c-amie.co.uk/software/analog/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 20f53755e41baf6b556d37104dc15cf389e00924 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fbf8840b2b00238b3cd9a6d60e1208a92e5d0d1043a422ffcd07b7f84952db11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1593992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 092c6c6e524cb9f5595a31bc8751b6df16a15822 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f3e3bb058b7d9378538b279f98b124f367db948c0643e2534099341708cfa1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4089366
</span>
# Note, it'd be nice to use an already-installed version of jpeg and libpng
# as well, but analog currently doesn't have a HAVE_ define for them, just
# zlib (as well as gd, which should be here too if possible)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib lib:libz.1:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src_anlghead.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Makefile.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_anlghead.h
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" "${worksrcpath}/src/anlghead.h"
}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args DEFS="-DHAVE_ZLIB" LIBS="-lz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args DEFS="-DHAVE_BZLIB -DHAVE_PCRE -DHAVE_ZLIB" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="-lbz2 -ljpeg -lpcre2-8 -lpng -lz"
</span> build.target analog
destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,5 +59,5 @@ destroot {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append OS="OSX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append OS="OSX"
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/analog/files/patch-src-Makefile.diff b/www/analog/files/patch-src-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03f99dbf0c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/analog/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,96 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2024-08-14 09:39:50
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2024-12-27 09:52:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # BS2000/OSD needs CFLAGS = -XLLML -XLLMK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,9 +28,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DYNIX/ptx needs DEFS = -D_SOCKET_VERSION=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MPE/iX needs DEFS = -D_POSIX_SOURCE -D_SOCKET_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#LIBS = -lm # extra libraries needed; most platforms (but not OS X or BeOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # need -lm LAST
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if you defined HAVE_ZLIB above you also need -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,41 +54,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tree.o utils.o win32.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUBDIRS = bzip2 libgd libpng pcre2 unzip zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUBDIRS = libgd unzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIROBJS = libgd/gd.o libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libpng/pngwtran.o libpng/pngwutil.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_auto_possess.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_chartables.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_chkdint.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_compile.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_context.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_convert.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_extuni.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_find_bracket.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_match.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_match_data.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_newline.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_ord2utf.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_pattern_info.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_script_run.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_string_utils.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_study.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_tables.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_ucd.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_valid_utf.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/libpcre2_8_la-pcre2_xclass.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unzip/ioapi.o unzip/unzip.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pcre2/src/pcre2.h.generic libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- zlib/zlib.h bzip2/bzlib.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALLCFLAGS = $(CFLAGS) $(DEFS) -D$(OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALLOBJS = $(OBJS) $(SUBDIROBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,27 +68,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There doesn't seem to be a good way to write all these rules in a generic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # form that works for all "make" programs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bzip2: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgd: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libpng: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd libpng && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pcre2: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chmod 755 pcre2/132html pcre2/ar-lib pcre2/CheckMan pcre2/CleanTxt pcre2/compile pcre2/config.guess pcre2/config.sub pcre2/configure pcre2/depcomp pcre2/Detrail pcre2/install-sh pcre2/missing pcre2/perltest.sh pcre2/PrepareRelease pcre2/RunGrepTest pcre2/RunTest pcre2/test-driver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chmod 755 pcre2/cmake pcre2/doc pcre2/m4 pcre2/src pcre2/testdata pcre2/vms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chmod 755 pcre2/src/sljit pcre2/src/sljit/allocator_src/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd pcre2 && ./configure && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unzip: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd unzip && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-zlib: ALWAYS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd zlib && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alias.o: alias.c $(HEADERS) Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(ALLCFLAGS) -c alias.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>