Björn Ketelaars <bjorn.ketela...@hydroxide.nl> writes:
> On Mon 17/06/2019 19:50, Nam Nguyen wrote:
>> The generated PLIST has four lines of the form:
>> -lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/
>> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/
>>
>> I had to manually intervene in the generated PLIST and remove the
>> leading ${MODPY_COMMENT} to keep it the same as the older PLIST. This
>> seems safe, given targeting only python 3 and given port-modules(5):
>>
>> "The python module defines variables to allow a single PLIST to be used
>> for both versions. Generate or update the PLIST using the python3
>> FLAVOR, then edit it to prefix any lines creating MODPY_PYCACHE
>> directories with MODPY_COMMENT."
>
> I trust update-plist to do the right thing, and would keep the
> ${MODPY_COMMENT}-bits in. It doesn't seem to do any harm. That said,
> removing these bits also doesn't do any harm.
>
> Tested the port by grabbing content from a couple of websites other than
> youtube. Works for me.
>
> OK bket@
This is an updated diff with generated PLIST as suggested.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.188
diff -u -r1.188 Makefile
--- Makefile 14 May 2019 15:03:52 -0000 1.188
+++ Makefile 18 Jun 2019 05:44:25 -0000
@@ -2,7 +2,7 @@
COMMENT = CLI program to download videos from YouTube and other sites
-VERSION = 2019.05.11
+VERSION = 2019.06.08
MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
DISTNAME = youtube-dl-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.173
diff -u -r1.173 distinfo
--- distinfo 14 May 2019 15:03:52 -0000 1.173
+++ distinfo 18 Jun 2019 05:44:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2019.05.11.tar.gz) =
QSYiGmVnwceN+p2au/NAvF6xPkCWOvylFQ5y3J4UR/g=
-SIZE (youtube-dl-2019.05.11.tar.gz) = 3167002
+SHA256 (youtube-dl-2019.06.08.tar.gz) =
J1qFBuzWxyWJv8ZrdJzYCEfnOT3x1uG+zR0RupCYCDc=
+SIZE (youtube-dl-2019.06.08.tar.gz) = 3169571
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.126
diff -u -r1.126 PLIST
--- pkg/PLIST 14 May 2019 15:03:52 -0000 1.126
+++ pkg/PLIST 18 Jun 2019 05:44:25 -0000
@@ -10,7 +10,7 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/YoutubeDL.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/__init__.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/__main__.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}YoutubeDL.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
@@ -29,7 +29,7 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/compat.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/__init__.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/${MODPY_PYCACHE}dash.${MODPY_PYC_MAGIC_TAG}pyc
@@ -53,7 +53,7 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/downloader/rtsp.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}abcnews.${MODPY_PYC_MAGIC_TAG}pyc
@@ -179,7 +179,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}coub.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cracked.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crackle.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}criterion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crooksandliars.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}crunchyroll.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}cspan.${MODPY_PYC_MAGIC_TAG}pyc
@@ -476,7 +475,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}normalboots.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nosvideo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nova.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}novamov.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}nowness.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}noz.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}npo.${MODPY_PYC_MAGIC_TAG}pyc
@@ -534,7 +532,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}popcorntv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}porn91.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}porncom.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornflip.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornhd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornhub.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}pornotube.${MODPY_PYC_MAGIC_TAG}pyc
@@ -968,7 +965,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/coub.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cracked.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/crackle.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/criterion.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/crooksandliars.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/crunchyroll.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/cspan.py
@@ -1265,7 +1261,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/normalboots.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/nosvideo.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/nova.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/novamov.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/nowness.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/noz.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/npo.py
@@ -1323,7 +1318,6 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/popcorntv.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/porn91.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/porncom.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornflip.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornhd.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornhub.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornotube.py
@@ -1637,7 +1631,7 @@
lib/python${MODPY_VERSION}/site-packages/youtube_dl/options.py
lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/__init__.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/postprocessor/${MODPY_PYCACHE}embedthumbnail.${MODPY_PYC_MAGIC_TAG}pyc
