net/megacmd: apply suggestions and fixes * more informal DESCR * remove --std= from CXXFLAGS * ducument patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: net/megacmd: apply suggestions and fixes * more informal DESCR * remove --std= from CXXFLAGS * ducument patches
From: kikadf <kikadf.01%gmail.com@localhost>
Date: Wed, 5 Jun 2024 17:39:13 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Wed Jun 5 19:30:48 2024 +0200
Changeset:	3b17305c8a64e35aa135f00a41f7a65368dce095

Modified Files:
	megacmd/DESCR
	megacmd/Makefile
	megacmd/distinfo
	megacmd/patches/patch-Makefile.am
	megacmd/patches/patch-configure.ac
	megacmd/patches/patch-sdk_Makefile.am
	megacmd/patches/patch-sdk_configure.ac
	megacmd/patches/patch-sdk_include_mega_http.h
	megacmd/patches/patch-sdk_include_mega_posix_megafs.h
	megacmd/patches/patch-sdk_include_mega_posix_megasys.h
	megacmd/patches/patch-sdk_src_http.cpp
	megacmd/patches/patch-sdk_src_include.am
	megacmd/patches/patch-sdk_src_posix_fs.cpp
	megacmd/patches/patch-src_include.am
	megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp

Log Message:
net/megacmd: apply suggestions and fixes
* more informal DESCR
* remove --std= from CXXFLAGS
* ducument patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b17305c8a64e35aa135f00a41f7a65368dce095

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 megacmd/DESCR                                      | 13 +++++++-----
 megacmd/Makefile                                   |  4 ++--
 megacmd/distinfo                                   | 24 +++++++++++-----------
 megacmd/patches/patch-Makefile.am                  |  3 +++
 megacmd/patches/patch-configure.ac                 |  3 +++
 megacmd/patches/patch-sdk_Makefile.am              |  3 +++
 megacmd/patches/patch-sdk_configure.ac             |  7 +++++++
 megacmd/patches/patch-sdk_include_mega_http.h      |  3 +++
 .../patches/patch-sdk_include_mega_posix_megafs.h  |  3 +++
 .../patches/patch-sdk_include_mega_posix_megasys.h |  3 +++
 megacmd/patches/patch-sdk_src_http.cpp             |  3 +++
 megacmd/patches/patch-sdk_src_include.am           |  7 +++++--
 megacmd/patches/patch-sdk_src_posix_fs.cpp         |  2 ++
 megacmd/patches/patch-src_include.am               |  2 ++
 ...src_megacmdshell_megacmdshellcommunications.cpp |  3 +++
 15 files changed, 62 insertions(+), 21 deletions(-)

diffs:
diff --git a/megacmd/DESCR b/megacmd/DESCR
index 31497df882..366cf56ae5 100644
--- a/megacmd/DESCR
+++ b/megacmd/DESCR
@@ -1,5 +1,8 @@
-MEGAcmd provides non UI access to MEGA services.
-It intends to offer all the functionality with your
-MEGA account via commands. It features synchronization,
-backup of local folders into your MEGA account and
-a webdav/streaming server.
+MEGA brings cloud storage, file and folder sharing,
+chat, meetings, and more - together into one place.
+MEGAcmd is a free, open source tool that provides
+non UI access to MEGA services. It intends to offer
+all the functionality with your MEGA account via
+commands. It features synchronization, backup of
+local folders into your MEGA account and a webdav
+or streaming server.
diff --git a/megacmd/Makefile b/megacmd/Makefile
index 16d5030eac..a9d6354169 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -17,12 +17,12 @@ LICENSE=	gnu-gpl-v3 AND 2-clause-bsd
 
 USE_LANGUAGES+=		c c++
 USE_CXX_FEATURES+=	filesystem
+FORCE_CXX_STD=		c++17
 USE_LIBTOOL=		yes
 USE_TOOLS+=		autoreconf autoconf automake gmake
 GNU_CONFIGURE=		yes
 REPLACE_SH=		src/client/mega-*
-CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM -std=c++17
-BUILDLINK_TRANSFORM+=	rm:-std=c++11
+CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM
 
 CONFIGURE_ARGS+=	--disable-examples
 CONFIGURE_ARGS+=	--disable-java
diff --git a/megacmd/distinfo b/megacmd/distinfo
index 88ab2806d9..fbc0eea91a 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -6,15 +6,15 @@ Size (megacmd-1.7.0.tar.gz) = 2124305 bytes
 BLAKE2s (meganz-sdk-v4.31.0b.tar.gz) = ca471a7fc6fbcb3a5cea04aff2bfedcd77d33ca6cfd741f3954381f9bfc1af94
 SHA512 (meganz-sdk-v4.31.0b.tar.gz) = 525fbdb7bb4bb6e02cc0268a788f744258e41bb39e78c33c3ac1d21c54ad78a630775aa4440529cc3faa4c0679db0a72161f856c49e15d721487a748a0a08969
 Size (meganz-sdk-v4.31.0b.tar.gz) = 3592431 bytes
-SHA1 (patch-Makefile.am) = 4295c33db8d45efb832a127b8bfc499eef796c6f
-SHA1 (patch-configure.ac) = cd5949a20bf0d6f9116923d50364413ec321756e
-SHA1 (patch-sdk_Makefile.am) = e4e1967c0b32d97876d6521b9b4c1aa22c98f5b4
-SHA1 (patch-sdk_configure.ac) = c7b5d020b4562fcb4ca3e427665e14ad0a5dd6f7
-SHA1 (patch-sdk_include_mega_http.h) = 131d605db81b723a9e27ae9d73f34e8dac5e6512
-SHA1 (patch-sdk_include_mega_posix_megafs.h) = 9495689a2fd4b0d790c2853d5a1ebb42a55f083b
-SHA1 (patch-sdk_include_mega_posix_megasys.h) = fe66e9f3f49cc1fd2e023e11ad58a7709abc8da8
-SHA1 (patch-sdk_src_http.cpp) = ed22a97857f4cd5a092a0022745929ef9db1612c
-SHA1 (patch-sdk_src_include.am) = 039a700cbeaed76a8e2da1eb3d5a3c68aaf810a9
-SHA1 (patch-sdk_src_posix_fs.cpp) = 1fbf66ec3c5a84cc7bdedb1e19291433c26abec1
-SHA1 (patch-src_include.am) = 959fd2cff9c66816293842ad75805246281833c0
-SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = 6ee5e623ec4b882fbb1c58042fc6207d5f02ab12
+SHA1 (patch-Makefile.am) = 68b2a67c0b3ddac4b247fc6e0f6dd7ab068d90bd
+SHA1 (patch-configure.ac) = e05d9a14c7190f450bbb7264fa3641a8b50b3c7f
+SHA1 (patch-sdk_Makefile.am) = 3b83578498bf2917116bc18b31adf09f0c46d9b8
+SHA1 (patch-sdk_configure.ac) = ed55c46f0614a5acc5ea3edc69934fb72f5afd46
+SHA1 (patch-sdk_include_mega_http.h) = a3845e17a6bb5ea9985f1a7de152f1c43a1767ec
+SHA1 (patch-sdk_include_mega_posix_megafs.h) = cee06d1b594588a9fb2c07828d436c74188022e5
+SHA1 (patch-sdk_include_mega_posix_megasys.h) = 02b6259c8932163dee52baeec5e1e07003288279
+SHA1 (patch-sdk_src_http.cpp) = 85b1ef20d4f512e38e336cb4ca2cfbe74372e040
+SHA1 (patch-sdk_src_include.am) = 93eae44fc1fa3ec6f621c7aba8266d63ec835ad7
+SHA1 (patch-sdk_src_posix_fs.cpp) = fdf5129f54a65d3bc52e9a6c6b2e76fdc40026e2
+SHA1 (patch-src_include.am) = 6a7d0dc05a23463066fa74434af1af18f18e0885
+SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = 7ce41cfcfbc7c8df8f6176bc2abd6a08825fef80
diff --git a/megacmd/patches/patch-Makefile.am b/megacmd/patches/patch-Makefile.am
index 2e57f9807a..696a827244 100644
--- a/megacmd/patches/patch-Makefile.am
+++ b/megacmd/patches/patch-Makefile.am
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add --tag=CXX libtool flag on NetBSD and Dragonfly.
+Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
+
 --- Makefile.am.orig	2024-05-20 12:29:43.000000000 +0000
 +++ Makefile.am
 @@ -39,6 +39,14 @@ if LINUX
diff --git a/megacmd/patches/patch-configure.ac b/megacmd/patches/patch-configure.ac
index a9b1a6419e..849a6bb442 100644
--- a/megacmd/patches/patch-configure.ac
+++ b/megacmd/patches/patch-configure.ac
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add NetBSD and DragonFly support to configure script.
+Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
+
 --- configure.ac.orig	2024-05-20 12:29:43.000000000 +0000
 +++ configure.ac
 @@ -209,6 +209,8 @@ WIN32=no
diff --git a/megacmd/patches/patch-sdk_Makefile.am b/megacmd/patches/patch-sdk_Makefile.am
index 59e318c57f..8650602ca8 100644
--- a/megacmd/patches/patch-sdk_Makefile.am
+++ b/megacmd/patches/patch-sdk_Makefile.am
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add --tag=CXX libtool flag on NetBSD and DragonFly
+Upstream pull req: https://github.com/meganz/sdk/pull/2663
+
 --- sdk/Makefile.am.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/Makefile.am
 @@ -46,6 +46,14 @@ if LINUX
diff --git a/megacmd/patches/patch-sdk_configure.ac b/megacmd/patches/patch-sdk_configure.ac
index 7f46b9ffcc..1e31dea2c6 100644
--- a/megacmd/patches/patch-sdk_configure.ac
+++ b/megacmd/patches/patch-sdk_configure.ac
@@ -1,5 +1,12 @@
 $NetBSD$
 
+Add NetBSD and DragonFly support.
+Upstream pull req: https://github.com/meganz/sdk/pull/2663
+
+Add --with-rt=... configure option, syncing  with aio_write
+doesn't work on NetBSD, workaround build without rt support.
+Upstream pull req: https://github.com/meganz/sdk/pull/2665
+
 --- sdk/configure.ac.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/configure.ac
 @@ -208,6 +208,8 @@ WIN32=no
diff --git a/megacmd/patches/patch-sdk_include_mega_http.h b/megacmd/patches/patch-sdk_include_mega_http.h
index 6af5789b43..91b849495f 100644
--- a/megacmd/patches/patch-sdk_include_mega_http.h
+++ b/megacmd/patches/patch-sdk_include_mega_http.h
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add support to other BSDs.
+Upstream pull req: https://github.com/meganz/sdk/pull/2662
+
 --- sdk/include/mega/http.h.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/include/mega/http.h
 @@ -42,7 +42,7 @@
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
index 4a3b248990..9eb73dab6c 100644
--- a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add support to other BSDs.
+Upstream pull req: https://github.com/meganz/sdk/pull/2662
+
 --- sdk/include/mega/posix/megafs.h.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/include/mega/posix/megafs.h
 @@ -32,7 +32,7 @@
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megasys.h b/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
index 61ee86f0f4..250d1638a9 100644
--- a/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Add support to other BSDs.
+Upstream pull req: https://github.com/meganz/sdk/pull/2662
+
 --- sdk/include/mega/posix/megasys.h.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/include/mega/posix/megasys.h
 @@ -99,7 +99,8 @@
diff --git a/megacmd/patches/patch-sdk_src_http.cpp b/megacmd/patches/patch-sdk_src_http.cpp
index 126809f42f..b64b13fdc7 100644
--- a/megacmd/patches/patch-sdk_src_http.cpp
+++ b/megacmd/patches/patch-sdk_src_http.cpp
@@ -1,5 +1,8 @@
 $NetBSD$
 
+NetBSD and OpenBSD don't support AI_V4MAPPED.
+Upstream pull req: https://github.com/meganz/sdk/pull/2664
+
 --- sdk/src/http.cpp.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/src/http.cpp
 @@ -270,8 +270,12 @@ void HttpIO::getMEGADNSservers(string *d
diff --git a/megacmd/patches/patch-sdk_src_include.am b/megacmd/patches/patch-sdk_src_include.am
index bfbb8dbd0e..e2580170b4 100644
--- a/megacmd/patches/patch-sdk_src_include.am
+++ b/megacmd/patches/patch-sdk_src_include.am
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Handle LIBRT_* flags
+Upstream pull req: https://github.com/meganz/sdk/pull/2665
+
 --- sdk/src/include.am.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/src/include.am
 @@ -5,14 +5,14 @@ lib_LTLIBRARIES = src/libmega.la
@@ -7,7 +10,7 @@ $NetBSD$
  src_libmega_la_CXXFLAGS = -D_WIN32=1 -Iinclude/ -Iinclude/mega/win32 $(LIBS_EXTRA) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(CXXFLAGS) $(WINHTTP_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(PCRE_CXXFLAGS)
  else
 -src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
-+src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBRT_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
++src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBRT_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
  endif
  
  # Libs
@@ -15,7 +18,7 @@ $NetBSD$
  src_libmega_la_LIBADD = $(LIBS_EXTRA)  $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(WINHTTP_LDFLAGS) $(WINHTTP_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
  else
 -src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
-+src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBRT_LDFLAGS) $(LIBRT_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
++src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBRT_LDFLAGS) $(LIBRT_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
  endif
  
  # add library version
diff --git a/megacmd/patches/patch-sdk_src_posix_fs.cpp b/megacmd/patches/patch-sdk_src_posix_fs.cpp
index c570cf040d..f49c86bae5 100644
--- a/megacmd/patches/patch-sdk_src_posix_fs.cpp
+++ b/megacmd/patches/patch-sdk_src_posix_fs.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix build on NetBSD, use statvfs
+
 --- sdk/src/posix/fs.cpp.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/src/posix/fs.cpp
 @@ -27,6 +27,9 @@
diff --git a/megacmd/patches/patch-src_include.am b/megacmd/patches/patch-src_include.am
index 46ef96156c..c6441eed2e 100644
--- a/megacmd/patches/patch-src_include.am
+++ b/megacmd/patches/patch-src_include.am
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix bash-completion path
+
 --- src/include.am.orig	2024-05-20 12:29:43.000000000 +0000
 +++ src/include.am
 @@ -16,7 +16,7 @@ bin_PROGRAMS += $(MEGACMD) $(TESTS)
diff --git a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
index d9017ebd08..d97abed138 100644
--- a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
+++ b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Fix include on BSDs
+Upstream pull req: https://github.com/meganz/MEGAcmd/pull/949
+
 --- src/megacmdshell/megacmdshellcommunications.cpp.orig	2024-05-20 12:29:43.000000000 +0000
 +++ src/megacmdshell/megacmdshellcommunications.cpp
 @@ -55,7 +55,7 @@
Prev by Date: py-librosa: Update to v0.10.2
Next by Date: proj-data: Update to 1.18
Previous by Thread: py-librosa: Update to v0.10.2
Next by Thread: proj-data: Update to 1.18
Indexes:
Home | Main Index | Thread Index | Old Index