- Update to 1.1.3.

- Remove perl5 dependency (see PR for details).
- Strip as part of the install rather than post-install due to permission
  problems.
- Mark as -jn safe

PR:		199363
Submitted by:	Ben Woods (maintainer)

3 files changed, 15 insertions, 8 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 3ddf3b1e6db2..53ec1ff2b1f2 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -22,7 +22,9 @@
 # IPV6: Enable to support IPv6 connections. The real configuration takes
 #	place at run-time so keeping it enabled will not force IPv6 usage.
 #
-# DBUS: Enable D-Bus IPC support. No further information available.
+# DBUS: Enable D-Bus IPC support. Gtk-Gnutella will send out messages onto
+#	the D-Bus message bus. That way external applications can easily
+#	act on certain events that happen, such as a completed download.
 #
 # DEBUG: Compile with debugging symbols. Useful if you intend to make a
 #	bug report.
@@ -33,7 +35,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF
 
@@ -42,7 +44,7 @@ COMMENT=	GTK based Gnutella client
 
 LICENSE=	GPLv2 # (or later)
 
-USES=		iconv perl5 pkgconfig tar:bzip2
+USES=		iconv pkgconfig tar:bzip2
 USE_GNOME=	glib20 libxml2
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
@@ -52,10 +54,10 @@ CONFIGURE_ARGS=	-O -Dyacc='byacc' \
 		-Dmansrc='${MANPREFIX}/man/man1' \
 		-Dlocale='${PREFIX}/share/locale' \
 		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
-		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}'
+		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}' \
+		-Dusemymalloc='n'
 MAKE_ARGS=	INSTALL_PREFIX="${STAGEDIR}"
 INSTALL_TARGET=	install install.man
-MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -97,6 +99,10 @@ post-extract:
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@exit 0|@echo done|'
+.if empty(PORT_OPTIONS:MDEBUG)
+	@${REINPLACE_CMD} 's/(INSTALL) -c -m 555/(INSTALL) -c -s -m 555/g' \
+		${WRKSRC}/src/Makefile.SH
+.endif
 
 post-install:
 .if ${PORT_OPTIONS:MGUI}
@@ -109,6 +115,5 @@ post-install:
 	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/gtk-gnutella.svg)
 .endif
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gtk-gnutella
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index ccefb41830c5..7d96bf3e859e 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-gnutella-1.1.2.tar.bz2) = 8391beee37e840b2ccd6bdccdb7f5464c6ed032ac8635607f12e20b791a03683
-SIZE (gtk-gnutella-1.1.2.tar.bz2) = 19504456
+SHA256 (gtk-gnutella-1.1.3.tar.bz2) = 2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405
+SIZE (gtk-gnutella-1.1.3.tar.bz2) = 19504243
diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist
index 3189940f8d2c..cd5794fe5d8f 100644
--- a/net-p2p/gtk-gnutella/pkg-plist
+++ b/net-p2p/gtk-gnutella/pkg-plist
@@ -32,6 +32,8 @@ share/applications/gtk-gnutella.desktop
 %%DATADIR%%/pixmaps/firewall_udp.xpm
 %%DATADIR%%/pixmaps/firewall_udp_punchable.xpm
 %%DATADIR%%/pixmaps/freeze.xpm
+%%DATADIR%%/pixmaps/go_back.xpm
+%%DATADIR%%/pixmaps/hungup.xpm
 %%DATADIR%%/pixmaps/icon.16x16.xpm
 %%DATADIR%%/pixmaps/icon.48x48.xpm
 %%DATADIR%%/pixmaps/icon.xpm