On 2023/05/02 16:29:41 -0700, Nam Nguyen <n...@berkeley.edu> wrote:
>
> Here is an update to megatools 1.11.1, released on February 12,
> 2023. Upstream has switched to meson.
>
> changelog for 1.11.1 and 1.11.0:
> https://megatools.megous.com/builds/NEWS
>
> This port update does the following:
>
> - copes with the suffix date by removing it for PKGNAME
> - regens WANTLIB. ssl is pulled in by curl and intl and pthread are
> pulled in by glib-2.0 according to `env LD_DEBUG= megatools'
> - adds textproc/docbook2x since meson.build checks for asciidoc and
> docbook2x in order to build man pages
> - moves to meson and adds devel/ninja
> - sets NO_TEST because the tests just use the tools and require network
> access
> - There is now one binary megatools. Install all associated man pages
> and docs. I chose not to install symlinks (e.g., megadl --> megatools
> dl).
>
> I tested `megatools dl', which worked, but `megatools reg' failed, as
> with the current version.
>
> Feedback and tests are welcome. OK?
sorry for chiming in but I used it often and the diff seemed a bit
off.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/megatools/Makefile,v
> retrieving revision 1.22
> diff -u -p -u -p -r1.22 Makefile
> --- Makefile 11 Mar 2022 19:46:20 -0000 1.22
> +++ Makefile 2 May 2023 23:08:35 -0000
> @@ -2,8 +2,10 @@ PORTROACH = limit:[0-9]\.tar\.gz
>
> COMMENT = command line client application for Mega
>
> -DISTNAME = megatools-1.10.3
> -REVISION = 0
> +V = 1.11.1
> +DATE = 20230212
> +DISTNAME = megatools-${V}.${DATE}
> +PKGNAME = ${DISTNAME:S/.${DATE}//}
>
> CATEGORIES = net
>
> @@ -14,23 +16,39 @@ MAINTAINER = Anthony J. Bentley <anthon
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = c crypto curl gio-2.0 glib-2.0 gobject-2.0 intl pthread
> -WANTLIB += ssl
> +WANTLIB += c crypto curl gio-2.0 glib-2.0 gobject-2.0
>
> MASTER_SITES = https://megatools.megous.com/builds/
>
> COMPILER = base-clang ports-gcc
> BUILD_DEPENDS = devel/gobject-introspection \
> - textproc/asciidoc
> + devel/ninja \
> + textproc/asciidoc \
> + textproc/docbook2x
> LIB_DEPENDS = devel/glib2 \
> net/curl
>
> -USE_GMAKE = Yes
> -CONFIGURE_STYLE = gnu
> -MAKE_FLAGS = VERBOSE=1
> +MODULE = devel/meson
^^^^^^
typo, this should be MODULES.
Then the various custom target do-*, the explicit BDEP on ninja and
SEPARATE_BUILD become redundant, as they're set by meson.port.mk
(except for the installing of README)
upstream install targets also takes care of adding symlink for the old
commands.
I haven't used anything other than megadl, but that continues to work
for me so ok once this is adjusted.
> -CONFIGURE_ARGS = --disable-introspection
> +do-configure:
> + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} meson setup ${WRKBUILD}
> +
> +do-build:
> + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -C ${WRKBUILD}
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKBUILD}/${PKGSTEM} ${PREFIX}/bin
> +.for M in 1 5
> + ${INSTALL_DATA} ${WRKBUILD}/*.${M} ${PREFIX}/man/man${M}
> +.endfor
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGSTEM}
> +.for F in README NEWS TODO LICENSE
> + ${INSTALL_DATA} ${WRKSRC}/${F} ${PREFIX}/share/doc/${PKGSTEM}
> +.endfor
>
> SEPARATE_BUILD = Yes
> +
> +# tests require network access
> +NO_TEST = Yes
>
> .include <bsd.port.mk>
