Works correctly now. I ought to learn how to use regex myself.. Ok to import now?
------- Original Message -------
> Oops, typo, should have been PKGNAME = ${DISTNAME:S/_/-/}
>
> --
> Sent from a phone, apologies for poor formatting.
>
> On 6 November 2023 19:34:53 grodzio grod...@protonmail.com wrote:
>
> > Thank you for the fixes. However, I have some remarks about your changes
> > to PKGNAME. Having the package named 'gallery_dl' is inconsistent with
> > the program's name, 'gallery-dl'. I suggest using something such as
> >
> > PKGNAME = gallery-dl-${MODPY_EGG_VERSION}
> > (perhaps there is a more elegant way to do it)
> >
> > Attached is the port with your modifications + my suggested PKGNAME.
> >
> > ------- Original Message -------
> >
> > > On 2023/11/06 15:57, grodzio wrote:
> > >
> > > > Hello, attached is an updated port of gallery-dl that I had submitted
> > > > earlier.
> > > >
> > > > Additionally, I used Stefan's modifications from the previous thread,
> > > >
> > > > many thanks, Stefan.
> > > >
> > > > Program tested on amd64, works fine on my end.
> > > >
> > > > Also, I will be using this email address from now on.
> > > >
> > > > Ok to import? Comments?
> > > > -grodzio1
> > >
> > > - Probably better to fetch it from pypi since it's there (same distfile).
> > > - The extra VERSION variable isn't needed.
> > > - Fix the py-requests dependency (missing flavour).
> > > - Show package names for the optional deps.
> > > - Don't use DISTFILES for a simple case where there's one distfile which
> > > does not need renaming, just set DISTNAME correctly (which removes the
> > > need to override the default WRKDIST).
> > >
> > > diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile
> > > index 5ef613a..b9ab2e8 100644
> > > --- a/www/gallery-dl/Makefile
> > > +++ b/www/gallery-dl/Makefile
> > > @@ -1,24 +1,20 @@
> > > COMMENT = CLI program to mass download images from various websites
> > >
> > > -VERSION = 1.26.2
> > > -MODPY_EGG_VERSION = ${VERSION}
> > > -DISTNAME = gallery-dl-${VERSION}
> > > +MODPY_EGG_VERSION = 1.26.2
> > > +DISTNAME = gallery_dl-${MODPY_EGG_VERSION}
> > > +PKGNAME = ${DISTNAME:S/$/-/}
> > > CATEGORIES = www
> > > HOMEPAGE = https://github.com/mikf/gallery-dl/
> > >
> > > -MAINTAINER = grodzio1 grod...@protonmail.com
> > >
> > > +MAINTAINER = grodzio1 grod...@protonmail.com
> > >
> > > # GPL 2.0
> > > PERMIT_PACKAGE = Yes
> > >
> > > -SITES = ${HOMEPAGE}/releases/download/v${VERSION}/
> > > -DISTFILES = gallery_dl-${VERSION}${EXTRACT_SUFX}
> > > -
> > > MODULES = lang/python
> > > +MODPY_PI = Yes
> > > MODPY_PYBUILD = setuptools
> > >
> > > -RUN_DEPENDS = www/py-requests
> > > -
> > > -WRKDIST = ${WRKDIR}/gallery_dl-${VERSION}
> > > +RUN_DEPENDS = www/py-requests${MODPY_FLAVOR}
> > >
> > > .include <bsd.port.mk>
> > >
> > > diff --git a/www/gallery-dl/pkg/README b/www/gallery-dl/pkg/README
> > > index f41cdb4..50ed7bb 100644
> > > --- a/www/gallery-dl/pkg/README
> > > +++ b/www/gallery-dl/pkg/README
> > > @@ -8,10 +8,10 @@ All supported websites can be listed with:
> > > Some features are only available after installing an optional
> > > dependency:
> > >
> > > -ffmpeg - Pixiv Ugoira conversion
> > > -py-socks - SOCKS proxy support
> > > -brotli - Brotli compression support
> > > -py-yaml - YAML configuration file support
> > > -py-toml - TOML configuration file support for Python<3.11
> > > -py-secretstorage - Keyring passwords (--cookies-from-browser)
> > > +ffmpeg - Pixiv Ugoira conversion
> > > +py3-socks - SOCKS proxy support
> > > +py3-brotli - Brotli compression support
> > > +py3-yaml - YAML configuration file support
> > > +py3-toml - TOML configuration file support for Python<3.11
> > > +py3-secretstorage - Keyring passwords (--cookies-from-browser)
gallery-dl.tar.gz
Description: application/gzip
