Date: Thu, 6 Dec 2012 02:32:52 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174202: net-p2p/gtk-gnutella: Update to version 0.98.4 Message-ID: <20121206023252.b76829a8d7cfe199bb086f43@yahoo.com> Resent-Message-ID: <201212051810.qB5IAD3O033786@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174202
>Category: ports
>Synopsis: net-p2p/gtk-gnutella: Update to version 0.98.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 05 18:10:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 0.98.4
New file:
files/patch-src__common.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-p2p/gtk-gnutella/Makefile net-p2p/gtk-gnutella/Makefile
--- /usr/ports/net-p2p/gtk-gnutella/Makefile 2012-12-05 05:57:07.000000000 +0900
+++ net-p2p/gtk-gnutella/Makefile 2012-12-06 01:51:47.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gtk-gnutella
-# Date created: 19 May, 2000
-# Whom: rbt@zort.on.ca
-#
+# Created by: rbt@zort.on.ca
# $FreeBSD: head/net-p2p/gtk-gnutella/Makefile 308272 2012-12-04 20:39:22Z zi $
-#
#
# A quick note on configurable make symbols:
@@ -13,13 +9,10 @@
# FreeBSD guidelines, this mode is useful if you have problems with the
# default Configure.
#
-# WITH_X11: Disable this to build a headless version of Gtk-Gnutella. The
-# resulting executable won't use or depend on any Gtk version and
-# Gtk-Gnutella can only be controlled through the remote shell.
-# Use with caution!
-#
-# WITH_GTK2: Enable to configure and build with GTK 2, disable to configure and
-# build with GTK 1.2. Will be ignored if WITH_X11 is disabled!
+# WITH_GUI: Disable this to build a headless version of Gtk-Gnutella.
+# Therefore, monitoring of operations for Gtk-Gnutella will have to be
+# done without relying on any GUI, and the configuration is done via
+# files only.
#
# WITH_TLS: Enable support for scrambling GNet connections. Currently supported
# only by Gtk-Gnutella.
@@ -43,121 +36,91 @@
#
PORTNAME= gtk-gnutella
-PORTVERSION= 0.96.9
-PORTREVISION= 2
+PORTVERSION= 0.98.4
CATEGORIES= net-p2p ipv6
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK based Gnutella client
-USE_PERL5= yes
+LICENSE= GPLv2 # (or later)
+
+OPTIONS_DEFINE= GUI TLS NLS IPV6 DBUS SQLITE DEBUG PORTABILITY
+OPTIONS_DEFAULT=GUI TLS
+PORTABILITY_DESC= Use the PATH variable at run-time
+
+ONLY_FOR_ARCHS= i386 amd64
+
USE_BZIP2= yes
+USE_GNOME= glib20 libxml2
+USE_PERL5= yes
USE_BISON= build
-MAKE_JOBS_UNSAFE= yes
-USE_GNOME= libxml2 glib20
-INSTALL_TARGET= install install.man
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
CONFIGURE_ARGS= -O -Dyacc='bison -y' -Dprefix=${PREFIX} \
- -Dprivlib=${PREFIX}/share/gtk-gnutella \
- -Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale \
- -Dcc='${CC}' -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
+ -Dprivlib=${DATADIR} -Dsysman=${MANPREFIX}/man/man1 \
+ -Dlocale=${PREFIX}/share/locale -Dcc='${CC}' \
+ -Dccflags='${CFLAGS} -I${LOCALBASE}/include' \
-Doptimize='undef'
-ONLY_FOR_ARCHS= i386 amd64
+INSTALL_TARGET= install install.man
+MAKE_JOBS_UNSAFE= yes
-MAN1= gtk-gnutella.1
+PLIST_SUB= ARCH="${ARCH}"
-OPTIONS= X11 "Build with GUI" on \
- GTK2 "Build with GTK2 frontend" on \
- TLS "Enable GNU TLS encryption support" on \
- NLS "Enable national language support" on \
- IPV6 "Enable IPv6 support" on \
- DBUS "Enable D-BUS IPC support" off \
- SQLITE "Enable SQLite support" off \
- DEBUG "Build with debugging symbols" off \
- PORTABILITY "Use the PATH variable at run-time" off
+MAN1= gtk-gnutella.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if !defined(INTERACTIVE_CONFIGURE)
CONFIGURE_ARGS+= -ders
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= -D optimize=-g -D official=false
.else
CONFIGURE_ARGS+= -D official=true
.endif
-.if !defined(WITHOUT_X11)
-USE_XORG= x11
-.if defined(WITH_GTK2)
-CONFIGURE_ARGS+= -D gtkversion=2
+.if ${PORT_OPTIONS:MGUI}
USE_GNOME+= gtk20
-.else
-CONFIGURE_ARGS+= -D gtkversion=1
-USE_GNOME+= gtk12
-.endif
+CONFIGURE_ARGS+= -D gtkversion=2
.else
CONFIGURE_ARGS+= -D d_headless
.endif
-.if defined(WITH_PORTABILITY)
+.if ${PORT_OPTIONS:MPORTABILITY}
CONFIGURE_ARGS+= -D d_portable
.endif
-.if defined(WITH_TLS)
+.if ${PORT_OPTIONS:MTLS}
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
.else
CONFIGURE_ARGS+= -U d_gnutls
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= -U d_nls
-.else
-CONFIGURE_ARGS+= -D d_nls
+.if ${PORT_OPTIONS:MNLS}
USE_GETTEXT= yes
-PLIST_FILES= share/locale/de/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/el/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/es/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/fr/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/hu/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/it/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/ja/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/nb/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/nl/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/tr/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/uk/LC_MESSAGES/gtk-gnutella.mo \
- share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
+CONFIGURE_ARGS+= -D d_nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= -U d_nls
+PLIST_SUB+= NLS="@comment "
.endif
-.if defined(WITHOUT_IPV6)
+.if empty(PORT_OPTIONS:MIPV6)
CONFIGURE_ARGS+= -D ipv6=false
.endif
-.if defined(WITH_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+= dbus:${PORTSDIR}/devel/dbus
.else
-CONFIGURE_ARGS+= -D dbus=false
+CONFIGURE_ARGS+= -U d_dbus
.endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= yes
.else
CONFIGURE_ARGS+= -U d_sqlite
.endif
-.if ${ARCH} == "i386"
-PLIST_SUB+= I386=""
-.else
-PLIST_SUB+= I386="@comment "
-.endif
-
-.if ${ARCH} == "amd64"
-PLIST_SUB+= AMD64=""
-.else
-PLIST_SUB+= AMD64="@comment "
-.endif
-
-.include <bsd.port.post.mk>
+.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 2012-11-08 07:10:04.000000000 +0900
+++ net-p2p/gtk-gnutella/distinfo 2012-12-05 14:04:12.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gtk-gnutella-0.96.9.tar.bz2) = b2f5a5eaa28fb02920d55f6942ad4583402e0cb02e88344a045cf25b62c99c9f
-SIZE (gtk-gnutella-0.96.9.tar.bz2) = 16669486
+SHA256 (gtk-gnutella-0.98.4.tar.bz2) = c4cac5707ece44a92e4b0387e309ca334be348a81e44c2db7f4c9946a8a58fb5
+SIZE (gtk-gnutella-0.98.4.tar.bz2) = 19078172
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 1970-01-01 09:00:00.000000000 +0900
+++ net-p2p/gtk-gnutella/files/patch-src__common.h 2012-12-05 16:47:33.000000000 +0900
@@ -0,0 +1,11 @@
+--- 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 2012-11-08 07:10:04.000000000 +0900
+++ net-p2p/gtk-gnutella/pkg-plist 2012-12-05 17:32:11.000000000 +0900
@@ -1,17 +1,15 @@
bin/gtk-gnutella
share/applications/gtk-gnutella.desktop
+%%DATADIR%%/%%ARCH%%-freebsd/gtk-gnutella.nm
%%DATADIR%%/bogons.txt
+%%DATADIR%%/el/FAQ
+%%DATADIR%%/en/FAQ
%%DATADIR%%/favicon.png
+%%DATADIR%%/fr/FAQ
%%DATADIR%%/geo-ip.txt
+%%DATADIR%%/geo-ipv6.txt
%%DATADIR%%/hostiles.txt
-%%DATADIR%%/robots.txt
-%%DATADIR%%/spam.txt
-%%DATADIR%%/spam_sha1.txt
-%%DATADIR%%/en/FAQ
-%%DATADIR%%/el/FAQ
%%DATADIR%%/ja/FAQ
-%%I386%%%%DATADIR%%/i386-freebsd/gtk-gnutella.nm
-%%AMD64%%%%DATADIR%%/amd64-freebsd/gtk-gnutella.nm
%%DATADIR%%/pixmaps/arrow_down.xpm
%%DATADIR%%/pixmaps/arrow_up.xpm
%%DATADIR%%/pixmaps/booklib.xpm
@@ -39,9 +37,11 @@
%%DATADIR%%/pixmaps/magnet.16x16.png
%%DATADIR%%/pixmaps/magnet.32x32.png
%%DATADIR%%/pixmaps/magnet.64x64.png
+%%DATADIR%%/pixmaps/natpmp.xpm
%%DATADIR%%/pixmaps/no_firewall.xpm
%%DATADIR%%/pixmaps/offline.xpm
%%DATADIR%%/pixmaps/online.xpm
+%%DATADIR%%/pixmaps/pause.xpm
%%DATADIR%%/pixmaps/save.xpm
%%DATADIR%%/pixmaps/smallserver.xpm
%%DATADIR%%/pixmaps/star-black.xpm
@@ -59,14 +59,30 @@
%%DATADIR%%/pixmaps/upnp-unusable.xpm
%%DATADIR%%/pixmaps/upnp.xpm
%%DATADIR%%/pixmaps/warning.xpm
+%%DATADIR%%/robots.txt
+%%DATADIR%%/spam.txt
+%%DATADIR%%/spam_sha1.txt
+%%DATADIR%%/tr/FAQ
+%%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
+%%NLS%%share/locale/fr/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
share/pixmaps/gtk-gnutella.png
share/pixmaps/gtk-gnutella.svg
-@dirrmtry bin
-@dirrmtry share/applications
-%%I386%%@dirrm %%DATADIR%%/i386-freebsd
-%%AMD64%%@dirrm %%DATADIR%%/amd64-freebsd
+@dirrm %%DATADIR%%/tr
@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/el
-@dirrm %%DATADIR%%/en
@dirrm %%DATADIR%%/ja
+@dirrm %%DATADIR%%/fr
+@dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/el
+@dirrm %%DATADIR%%/%%ARCH%%-freebsd
@dirrm %%DATADIR%%
+@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121206023252.b76829a8d7cfe199bb086f43>