<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/17c401e488210c6842760dc97e21b5a74be44881">https://github.com/macports/macports-ports/commit/17c401e488210c6842760dc97e21b5a74be44881</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 17c401e4882 file: Add deps; add static lib; fix pkg-config file
</span>17c401e4882 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17c401e488210c6842760dc97e21b5a74be44881
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 19 09:01:46 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> file: Add deps; add static lib; fix pkg-config file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add bzip2, xz, and zstd deps to help identify more file types?
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also install static library.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use upstream patch to add missing Cflags to pkg-config file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove getline patch which doesn't seem to be needed anymore.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67580
</span>---
sysutils/file/Portfile | 25 ++++++++++++++++++-------
sysutils/file/files/libmagic.pc.in.patch | 9 +++++++++
sysutils/file/files/patch-getline.diff | 11 -----------
3 files changed, 27 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/file/Portfile b/sysutils/file/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f5776d3699..7f40a87cfab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/file/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/file/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,24 @@ master_sites freebsd \
</span> ftp://ftp.astron.com/pub/${name}/ \
ftp://ftp.gw.com/mirrors/pub/unix/${name}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-magic-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-getline.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles libmagic.pc.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-magic-Makefile.am.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-fsect-man5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-libseccomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-lzlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-bzlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-static \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-fsect-man5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-xzlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-zstdlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port: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:xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zstd
</span>
# We patch Makefile.am files.
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +52,7 @@ autoreconf.args -fvi
</span> configure.checks.implicit_function_declaration.whitelist-append strchr
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
depends_lib-append port:libmagic
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +69,7 @@ if {${name} eq ${subport}} {
</span> }
subport libmagic {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
post-destroot {
delete ${destroot}${prefix}/bin/file ${destroot}${prefix}/share/man/man1/file.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/file/files/libmagic.pc.in.patch b/sysutils/file/files/libmagic.pc.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dd982040a81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/file/files/libmagic.pc.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add cflags to pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/file/file/commit/8bc37a45bad67bc4604471c64f0c9f3372b55d2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libmagic.pc.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libmagic.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,3 +8,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version: @VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Libs: -L${libdir} -lmagic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Libs.private: @LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/file/files/patch-getline.diff b/sysutils/file/files/patch-getline.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5a99bed031f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/file/files/patch-getline.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.orig 2022-12-26 12:00:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2023-01-11 20:59:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmagic_la_LIBADD = -lm $(LTLIBOBJS) $(MINGWLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_SOURCES = file.c seccomp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--file_LDADD = libmagic.la -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+file_LDADD = libmagic.la -lm $(LTLIBOBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLEANFILES = magic.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = magic.h.in cdf.mk BNF memtest.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HDR= $(top_srcdir)/src/magic.h.in
</span></pre><pre style='margin:0'>
</pre>