<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d99b8745ac13ccf48ea24d987f28a970b01d7a4">https://github.com/macports/macports-ports/commit/7d99b8745ac13ccf48ea24d987f28a970b01d7a4</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 7d99b87 youtube-dl: adjust to use ${prefix}/etc/youtube-dl.conf
</span>7d99b87 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d99b8745ac13ccf48ea24d987f28a970b01d7a4
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sun Oct 15 20:12:15 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> youtube-dl: adjust to use ${prefix}/etc/youtube-dl.conf
</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/52232
</span>---
net/youtube-dl/Portfile | 11 +++++-
net/youtube-dl/files/patch-config-location.diff | 51 +++++++++++++++++++++++++
2 files changed, 60 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/Portfile b/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bf0a7f..b1c132a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name youtube-dl
version 2017.10.12
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +31,18 @@ post-extract {
</span> delete ${worksrcpath}/${name}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-youtube_dl-update.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-config-location.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-youtube_dl-update.py.diff
</span> patch.args --backup
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ youtube_dl/options.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ youtube-dl.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Restore original mtimes of files changed by the patch so that `make` doesn't try to regenerate the documentation with `pandoc`.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {youtube_dl/update.py} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {youtube_dl/update.py youtube_dl/options.py README.md youtube-dl.1} {
</span> file mtime ${worksrcpath}/${f} [file mtime ${worksrcpath}/${f}.orig]
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/youtube-dl/files/patch-config-location.diff b/net/youtube-dl/files/patch-config-location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5827b6e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/youtube-dl/files/patch-config-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- youtube_dl/options.py 2017-10-11 14:05:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ youtube_dl/options.py 2017-10-15 16:27:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -889,7 +889,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif '--ignore-config' in command_line_conf:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system_conf = _readOptions('/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ system_conf = _readOptions('@PREFIX@/etc/youtube-dl.conf')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if '--ignore-config' not in system_conf:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user_conf = _readUserConf()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- README.md 2017-10-11 14:06:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ README.md 2017-10-15 17:53:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this is not possible instead of searching.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --ignore-config Do not read configuration files. When given
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in the global configuration file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /etc/youtube-dl.conf: Do not read the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PREFIX@/etc/youtube-dl.conf: Do not read the user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configuration in ~/.config/youtube-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dl/config (%APPDATA%/youtube-dl/config.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on Windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CONFIGURATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and OS X, the system wide configuration file is located at `/etc/youtube-dl.conf` and the user wide configuration file at `~/.config/youtube-dl/config`. On Windows, the user wide configuration file locations are `%APPDATA%\youtube-dl\config.txt` or `C:\Users\<user name>\youtube-dl.conf`. Note that by default configuration file may not exist so you may need to create it yourself.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and OS X, the system wide configuration file is located at `@PREFIX@/etc/youtube-dl.conf` and the user wide configuration file at `~/.config/youtube-dl/config`. On Windows, the user wide configuration file locations are `%APPDATA%\youtube-dl\config.txt` or `C:\Users\<user name>\youtube-dl.conf`. Note that by default configuration file may not exist so you may need to create it yourself.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ For example, with the following configuration file youtube-dl will always extract the audio, not copy the mtime, use a proxy and save all videos under `Movies` directory in your home directory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ```
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- youtube-dl.1 2017-10-11 14:06:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ youtube-dl.1 2017-10-15 19:29:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B \-\-ignore\-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Do not read configuration files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-When given in the global configuration file /etc/youtube\-dl.conf: Do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++When given in the global configuration file @PREFIX@/etc/youtube\-dl.conf: Do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ not read the user configuration in ~/.config/youtube\- dl/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (%APPDATA%/youtube\-dl/config.txt on Windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .RS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,7 +903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You can configure youtube\-dl by placing any supported command line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option to a configuration file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ On Linux and OS X, the system wide configuration file is located at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-\f[C]/etc/youtube\-dl.conf\f[] and the user wide configuration file at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\f[C]@PREFIX@/etc/youtube\-dl.conf\f[] and the user wide configuration file at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \f[C]~/.config/youtube\-dl/config\f[].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ On Windows, the user wide configuration file locations are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \f[C]%APPDATA%\\youtube\-dl\\config.txt\f[] or
</span></pre><pre style='margin:0'>
</pre>