Guitar: remove, imported to pkgsrc/devel/Guitar

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Guitar: remove, imported to pkgsrc/devel/Guitar
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 27 Jul 2025 08:34:57 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jul 27 10:34:47 2025 +0200
Changeset:	4bbeb53fcccd57cff07725bbb2636f405ac55b4d

Modified Files:
	Makefile
Removed Files:
	Guitar/DESCR
	Guitar/Makefile
	Guitar/PLIST
	Guitar/distinfo
	Guitar/patches/patch-filetype_file_src_gmtime__r.c
	Guitar/patches/patch-src_common_jstream.h
	Guitar/patches/patch-src_common_rwfile.h
	Guitar/patches/patch-src_platform.cpp
	Guitar/patches/patch-src_webclient.cpp
	Guitar/patches/patch-src_zip_ziparchive.cpp

Log Message:
Guitar: remove, imported to pkgsrc/devel/Guitar

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

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

diffstat:
 Guitar/DESCR                                       |  7 ----
 Guitar/Makefile                                    | 42 ----------------------
 Guitar/PLIST                                       |  2 --
 Guitar/distinfo                                    | 11 ------
 Guitar/patches/patch-filetype_file_src_gmtime__r.c | 19 ----------
 Guitar/patches/patch-src_common_jstream.h          | 15 --------
 Guitar/patches/patch-src_common_rwfile.h           | 15 --------
 Guitar/patches/patch-src_platform.cpp              | 18 ----------
 Guitar/patches/patch-src_webclient.cpp             | 16 ---------
 Guitar/patches/patch-src_zip_ziparchive.cpp        | 15 --------
 Makefile                                           |  2 +-
 11 files changed, 1 insertion(+), 161 deletions(-)

diffs:
diff --git a/Guitar/DESCR b/Guitar/DESCR
deleted file mode 100644
index 09e12f6d6e..0000000000
--- a/Guitar/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Git GUI Client
-
-* Open Source, Free Software (GPL v2)
-* Of course, commercial purposes is also free.
-* Run on Windows, macOS and Linux
-* Written in C++
-* Powered by Qt 6
diff --git a/Guitar/Makefile b/Guitar/Makefile
deleted file mode 100644
index 41c2c40872..0000000000
--- a/Guitar/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	Guitar-1.3.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=soramimi/}
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/soramimi/Guitar/
-COMMENT=	Git GUI Client
-LICENSE=	gnu-gpl-v2
-
-TOOL_DEPENDS+=	ruby34-[0-9]*:../../lang/ruby34
-
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
-
-PKGCONFIG_OVERRIDE+=	filetype/file/libmagic.pc.in
-PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-16.pc.in
-PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-32.pc.in
-PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-8.pc.in
-PKGCONFIG_OVERRIDE+=	filetype/pcre2/libpcre2-posix.pc.in
-
-# fix qt warning
-MAKE_ENV+=	LANG=C.UTF-8
-
-BUILD_DIRS=		filetype .
-INSTALLATION_DIRS+=	bin
-
-do-configure:
-	# avoid using pcre2, wants to build its own
-	${RM} ${BUILDLINK_DIR}/include/pcre2.h
-	cd ${WRKSRC}/filetype && ${QTDIR}/bin/qmake libfiletype.pro
-	cd ${WRKSRC} && ${QTDIR}/bin/qmake Guitar.pro
-	${LN} -s ${PREFIX}/bin/ruby34 ${BUILDLINK_DIR}/bin/ruby
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/_bin/Guitar ${DESTDIR}${PREFIX}/bin
-
-.include "../../graphics/qt6-qtsvg/buildlink3.mk"
-.include "../../x11/qt6-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/Guitar/PLIST b/Guitar/PLIST
deleted file mode 100644
index cd00ec91ce..0000000000
--- a/Guitar/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-bin/Guitar
diff --git a/Guitar/distinfo b/Guitar/distinfo
deleted file mode 100644
index ef17ed2083..0000000000
--- a/Guitar/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-BLAKE2s (Guitar-1.3.0.tar.gz) = c5be125f311985924b14b0397ff2d1c88ec0f88e889fd70bd0c9119c30ad03de
-SHA512 (Guitar-1.3.0.tar.gz) = bb5484c9a618b0b5ef08846b28ac79c05728ceffa2fdb668dc092461c13010b979484b9680695ae0e00f0748b661e92ef66aaf332954f34f65c0d47e0f8bac87
-Size (Guitar-1.3.0.tar.gz) = 29348519 bytes
-SHA1 (patch-filetype_file_src_gmtime__r.c) = ab52c180e4165fa1c541e6268481ddeb5f3e6329
-SHA1 (patch-src_common_jstream.h) = 0a6108072d5bb61b388f2b55fdf92899b30c4bc6
-SHA1 (patch-src_common_rwfile.h) = d693c7b9534d20c33e935527a6c182726a0a4f0a
-SHA1 (patch-src_platform.cpp) = 4e21e50e30bfef60f823daa5278c25cd828e1410
-SHA1 (patch-src_webclient.cpp) = 2c4a38cf3e298aa1dc6b31727a983f4d15bb2d31
-SHA1 (patch-src_zip_ziparchive.cpp) = 54cb11ab0e3995f5a32fcf1ef0cfa102a102f520
diff --git a/Guitar/patches/patch-filetype_file_src_gmtime__r.c b/Guitar/patches/patch-filetype_file_src_gmtime__r.c
deleted file mode 100644
index 666f417b65..0000000000
--- a/Guitar/patches/patch-filetype_file_src_gmtime__r.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-NetBSD provides gmtime_r().
-https://github.com/soramimi/Guitar/pull/165
-
---- filetype/file/src/gmtime_r.c.orig	2025-07-27 08:17:07.378630293 +0000
-+++ filetype/file/src/gmtime_r.c
-@@ -1,5 +1,6 @@
- /*	$File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $	*/
- 
-+#ifndef __NetBSD__
- #include "file.h"
- #ifndef	lint
- FILE_RCSID("@(#)$File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $")
-@@ -17,3 +18,4 @@ gmtime_r(const time_t *t, struct tm *tm)
- 	memcpy(tm, tmp, sizeof(*tm));
- 	return tmp;
- }
-+#endif
diff --git a/Guitar/patches/patch-src_common_jstream.h b/Guitar/patches/patch-src_common_jstream.h
deleted file mode 100644
index 0fb066e8df..0000000000
--- a/Guitar/patches/patch-src_common_jstream.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-https://github.com/soramimi/Guitar/commit/ad88334a0ba555585ea653924fb749c5805d9aa1
-
---- src/common/jstream.h.orig	2025-07-21 19:46:10.990061174 +0000
-+++ src/common/jstream.h
-@@ -1560,7 +1560,7 @@ struct Object {
- 
- static inline bool is_null(Variant const &v)
- {
--	return std::holds_alternative<nullptr_t>(v);
-+	return std::holds_alternative<null_t>(v);
- }
- static inline bool is_boolean(Variant const &v)
- {
diff --git a/Guitar/patches/patch-src_common_rwfile.h b/Guitar/patches/patch-src_common_rwfile.h
deleted file mode 100644
index a25694ff3f..0000000000
--- a/Guitar/patches/patch-src_common_rwfile.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-For size_t.
-https://github.com/soramimi/Guitar/pull/165
-
---- src/common/rwfile.h.orig	2025-07-21 19:38:54.440889238 +0000
-+++ src/common/rwfile.h
-@@ -1,6 +1,7 @@
- #ifndef RWFILE_H
- #define RWFILE_H
- 
-+#include <cstddef>
- #include <vector>
- 
- bool readfile(char const *path, std::vector<char> *out, int maxsize);
diff --git a/Guitar/patches/patch-src_platform.cpp b/Guitar/patches/patch-src_platform.cpp
deleted file mode 100644
index 00bd75e8c3..0000000000
--- a/Guitar/patches/patch-src_platform.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-For environ.
-https://github.com/soramimi/Guitar/pull/165
-
---- src/platform.cpp.orig	2025-07-21 19:39:15.714158714 +0000
-+++ src/platform.cpp
-@@ -1,6 +1,10 @@
- #include "platform.h"
- #include "ApplicationGlobal.h"
- 
-+#ifndef Q_OS_WIN
-+extern char** environ;
-+#endif
-+
- namespace platform {
- 
- void initNetworking()
diff --git a/Guitar/patches/patch-src_webclient.cpp b/Guitar/patches/patch-src_webclient.cpp
deleted file mode 100644
index 815f1ff1c1..0000000000
--- a/Guitar/patches/patch-src_webclient.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-NetBSD does not provide gethostbyname_r.
-https://github.com/soramimi/Guitar/pull/165
-
---- src/webclient.cpp.orig	2025-07-21 19:55:26.509062241 +0000
-+++ src/webclient.cpp
-@@ -102,7 +102,7 @@ bool HostNameResolver::resolve(const cha
- 	if (!name || !out) return false;
- 
- 	struct hostent *he = nullptr;
--#if defined(_WIN32) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(__APPLE__) || defined(__NetBSD__)
- 	he = ::gethostbyname(name);
- #else
- 	int err = 0;
diff --git a/Guitar/patches/patch-src_zip_ziparchive.cpp b/Guitar/patches/patch-src_zip_ziparchive.cpp
deleted file mode 100644
index 7e49b4b623..0000000000
--- a/Guitar/patches/patch-src_zip_ziparchive.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-For read() etc.
-https://github.com/soramimi/Guitar/pull/165
-
---- src/zip/ziparchive.cpp.orig	2025-07-21 19:41:18.048472674 +0000
-+++ src/zip/ziparchive.cpp
-@@ -2,6 +2,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <time.h>
-+#include <unistd.h>
- 
- #include "zipinternal.h"
- #include "zlib.h"
diff --git a/Makefile b/Makefile
index 8537e777dd..6c18b3b1be 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ SUBDIR+=	GSAlign
 SUBDIR+=	GSCommander
 SUBDIR+=	GenericRepeatFinder
 SUBDIR+=	Geomyidae-git
-SUBDIR+=	Guitar
 SUBDIR+=	HP-1973
 SUBDIR+=	HiGHS
 SUBDIR+=	I2util
@@ -747,6 +746,7 @@ SUBDIR+=	dmenu-git
 SUBDIR+=	dmt-ux
 SUBDIR+=	dnrd
 SUBDIR+=	dns2tcp
+SUBDIR+=	dnsdist
 SUBDIR+=	dnswalk
 SUBDIR+=	docbook-xsl-ko
 SUBDIR+=	docbook-xsl-ns
Prev by Date: Guitar: remove TODO, done
Next by Date: py-mbake: update to 1.3.1.post1.
Previous by Thread: Guitar: remove TODO, done
Next by Thread: py-mbake: update to 1.3.1.post1.
Indexes:
Home | Main Index | Thread Index | Old Index