Omar Polo writes:
> sorry for chiming in but I used it often and the diff seemed a bit
> off.
>> +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.
Thanks. I was wondering why I had to do so much work for meson. I have
incorporated all your feedback in this fresh diff.
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 3 May 2023 15:44:22 -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,20 @@ 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
+ textproc/asciidoc \
+ textproc/docbook2x
LIB_DEPENDS = devel/glib2 \
net/curl
-USE_GMAKE = Yes
-CONFIGURE_STYLE = gnu
-MAKE_FLAGS = VERBOSE=1
+MODULES = devel/meson
-CONFIGURE_ARGS = --disable-introspection
-
-SEPARATE_BUILD = Yes
+# tests require network access
+NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/megatools/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 19 May 2020 06:22:48 -0000 1.7
+++ distinfo 3 May 2023 15:44:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (megatools-1.10.3.tar.gz) = jcHKNIYz/UnefrgysyPo3ClfHFWu+0hNMOZHUhhVi9s=
-SIZE (megatools-1.10.3.tar.gz) = 196361
+SHA256 (megatools-1.11.1.20230212.tar.gz) = 7Pou5LJ3xgHrrmSChzEQMKpMpz6mHucwvGa+8k7xmjQ=
+SIZE (megatools-1.11.1.20230212.tar.gz) = 105339
Index: patches/patch-lib_mega_c
===================================================================
RCS file: /cvs/ports/net/megatools/patches/patch-lib_mega_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-lib_mega_c
--- patches/patch-lib_mega_c 11 Mar 2022 19:46:20 -0000 1.4
+++ patches/patch-lib_mega_c 3 May 2023 15:44:22 -0000
@@ -3,7 +3,7 @@ Fix build with opaque RSA in LibreSSL 3.
Index: lib/mega.c
--- lib/mega.c.orig
+++ lib/mega.c
-@@ -785,7 +785,7 @@ static gboolean rsa_key_gen(struct rsa_key *k)
+@@ -787,7 +787,7 @@ static gboolean rsa_key_gen(struct rsa_key *k)
return FALSE;
}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/megatools/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 19:46:20 -0000 1.5
+++ pkg/PLIST 3 May 2023 15:44:22 -0000
@@ -1,26 +1,29 @@
-@bin bin/megacopy
-@bin bin/megadf
-@bin bin/megadl
-@bin bin/megaget
-@bin bin/megals
-@bin bin/megamkdir
-@bin bin/megaput
-@bin bin/megareg
-@bin bin/megarm
-@man man/man1/megacopy.1
-@man man/man1/megadf.1
-@man man/man1/megadl.1
-@man man/man1/megaget.1
-@man man/man1/megals.1
-@man man/man1/megamkdir.1
-@man man/man1/megaput.1
-@man man/man1/megareg.1
-@man man/man1/megarm.1
+bin/megacopy
+bin/megadf
+bin/megadl
+bin/megaexport
+bin/megaget
+bin/megals
+bin/megamkdir
+bin/megaput
+bin/megareg
+bin/megarm
+bin/megatest
+@bin bin/megatools
+@man man/man1/megatools-copy.1
+@man man/man1/megatools-df.1
+@man man/man1/megatools-dl.1
+@man man/man1/megatools-export.1
+@man man/man1/megatools-get.1
+@man man/man1/megatools-ls.1
+@man man/man1/megatools-mkdir.1
+@man man/man1/megatools-put.1
+@man man/man1/megatools-reg.1
+@man man/man1/megatools-rm.1
+@man man/man1/megatools-test.1
+@man man/man1/megatools.1
@man man/man5/megarc.5
-@man man/man7/megatools.7
share/doc/megatools/
-share/doc/megatools/HACKING
-share/doc/megatools/INSTALL
share/doc/megatools/LICENSE
share/doc/megatools/NEWS
share/doc/megatools/README
No comments:
Post a Comment