ports/181890: net-p2p/gtk-gnutella: Update to version 1.0.0

Thu Oct 31 19:40:19 UTC 2013

The following reply was made to PR ports/181890; it has been noted by GNATS.

From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/181890: net-p2p/gtk-gnutella: Update to version 1.0.0
Date: Fri, 1 Nov 2013 04:26:22 +0900

 This is a multi-part message in MIME format.

 --Multipart=_Fri__1_Nov_2013_04_26_22_+0900_t5=d.l7cnV13vY5a
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit

 Remake of the patch against current tree.

 --Multipart=_Fri__1_Nov_2013_04_26_22_+0900_t5=d.l7cnV13vY5a
 Content-Type: text/x-diff;
  name="net-p2p_gtk-gnutella.diff"
 Content-Disposition: attachment;
  filename="net-p2p_gtk-gnutella.diff"
 Content-Transfer-Encoding: 7bit

 diff -urN /usr/ports/net-p2p/gtk-gnutella/Makefile net-p2p/gtk-gnutella/Makefile
 --- /usr/ports/net-p2p/gtk-gnutella/Makefile	2013-09-22 04:21:12.000000000 +0900
 +++ net-p2p/gtk-gnutella/Makefile	2013-11-01 00:00:00.000000000 +0900
 @@ -24,9 +24,6 @@
  #
  # WITH_DBUS: Enable D-Bus IPC support. No further information available.
  #
 -# WITH_SQLITE: Enable to support storage of run-time information to a SQLite
 -#       database file. Should ideally save some memory.
 -#
  # WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make
  #	a bug report.
  #
 @@ -36,8 +33,7 @@
  #

  PORTNAME=	gtk-gnutella
 -PORTVERSION=	0.98.4
 -PORTREVISION=	1
 +PORTVERSION=	1.0.0
  CATEGORIES=	net-p2p ipv6
  MASTER_SITES=	SF

 @@ -46,29 +42,32 @@

  LICENSE=	GPLv2 # (or later)

 -OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
 +OPTIONS_DEFINE=	GUI TLS NLS IPV6 DBUS DEBUG PORTABILITY
  OPTIONS_DEFAULT=GUI TLS
 +OPTIONS_SUB=	yes
  PORTABILITY_DESC=	Use the PATH variable at run-time

  ONLY_FOR_ARCHS=	i386 amd64

 -NO_STAGE=	yes
  USE_BZIP2=	yes
 +USES=		iconv perl5 pkgconfig
  USE_GNOME=	glib20 libxml2
 -USES=		bison perl5 pkgconfig
  HAS_CONFIGURE=	yes
  CONFIGURE_SCRIPT=	Configure
 -CONFIGURE_ARGS=	-O -Dyacc='bison -y' -Dprefix=${PREFIX} \
 -		-Dprivlib=${DATADIR} -Dsysman=${MANPREFIX}/man/man1 \
 -		-Dlocale=${PREFIX}/share/locale -Dcc='${CC}' \
 -		-Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
 -		-Doptimize='undef'
 +CONFIGURE_ARGS=	-O -Dyacc='byacc' \
 +		-Dprefix=${STAGEDIR}${PREFIX} \
 +		-Dprivlib=${STAGEDIR}${DATADIR} \
 +		-Dmansrc=${STAGEDIR}${MANPREFIX}/man/man1 \
 +		-Dlocale=${PREFIX}/share/locale \
 +		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
 +		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}'
  INSTALL_TARGET=	install install.man
  MAKE_JOBS_UNSAFE=	yes

 -PLIST_SUB=	ARCH="${ARCH}"
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib

 -MAN1=		gtk-gnutella.1
 +PLIST_SUB=	ARCH="${ARCH}"

  .include <bsd.port.options.mk>

 @@ -77,51 +76,57 @@
  .endif

  .if ${PORT_OPTIONS:MDEBUG}
 -CONFIGURE_ARGS+=	-D optimize=-g  -D official=false
 -.else
 -CONFIGURE_ARGS+=	-D official=true
 +CONFIGURE_ARGS+=	-Ud_official
  .endif

  .if ${PORT_OPTIONS:MGUI}
  USE_GNOME+=		gtk20
 -CONFIGURE_ARGS+=	-D gtkversion=2
 +INSTALLS_ICONS=	yes
  .else
 -CONFIGURE_ARGS+=	-D d_headless
 +CONFIGURE_ARGS+=	-Dd_headless
  .endif

  .if ${PORT_OPTIONS:MPORTABILITY}
 -CONFIGURE_ARGS+=	-D d_portable
 +CONFIGURE_ARGS+=	-Dd_portable
  .endif

  .if ${PORT_OPTIONS:MTLS}
 -LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
 +LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
  .else
 -CONFIGURE_ARGS+=	-U d_gnutls
 +CONFIGURE_ARGS+=	-Ud_gnutls
  .endif

  .if ${PORT_OPTIONS:MNLS}
  USES+=		gettext
 -CONFIGURE_ARGS+=	-D d_nls
 -PLIST_SUB+=		NLS=""
  .else
 -CONFIGURE_ARGS+=	-U d_nls
 -PLIST_SUB+=		NLS="@comment "
 +CONFIGURE_ARGS+=	-Ud_nls
  .endif

  .if empty(PORT_OPTIONS:MIPV6)
 -CONFIGURE_ARGS+=	-D ipv6=false
 +CONFIGURE_ARGS+=	-Ud_ipv6
  .endif

  .if ${PORT_OPTIONS:MDBUS}
 -LIB_DEPENDS+=		dbus:${PORTSDIR}/devel/dbus
 +LIB_DEPENDS+=		libdbus.so:${PORTSDIR}/devel/dbus
  .else
 -CONFIGURE_ARGS+=	-U d_dbus
 +CONFIGURE_ARGS+=	-Ud_dbus
  .endif

 -.if ${PORT_OPTIONS:MSQLITE}
 -USE_SQLITE=		yes
 -.else
 -CONFIGURE_ARGS+=	-U d_sqlite
 +post-patch:
 +	@${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \
 +		's|@exit 0|@echo done|'
 +
 +post-install:
 +.if ${PORT_OPTIONS:MGUI}
 +.for i in 16 32 128 256 512
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 +	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.${i}.png \
 +		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gtk-gnutella.png)
 +.endfor
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 +	(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 -urN /usr/ports/net-p2p/gtk-gnutella/distinfo net-p2p/gtk-gnutella/distinfo
 --- /usr/ports/net-p2p/gtk-gnutella/distinfo	2013-09-05 01:47:28.000000000 +0900
 +++ net-p2p/gtk-gnutella/distinfo	2013-11-01 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (gtk-gnutella-0.98.4.tar.bz2) = c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5
 -SIZE (gtk-gnutella-0.98.4.tar.bz2) = 19078172
 +SHA256 (gtk-gnutella-1.0.0.tar.bz2) = 0c02add9819f8e47655083fddbecdaffb18d129e773c9e28eeeba7840789d986
 +SIZE (gtk-gnutella-1.0.0.tar.bz2) = 18988804
 diff -urN /usr/ports/net-p2p/gtk-gnutella/files/patch-Configure net-p2p/gtk-gnutella/files/patch-Configure
 --- /usr/ports/net-p2p/gtk-gnutella/files/patch-Configure	2013-09-05 01:47:28.000000000 +0900
 +++ net-p2p/gtk-gnutella/files/patch-Configure	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- Configure	Thu Oct 18 17:02:36 2007
 -+++ Configure	Thu Oct 18 17:03:04 2007
 -@@ -8678,11 +8678,6 @@
 - 	$aptget 'ADVICE: Run "apt-get install zlib1g-dev".' >&4
 - fi
 - 
 --if [ "$iconv" != yes ]; then
 --	bailout=yes
 --	echo 'ERROR: Cannot find iconv(). Library or header files might be missing.' >&4
 --fi
 --
 - if [ "$frontend" != none ]; then
 - case "$d_gtk" in
 - "$undef")
 diff -urN /usr/ports/net-p2p/gtk-gnutella/files/patch-src__common.h net-p2p/gtk-gnutella/files/patch-src__common.h
 --- /usr/ports/net-p2p/gtk-gnutella/files/patch-src__common.h	2013-09-05 01:47:28.000000000 +0900
 +++ net-p2p/gtk-gnutella/files/patch-src__common.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,11 +0,0 @@
 ---- src/common.h.orig	2012-11-12 01:29:34.000000000 +0900
 -+++ src/common.h	2012-12-05 16:43:09.000000000 +0900
 -@@ -756,7 +756,7 @@
 -  * warnings on a wrong __asm__ statement with glib 1.2.  This version
 -  * should be as efficient as the one defined by glib.
 -  */
 --#if HAS_GCC(4, 0)
 -+#if HAS_GCC(4, 0) && !defined(__FreeBSD__)
 - #define GUINT32_SWAP(x_) \
 - 	(IS_CONSTANT(x_) ? GUINT32_SWAP_CONSTANT(x_) : __builtin_bswap32(x_))
 - #else
 diff -urN /usr/ports/net-p2p/gtk-gnutella/pkg-plist net-p2p/gtk-gnutella/pkg-plist
 --- /usr/ports/net-p2p/gtk-gnutella/pkg-plist	2013-10-23 00:35:29.000000000 +0900
 +++ net-p2p/gtk-gnutella/pkg-plist	2013-11-01 00:00:00.000000000 +0900
 @@ -1,4 +1,5 @@
  bin/gtk-gnutella
 +man/man1/gtk-gnutella.1.gz
  share/applications/gtk-gnutella.desktop
  %%DATADIR%%/%%ARCH%%-freebsd/gtk-gnutella.nm
  %%DATADIR%%/bogons.txt
 @@ -63,6 +64,12 @@
  %%DATADIR%%/spam.txt
  %%DATADIR%%/spam_sha1.txt
  %%DATADIR%%/tr/FAQ
 +%%GUI%%share/icons/hicolor/128x128/apps/gtk-gnutella.png
 +%%GUI%%share/icons/hicolor/16x16/apps/gtk-gnutella.png
 +%%GUI%%share/icons/hicolor/256x256/apps/gtk-gnutella.png
 +%%GUI%%share/icons/hicolor/32x32/apps/gtk-gnutella.png
 +%%GUI%%share/icons/hicolor/512x512/apps/gtk-gnutella.png
 +%%GUI%%share/icons/hicolor/scalable/apps/gtk-gnutella.svg
  %%NLS%%share/locale/de/LC_MESSAGES/gtk-gnutella.mo
  %%NLS%%share/locale/el/LC_MESSAGES/gtk-gnutella.mo
  %%NLS%%share/locale/es/LC_MESSAGES/gtk-gnutella.mo
 @@ -77,6 +84,8 @@
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
  share/pixmaps/gtk-gnutella.png
  share/pixmaps/gtk-gnutella.svg
 +%%GUI%%@dirrmtry share/icons/hicolor/512x512/apps
 +%%GUI%%@dirrmtry share/icons/hicolor/512x512
  @dirrm %%DATADIR%%/tr
  @dirrm %%DATADIR%%/pixmaps
  @dirrm %%DATADIR%%/ja

 --Multipart=_Fri__1_Nov_2013_04_26_22_+0900_t5=d.l7cnV13vY5a--