<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/9192b329cc13ddda097b50a8cb086adc4b8d5435">https://github.com/macports/macports-ports/commit/9192b329cc13ddda097b50a8cb086adc4b8d5435</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 9192b32 netpbm: Fetch from GitHub mirror instead of SourceForge svn
</span>9192b32 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9192b329cc13ddda097b50a8cb086adc4b8d5435
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Mar 24 00:46:08 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> netpbm: Fetch from GitHub mirror instead of SourceForge svn
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fetching from svn has been repeatedly problematic.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/28250
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/28590
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/29692
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/31987
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/32000
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/36517
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/38823
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/41023
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/48687
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/50087
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54428
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54918
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54919
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54924
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55853
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55930
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55986
</span>---
graphics/netpbm/Portfile | 59 ++++++++++++++++++++++++++++++------------------
1 file changed, 37 insertions(+), 22 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 3f2a6e5..3b3ccdf 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;'>@@ -1,10 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Download distfile from GitHub mirror because fetching from svn keeps being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# problematic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup chneukirchen netpbm-mirror 3642751efdc205fb08bcc4f5c4d5879fc6077a72
</span> name netpbm
version 10.81.03
svn.revision 3155
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set source_branch advanced
</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_commit d07fb0a8b5d8fd9aa3ca6aa53694400cda4ba425
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set userguide_revision 3157
</span> categories graphics
platforms darwin freebsd linux
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,24 +28,33 @@ 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;'>-fetch.type svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.url http://svn.code.sf.net/p/netpbm/code/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.method checkout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.post_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --non-recursive ${svn.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir advanced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.args-replace ${svn.method} update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.args-replace ${svn.url} -r${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.args-append advanced userguide
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.post_args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --non-recursive ${svn.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${svn.dir} "${svn.cmd} ${svn.pre_args} ${svn.args} ${svn.post_args}"
</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;'>+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;'>+distfiles ${source_distfile}:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${userguide_distfile}:userguide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.master_sites}:source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${github.homepage}/tarball/${userguide_commit}:userguide
</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 cf28b08664f8af12806d3e5112f42f90dd54c05e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0fb5efaea421fc445422c16e74d65249dc956779a5889b60612ea88b862793a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2777098 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${userguide_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6149e7b4677f9acc85c0728c7f512cd454e879a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c449ec679854666c33064351054b730ef99468617de584939b15ad348b805e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 719106
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${github.author}-${github.project}-[string range ${git.branch} 0 6] ${workpath}/${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${github.author}-${github.project}-[string range ${userguide_commit} 0 6] ${workpath}/${userguide_distname}
</span>
# Delete the manpages that aren't for this subport.
set libmanpages {libnetpbm pam pbm pgm pnm ppm}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob ${svn.dir}/userguide/*.html] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob ${workpath}/${userguide_distname}/*.html] {
</span> if {([lsearch -exact ${libmanpages} [file rootname [file tail ${f}]]] == -1) == (${subport} ne ${name})} {
delete ${f}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +137,7 @@ set pkgtargets {}
</span>
post-build {
# Build manpages from html files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/userguide "${build.cmd} MAKEMAN='${worksrcpath}/buildtools/makeman -v' USERGUIDE=. -f ${worksrcpath}/buildtools/manpage.mk manpages"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/${userguide_distname} "${build.cmd} MAKEMAN='${worksrcpath}/buildtools/makeman -v' USERGUIDE=. -f ${worksrcpath}/buildtools/manpage.mk manpages"
</span>
# The tests can only be run after things have been destrooted ("packaged").
system -W ${worksrcpath} "${build.cmd} ${pkgtargets} pkgdir=${destroot}${prefix}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +145,7 @@ post-build {
</span>
destroot {
# Install manpages.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/userguide "${build.cmd} MANDIR=${destroot}${prefix}/share/man USERGUIDE=. -f ${worksrcpath}/buildtools/manpage.mk installman"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/${userguide_distname} "${build.cmd} MANDIR=${destroot}${prefix}/share/man USERGUIDE=. -f ${worksrcpath}/buildtools/manpage.mk installman"
</span>
move ${destroot}${prefix}/misc ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +158,7 @@ destroot {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> installs_libs no
# TODO: Don't build libnetpbm again in netpbm subport.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,15 +219,13 @@ if {${subport} eq ${name}} {
</span>
default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced/version.mk&limit=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {>[^\d>]*(\d+(\.\d+)+)[^\d<]*<}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.branch ${source_branch}
</span> } else {
livecheck.type none
}
subport libnetpbm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> license Permissive
# TODO: descriptions
</pre><pre style='margin:0'>
</pre>