git: 9a32701b738f - main - net-p2p/gtk-gnutella: the port had been updated and improved (+)

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a32701b738f3ced9488bc558566cd6c01c46773

commit 9a32701b738f3ced9488bc558566cd6c01c46773
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-15 11:55:32 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-15 11:55:34 +0000

    net-p2p/gtk-gnutella: the port had been updated and improved (+)
    
    - Update to version 1.2.1, which now needs GNU make to build
    - Switch to SourceForge where official releases are published; this
      also means shorter distfile name, correctly preserved modification
      time, and alleviates the need for DISTVERSIONPREFIX abomination
    - Remove ONLY_FOR_ARCHS constraint: there should not be anything
      architecture-specific about server/client program for Gnutella,
      modulo some fragility in their custom memory allocator
    - Force previous (as in version 1.1.15) alignment value on i386 and
      likely other 32-bit architectures to unbreak the build there
    - Drop non-standard IRC line from the port description and improve
      creator's attribution while I'm here
    
    PR:     258276
---
 net-p2p/gtk-gnutella/Makefile  | 16 +++++++++-------
 net-p2p/gtk-gnutella/distinfo  |  6 +++---
 net-p2p/gtk-gnutella/pkg-descr |  1 -
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 0961bd44b91a..6b3559b009ba 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -1,9 +1,9 @@
-# Created by: rbt at zort.on.ca
+# Created by: Rod Taylor <rbt at zort.on.ca>
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	1.1.15
-DISTVERSIONPREFIX=v
+PORTVERSION=	1.2.1
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	GTK based Gnutella client
@@ -11,12 +11,10 @@ COMMENT=	GTK based Gnutella client
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 i386
+LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
-USES=		gnome iconv localbase:ldflags pkgconfig tar:xz
-USE_GITHUB=	yes
+USES=		gmake gnome iconv localbase:ldflags pkgconfig tar:xz
 USE_GNOME=	glib20 libxml2
-
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='byacc' \
@@ -59,6 +57,10 @@ CONFIGURE_ARGS+=	-ders
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@exit 0|@echo done|'
+# Use memory alignment constraints as in version 1.1.15 to unbreak the
+# build on 32-bit architectures
+	@${REINPLACE_CMD} -e 's,^#ifdef XMALLOC_IS_MALLOC,#if __SIZE_WIDTH__\
+		== 32,' ${WRKSRC}/src/lib/xmalloc.h
 
 post-patch-DEBUG-off:
 	@${REINPLACE_CMD} 's/(INSTALL) -c -m 555/(INSTALL) -c -s -m 555/g' \
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 48a151a6e2e6..9ed89e85eb23 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565005144
-SHA256 (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = a72fd0b57bbc458c8fe5556bd171cd3cae940fa131c5783ab4114f29d85d9122
-SIZE (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = 22899323
+TIMESTAMP = 1626271947
+SHA256 (gtk-gnutella-1.2.1.tar.xz) = b76de8d1cd470966e322522539ccb9abb1b5c5f7c7f72af9acb95dff51bfbada
+SIZE (gtk-gnutella-1.2.1.tar.xz) = 20623440
diff --git a/net-p2p/gtk-gnutella/pkg-descr b/net-p2p/gtk-gnutella/pkg-descr
index 71bc4291f009..f00145abdb82 100644
--- a/net-p2p/gtk-gnutella/pkg-descr
+++ b/net-p2p/gtk-gnutella/pkg-descr
@@ -10,4 +10,3 @@ An excellent way to find that hidden file on the internet that you know
 exists but standard search engines do not seem to carry.
 
 WWW: http://gtk-gnutella.sourceforge.net/
-IRC: #gtk-gnutella on freenode.net