From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 15 15:20:04 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28F4616A412 for ; Wed, 15 Nov 2006 15:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E89543D8E for ; Wed, 15 Nov 2006 15:20:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAFFK2Qv008094 for ; Wed, 15 Nov 2006 15:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAFFK2Wd008086; Wed, 15 Nov 2006 15:20:02 GMT (envelope-from gnats) Resent-Date: Wed, 15 Nov 2006 15:20:02 GMT Resent-Message-Id: <200611151520.kAFFK2Wd008086@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jonas Sonntag Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D3F216A403 for ; Wed, 15 Nov 2006 15:19:54 +0000 (UTC) (envelope-from jsonntag@rubik.setcom.de) Received: from setcom.de (mail.setcom.de [213.23.78.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E36C43D53 for ; Wed, 15 Nov 2006 15:19:51 +0000 (GMT) (envelope-from jsonntag@rubik.setcom.de) Received: (qmail 23991 invoked by uid 89); 15 Nov 2006 15:18:41 -0000 Received: from unknown (HELO rubik.setcom.de) (213.23.78.5) by 0 with (DHE-RSA-AES256-SHA encrypted) SMTP; 15 Nov 2006 15:18:41 -0000 Received: from rubik.setcom.de (localhost.setcom [127.0.0.1]) by rubik.setcom.de (8.13.3/8.13.3) with ESMTP id kAFFMgvS043155; Wed, 15 Nov 2006 16:22:42 +0100 (CET) (envelope-from jsonntag@rubik.setcom.de) Received: (from root@localhost) by rubik.setcom.de (8.13.3/8.13.3/Submit) id kAFFMgPc043154; Wed, 15 Nov 2006 16:22:42 +0100 (CET) (envelope-from jsonntag) Message-Id: <200611151522.kAFFMgPc043154@rubik.setcom.de> Date: Wed, 15 Nov 2006 16:22:42 +0100 (CET) From: Jonas Sonntag To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jonas@schiebtsich.net Subject: ports/105576: [MAINTAINER] net-p2p/gtk-gnutella X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Nov 2006 15:20:04 -0000 >Number: 105576 >Category: ports >Synopsis: [MAINTAINER] net-p2p/gtk-gnutella >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 15 15:20:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jonas Sonntag >Release: >Organization: >Environment: >Description: - fix bug that would prevent FreeBSD nodes from uploading files (obtained from Gtk-Gnutella SVN) - move from X11BASE to LOCALBASE - new option to build without GUI - various readability changes to ./Configure options - update comments on configuration knobs Added file(s): - files/patch-bsched Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- gtk-gnutella-0.96.3_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net-p2p/gtk-gnutella/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- Makefile 12 Nov 2006 19:41:31 -0000 1.37 +++ Makefile 15 Nov 2006 15:17:01 -0000 @@ -13,18 +13,38 @@ # FreeBSD guidelines, this mode is useful if you have problems with the # default Configure. # -# WITH_GTK2: Configure and build for gtk2. +# 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_PORTABILITY: Configure code to use the PATH variable at run-time -# at a cost in performance. Useful if you intend to move the executable -# to multiple machines. +# 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_TLS: Enable support for scrambling GNet connections. Currently supported +# only by Gtk-Gnutella. +# +# WITH_NLS: Enable National Language Support for translation of User Interface. +# +# WITH_IPV6: Enable to support IPv6 connections. The real configuration takes +# place at run-time so keeping it enabled will not force IPv6 usage. +# +# 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. # +# WITH_PORTABILITY: Configure code to use the PATH variable at run-time +# at a cost in performance. Useful if you intend to move the executable +# to multiple machines. +# PORTNAME= gtk-gnutella PORTVERSION= 0.96.3 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://gtk-gnutella.sourceforge.net/download/ \ @@ -35,24 +55,24 @@ COMMENT= GTK based Gnutella client USE_PERL5= yes -USE_X_PREFIX= yes USE_BZIP2= yes USE_BISON= yes -USE_GNOME= libxml2 +USE_GNOME= libxml2 glib20 INSTALL_TARGET= install install.man HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure -CONFIGURE_ARGS= -Dyacc='bison -y' -Dofficial='true' -Dprefix=${PREFIX} \ +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' \ - -Doptimize='undef' -Dlibpth='/usr/lib ${LOCALBASE}/lib' + -Doptimize='undef' MAN1= gtk-gnutella.1 -OPTIONS= GTK2 "Build with GTK2 frontend" on \ +OPTIONS= X11 "Build with GUI" on \ + GTK2 "Build with GTK2 frontend" on \ TLS "Enable GNU TLS encryption support" on \ - NLS "Enable native language 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 \ @@ -62,23 +82,30 @@ .include .if !defined(INTERACTIVE_CONFIGURE) -CONFIGURE_ARGS+= -d -e +CONFIGURE_ARGS+= -ders .endif .if defined(WITH_DEBUG) -CONFIGURE_ARGS+= -Doptimize=-g -Uofficial= +CONFIGURE_ARGS+= -D optimize=-g -D official=false +.else +CONFIGURE_ARGS+= -D official=true .endif +.if defined(WITH_X11) +USE_XLIB= yes .if defined(WITH_GTK2) -CONFIGURE_ARGS+= -Dgtkversion=2 +CONFIGURE_ARGS+= -D gtkversion=2 USE_GNOME+= gtk20 .else -CONFIGURE_ARGS+= -Dgtkversion=1 +CONFIGURE_ARGS+= -D gtkversion=1 USE_GNOME+= gtk12 .endif +.else +CONFIGURE_ARGS+= -D d_headless +.endif .if defined(WITH_PORTABILITY) -CONFIGURE_ARGS+= -Dd_portable=true +CONFIGURE_ARGS+= -D d_portable .endif .if defined(WITH_TLS) @@ -90,7 +117,6 @@ .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= -U d_enablenls .else -CONFIGURE_ARGS+= -D d_enablenls LIB_DEPENDS+= intl:${PORTSDIR}/devel/gettext PLIST_FILES= share/locale/de/LC_MESSAGES/gtk-gnutella.mo \ share/locale/el/LC_MESSAGES/gtk-gnutella.mo \ @@ -106,7 +132,7 @@ share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo .endif -.if !defined(WITH_IPV6) +.if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= -D ipv6=false .endif @@ -118,6 +144,8 @@ .if defined(WITH_SQLITE) USE_SQLITE= yes +.else +CONFIGURE_ARGS+= -U d_sqlite .endif .include Index: files/patch-bsched =================================================================== RCS file: files/patch-bsched diff -N files/patch-bsched --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-bsched 15 Nov 2006 15:17:01 -0000 @@ -0,0 +1,22 @@ +--- src/core/bsched.c Fri Nov 10 00:01:26 2006 ++++ src/core/bsched.c Tue Nov 14 12:19:18 2006 +@@ -1591,16 +1591,11 @@ + */ + + { +- off_t written; +- int flags = 0; ++ off_t written = 0; + +-#if defined(SF_NODISKIO) +- flags |= SF_NODISKIO; +-#endif /* SF_NODISKIO */ +- +- r = sendfile(in_fd, out_fd, start, amount, NULL, &written, flags); ++ r = sendfile(in_fd, out_fd, start, amount, NULL, &written, 0); + if ((ssize_t) -1 == r) { +- if (is_temporary_error(errno) || EBUSY == errno) ++ if (is_temporary_error(errno)) + r = written > 0 ? (ssize_t) written : (ssize_t) -1; + } else { + r = amount; /* Everything written, but returns 0 if OK */ --- gtk-gnutella-0.96.3_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: