pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

megacmd: fix bash completion path, Makefile cleanup



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Mar 4 10:14:41 2024 +0100
Changeset:	972f894cb6487a5dc602d4645f8d51b42b4e264b

Modified Files:
	megacmd/Makefile
	megacmd/PLIST
	megacmd/TODO
	megacmd/distinfo
	megacmd/patches/patch-src_include.am

Log Message:
megacmd: fix bash completion path, Makefile cleanup

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

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

diffstat:
 megacmd/Makefile                     | 28 ++++++++++++++++------------
 megacmd/PLIST                        |  2 +-
 megacmd/TODO                         |  7 +++----
 megacmd/distinfo                     |  2 +-
 megacmd/patches/patch-src_include.am |  2 +-
 5 files changed, 22 insertions(+), 19 deletions(-)

diffs:
diff --git a/megacmd/Makefile b/megacmd/Makefile
index 0f87300607..377ff2bd58 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -2,7 +2,6 @@
 
 DISTNAME=	megacmd-1.6.3
 CATEGORIES=	net
-#PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=meganz/}
 GITHUB_PROJECT=	MEGAcmd
 GITHUB_TAG=	${PKGVERSION_NOREV}_Linux
@@ -25,23 +24,28 @@ REPLACE_SH=		src/client/mega-*
 CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM -std=c++17
 BUILDLINK_TRANSFORM+=	rm:-std=c++11
 
-EGDIR=		${PREFIX}/share/examples/megacmd
-CONF_FILES=	${EGDIR}/megacmd_completion.sh ${PKG_SYSCONFDIR}/bash_completion.d/megacmd_completion.sh
-
-#INSTALLATION_DIRS=	${EGDIR}
-#MAKE_DIRS=		${PKG_SYSCONFDIR}/bash_completion.d
-
-CONFIGURE_ARGS=	--disable-examples --disable-java --disable-php \
-		--disable-python --disable-chat --without-freeimage \
-		--without-termcap --without-ffmpeg --without-libraw \
-		--without-libzen --without-libmediainfo \
-		--without-rt --enable-gcc-hardening
+CONFIGURE_ARGS=	--disable-examples \
+		--disable-java \
+		--disable-php \
+		--disable-python \
+		--disable-chat \
+		--without-freeimage \
+		--without-termcap \
+		--without-ffmpeg \
+		--without-libraw \
+		--without-libzen \
+		--without-libmediainfo \
+		--enable-gcc-hardening
 
 CHECK_PORTABILITY_SKIP+=	sdk/bindings/ios/3rdparty/*.sh
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
 
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/bash-completion/completions/megacmd_completion.sh \
+		${DESTDIR}${PREFIX}/share/bash-completion/completions/megacmd
+
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/megacmd/PLIST b/megacmd/PLIST
index 371fd428ea..6bfbcb6e41 100644
--- a/megacmd/PLIST
+++ b/megacmd/PLIST
@@ -127,4 +127,4 @@ include/megaapi.h
 include/megaapi_impl.h
 lib/libmega.la
 lib/pkgconfig/libmega.pc
-share/examples/megacmd/megacmd_completion.sh
+share/bash-completion/completions/megacmd
diff --git a/megacmd/TODO b/megacmd/TODO
index 87ab1fc0d5..b62a7d24d8 100644
--- a/megacmd/TODO
+++ b/megacmd/TODO
@@ -1,7 +1,6 @@
-Tested on NetBSD-10_RC3 amd64, works.
+Tested on NetBSD-10_RC3, NetBSD-9 amd64, works.
 
 Todo:
-1) Test on NetBSD-9
-2) Check async issue, not sync with enabled librt
-3) COMMIT_MSG
+1) Check async issue, not sync with enabled librt
+2) COMMIT_MSG
 
diff --git a/megacmd/distinfo b/megacmd/distinfo
index 3fb4be584b..065f563c84 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -13,5 +13,5 @@ SHA1 (patch-sdk_include_mega_http_h) = 6d2acb2bdfe444d94c27ee523c9499f73f2fb5fe
 SHA1 (patch-sdk_include_mega_posix_megafs_h) = 69b099d0e8b5ac54c70808ec825d834d9edac2a9
 SHA1 (patch-sdk_src_http.cpp) = 23ebb74d092c27ed26c34c41c5a812a1ba835933
 SHA1 (patch-sdk_src_posix_fs.cpp) = a6e2b45e8e4740ae4eb362a11e165b7740daf7c2
-SHA1 (patch-src_include.am) = 87f64f18c599ba3f5c1c7391f61c1cee7ac9b97e
+SHA1 (patch-src_include.am) = bd7f0899704b10e5c043ecd075adb750683f2272
 SHA1 (patch-src_megacmdshell_megacmdshellcommunications_cpp) = 99610633144ae5bcfcfbc52da43797c70ab9dd53
diff --git a/megacmd/patches/patch-src_include.am b/megacmd/patches/patch-src_include.am
index edd5f2e0c4..0ee7e0190e 100644
--- a/megacmd/patches/patch-src_include.am
+++ b/megacmd/patches/patch-src_include.am
@@ -9,7 +9,7 @@ $NetBSD$
  $(MEGACMD): $(top_builddir)/sdk/src/libmega.la
  noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdtransfermanager.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
 -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
-+megacmdcompletiondir = $(datadir)/examples/megacmd/
++megacmdcompletiondir = $(datadir)/bash-completion/completions/
  megacmdcompletion_DATA = src/client/megacmd_completion.sh
  megacmdscripts_bindir = $(bindir)
  


Home | Main Index | Thread Index | Old Index