<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/68075ce4708a7d8fab8331466ceae95bc55bd973">https://github.com/macports/macports-ports/commit/68075ce4708a7d8fab8331466ceae95bc55bd973</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 68075ce netpbm: Update to 10.86.03
</span>68075ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68075ce4708a7d8fab8331466ceae95bc55bd973
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 31 14:14:57 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> netpbm: Update to 10.86.03
</span>---
graphics/netpbm/Portfile | 80 +++++++++++++++------------
graphics/netpbm/files/patch-lib-Makefile.diff | 47 ++++++++++++++--
2 files changed, 85 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/netpbm/Portfile b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5efb99e..d90b22e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,28 @@ PortGroup github 1.0
</span>
# Download distfiles from GitHub mirror because fetching from svn keeps being
# problematic.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup leahneukirchen netpbm-mirror b10a418cefe3413a727b89300848dc84e8a6195d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup leahneukirchen netpbm-mirror 7a5291a126732a4ca220a79cfe5e6763e71ace73
</span> name netpbm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10.85.05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 3578
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set userguide_commit c559f574d8e1194fcc2c9135ed9a8c1ac98a38cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set userguide_revision 3576
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10.86.03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+svn.revision 3602
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set source_branch advanced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${source_branch}-r${svn.revision}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set source_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_commit 97efa5ff63bc672cc6595ec4ada5a70e0b3edadc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_revision 3598
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_branch userguide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_distname ${userguide_branch}-r${userguide_revision}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_distfile ${userguide_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${source_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 88bee4284263a16ce090b1d259c1d6050a0e628a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5582bd989c5c0b43fbddece8c721fb3e5dc1c4a0ecaa91119097d60808a84a35 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2850881 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${userguide_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a4b093463941c02e541849ccfe93e59036a7ecbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d976b17b1a27029fae1729a7045948947ab273855b78b8ce7ee0c8b72084b5b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1217886
</span>
categories graphics
platforms darwin freebsd linux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,32 +43,29 @@ long_description A whole bunch of utilities for primitive manipulation \
</span>
homepage http://netpbm.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set source_branch advanced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set userguide_branch userguide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${source_branch}-r${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set source_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set userguide_distname ${userguide_branch}-r${userguide_revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set userguide_distfile ${userguide_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distfiles ${source_distfile}:source \
${userguide_distfile}:userguide
master_sites ${github.master_sites}:source \
${github.homepage}/tarball/${userguide_commit}:userguide
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${source_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 da315ba337cdd358c1d8787499c8a8f4d20dd92c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 86b4ced25ac530c60b8596ba41e28f24b430a3d90643d5f492e2ce46b05b6273 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2831099 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${userguide_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 044e82e94d33370b41d01f7f5b58983348d64b15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53789908d5015064d0f0b05479bc942b3e54129b6dad11ed8fdec6307f93833b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1215843
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-extract {
move ${workpath}/${github.author}-${github.project}-[string range ${git.branch} 0 6] ${workpath}/${distname}
move ${workpath}/${github.author}-${github.project}-[string range ${userguide_commit} 0 6] ${workpath}/${userguide_distname}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newest_mtime 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse item ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [file isfile ${item}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set item_mtime [file mtime ${item}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${item_mtime} > ${newest_mtime}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newest_mtime ${item_mtime}
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${workpath}/mtime w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${fp} ${newest_mtime}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Delete the manpages that aren't for this subport.
set libmanpages {libnetpbm pam pbm pgm pnm ppm}
foreach f [glob ${workpath}/${userguide_distname}/*.html] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +145,13 @@ platform freebsd {
</span> set ldshlib "${prefix}/lib/glibtool --mode=link gcc"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open ${workpath}/mtime r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mtime [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SOURCE_DATE_EPOCH=${mtime}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args messages=yes
build.type gnu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,7 +219,7 @@ if {${subport} eq ${name}} {
</span> # Install documentation.
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${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> README \
doc/COPYRIGHT.PATENT \
doc/GPL_LICENSE.txt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,10 +279,8 @@ subport libnetpbm {
</span>
post-destroot {
# Install netpbm-config and netpbm.pc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${build.dir}/netpbm-config ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${build.dir}/netpbm.pc ${destroot}${prefix}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/link/*] ${destroot}${prefix}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${build.dir}/netpbm-config ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${build.dir}/netpbm.pc ${destroot}${prefix}/lib/pkgconfig/
</span>
# Add symlinks for old library names that some old software still uses.
set new_library [file readlink ${destroot}${prefix}/lib/libnetpbm.${netpbmlibsuffix}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,16 +288,6 @@ subport libnetpbm {
</span> ln -s ${new_library} ${destroot}${prefix}/lib/lib${old_library}.${netpbmlibsuffix}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # netpbm < 10.70.07 installed libnetpbm and associated files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active netpbm] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${installed_version} 10.70.07] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite netpbm "" [list ports_nodepcheck 1]
</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;'>- }
</span> }
# work around bug in Apple's gcc build 4061
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/netpbm/files/patch-lib-Makefile.diff b/graphics/netpbm/files/patch-lib-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 382ee4c..e47db71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/netpbm/files/patch-lib-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/netpbm/files/patch-lib-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,46 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Makefile.orig 2018-12-16 18:03:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Makefile 2018-12-22 03:02:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -282,9 +282,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Makefile.orig 2019-05-04 14:39:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Makefile 2019-05-31 14:12:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,7 +221,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: install.lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(NETPBMLIBTYPE),unixshared)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install a Unix-style shared library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install.lib: $(PKGDIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,29 +263,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: install.staticlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install.staticlib: $(PKGDIR)/staticlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install.staticlib: $(PKGDIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(PKGDIR)/staticlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(PKGDIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install a shared library stub -- the ".so" file used at link time to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prepare a program for dynamically linking a library at run time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: install.sharedlibstub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install.sharedlibstub: $(PKGDIR)/sharedlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install.sharedlibstub: $(PKGDIR)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(NETPBMLIBTYPE),unixshared)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # install the link-time (.so) links to the runtime libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd $(PKGDIR)/sharedlink ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd $(PKGDIR)/lib ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnetpbm.$(NETPBMLIBSUFFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(NETPBMLIBTYPE),dll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(PKGDIR)/sharedlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(PKGDIR)/lib
</span> endif
ifeq ($(NETPBMLIBTYPE),dylib)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd $(PKGDIR)/link/ ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd $(PKGDIR)/lib/ ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd $(PKGDIR)/sharedlink/ ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd $(PKGDIR)/lib ; \
</span> rm -f libnetpbm.dylib; \
- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
+ $(SYMLINK) libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
</pre><pre style='margin:0'>
</pre>