From jylefort@brutele.be  Sun Oct 19 18:43:47 2003
Return-Path: <jylefort@brutele.be>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D4E0416A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Oct 2003 18:43:47 -0700 (PDT)
Received: from gateway.lefort.net (213.189.162.78.brutele.be [213.189.162.78])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20D1E43FBD
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Oct 2003 18:43:46 -0700 (PDT)
	(envelope-from jylefort@brutele.be)
Received: from jsite.lefort.net (jsite.lefort.net [192.168.1.2])
	by gateway.lefort.net (Postfix) with ESMTP
	id E70CB54F4; Mon, 20 Oct 2003 03:43:43 +0200 (CEST)
Received: by jsite.lefort.net (Postfix, from userid 1000)
	id A225122E14; Mon, 20 Oct 2003 03:43:43 +0200 (CEST)
Message-Id: <20031020014343.A225122E14@jsite.lefort.net>
Date: Mon, 20 Oct 2003 03:43:43 +0200 (CEST)
From: Jean-Yves Lefort <jylefort@brutele.be>
Reply-To: Jean-Yves Lefort <jylefort@brutele.be>
To: FreeBSD-gnats-submit@freebsd.org
Cc: roman@xpert.com
Subject: Update port: net/gtk-gnutella to 0.92.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58266
>Category:       ports
>Synopsis:       Update port: net/gtk-gnutella to 0.92.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 19 18:50:19 PDT 2003
>Closed-Date:    Tue Nov 25 02:58:37 PST 2003
>Last-Modified:  Tue Nov 25 02:58:37 PST 2003
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.8-RELEASE-p3 FreeBSD 4.8-RELEASE-p3 #0: Mon Aug 11 18:17:27 CEST 2003 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
	
>Description:
The maintainer has been cc'ed.
	
>How-To-Repeat:
	
>Fix:
diff -ruN /usr/ports/net/gtk-gnutella/Makefile gtk-gnutella/Makefile
--- /usr/ports/net/gtk-gnutella/Makefile	Mon Apr 21 07:23:19 2003
+++ gtk-gnutella/Makefile	Mon Oct 20 03:31:09 2003
@@ -2,11 +2,11 @@
 # Date created:				19 May, 2000
 # Whom:					rbt@zort.on.ca
 #
-# $FreeBSD: ports/net/gtk-gnutella/Makefile,v 1.15 2003/04/20 19:37:56 marcus Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.91.1
+PORTVERSION=	0.92.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -16,13 +16,21 @@
 MAINTAINER=	roman@xpert.com
 COMMENT=	GTK based Gnutella client
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gtk20 libxml2
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	Configure
+USE_REINPLACE=	yes
+
+CONFIGURE_ARGS=	-d
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' ${WRKSRC}/Configure
 
-CONFIGURE_ARGS=	--enable-no-rfc1918
+pre-install:
+	@${MKDIR} ${PREFIX}/bin		# metaconfig is broken
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/net/gtk-gnutella/distinfo gtk-gnutella/distinfo
--- /usr/ports/net/gtk-gnutella/distinfo	Tue Jan 28 07:22:50 2003
+++ gtk-gnutella/distinfo	Mon Oct 20 03:26:57 2003
@@ -1 +1 @@
-MD5 (gtk-gnutella-0.91.1.tar.gz) = bd00261511cd38326357085050423a39
+MD5 (gtk-gnutella-0.92.1.tar.bz2) = 59d53bb96bf551ce9b04a01a70bcc5b0
diff -ruN /usr/ports/net/gtk-gnutella/files/patch-Configure gtk-gnutella/files/patch-Configure
--- /usr/ports/net/gtk-gnutella/files/patch-Configure	Thu Jan  1 01:00:00 1970
+++ gtk-gnutella/files/patch-Configure	Mon Oct 20 03:23:39 2003
@@ -0,0 +1,50 @@
+--- Configure.orig	Mon Oct 20 03:17:48 2003
++++ Configure	Mon Oct 20 03:20:34 2003
+@@ -292,7 +292,7 @@
+ d_usegtk1=''
+ d_usegtk2=''
+ gtkpackage=''
+-gtkversion=''
++gtkversion='2'
+ h_fcntl=''
+ h_sysfile=''
+ i_langinfo=''
+@@ -332,14 +332,14 @@
+ c=''
+ n=''
+ d_official=''
+-official=''
++official='true'
+ package=''
+ spackage=''
+ pkgsrc=''
+-prefix=''
++prefix='@PREFIX@'
+ prefixexp=''
+ installprivlib=''
+-privlib=''
++privlib='@PREFIX@/share/gtk-gnutella'
+ privlibexp=''
+ prototype=''
+ d_remotectrl=''
+@@ -4973,20 +4973,6 @@
+ '')
+ 	dflt=''
+ 	nostick=true
+-	$cat <<EOM
+-
+-If you'd like to make any changes to the config.sh file before I begin
+-to configure things, do it as a shell escape now (e.g. !vi config.sh).
+-
+-EOM
+-	rp="Press return or use a shell escape to edit config.sh:"
+-	. UU/myread
+-	nostick=''
+-	case "$ans" in
+-	'') ;;
+-	*) : in case they cannot read
+-		sh 1>&4 -c "$ans";;
+-	esac
+ 	;;
+ esac
+ 
diff -ruN /usr/ports/net/gtk-gnutella/pkg-plist gtk-gnutella/pkg-plist
--- /usr/ports/net/gtk-gnutella/pkg-plist	Tue Jan 28 07:22:50 2003
+++ gtk-gnutella/pkg-plist	Mon Oct 20 03:32:52 2003
@@ -1,17 +1,26 @@
 bin/gtk-gnutella
+share/gtk-gnutella/gwcache.boot
+share/gtk-gnutella/hostiles.txt
 share/gtk-gnutella/pixmaps/arrow_down.xpm
 share/gtk-gnutella/pixmaps/arrow_up.xpm
 share/gtk-gnutella/pixmaps/booklib.xpm
 share/gtk-gnutella/pixmaps/booksha.xpm
 share/gtk-gnutella/pixmaps/bookshav.xpm
+share/gtk-gnutella/pixmaps/download.xpm
 share/gtk-gnutella/pixmaps/exit.xpm
 share/gtk-gnutella/pixmaps/filter.xpm
 share/gtk-gnutella/pixmaps/firewall.xpm
 share/gtk-gnutella/pixmaps/freeze.xpm
+share/gtk-gnutella/pixmaps/icon.xpm
+share/gtk-gnutella/pixmaps/leaf.xpm
+share/gtk-gnutella/pixmaps/legacy.xpm
 share/gtk-gnutella/pixmaps/no_firewall.xpm
 share/gtk-gnutella/pixmaps/offline.xpm
 share/gtk-gnutella/pixmaps/online.xpm
 share/gtk-gnutella/pixmaps/save.xpm
+share/gtk-gnutella/pixmaps/smallserver.xpm
 share/gtk-gnutella/pixmaps/thaw.xpm
+share/gtk-gnutella/pixmaps/ultra.xpm
+share/gtk-gnutella/pixmaps/upload.xpm
 @dirrm share/gtk-gnutella/pixmaps
 @dirrm share/gtk-gnutella
	
>Release-Note:
>Audit-Trail:

From: Andreas Schwarz <andreas.schwarz@de.easynet.net>
To: freebsd-gnats-submit@FreeBSD.org, jylefort@brutele.be
Cc: roman@xpert.com
Subject: Re: ports/58266: Update port: net/gtk-gnutella to 0.92.1
Date: Tue, 21 Oct 2003 00:05:27 +0200

 Hi, maybe it is better to use metaconfigs configure options (without patching the Configure script).
 
 diff -ruN /usr/ports/net/gtk-gnutella/Makefile gtk-gnutella/Makefile
 --- /usr/ports/net/gtk-gnutella/Makefile        Sun Apr 20 21:37:56 2003
 +++ gtk-gnutella/Makefile       Mon Oct 20 23:16:35 2003
 @@ -6,23 +6,31 @@
  #
  
  PORTNAME=      gtk-gnutella
 -PORTVERSION=   0.91.1
 +PORTVERSION=   0.92.1
  CATEGORIES=    net
 -MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE} \
 -               http://gtk-gnutella.sourceforge.net/download/ \
 -               ftp://gtk-gnutella.sourceforge.net/pub/gtk-gnutella/
 -MASTER_SITE_SUBDIR=    ${PORTNAME}
 +MASTER_SITES=  http://belnet.dl.sourceforge.net/sourceforge/gtk-gnutella/ \
 +               http://keihanna.dl.sourceforge.net/sourceforge/gtk-gnutella/ \
 +               http://flow.dl.sourceforge.net/sourceforge/gtk-gnutella/ \
 +               http://easynews.dl.sourceforge.net/sourceforge/gtk-gnutella/ \
 +               http://heanet.dl.sourceforge.net/sourceforge/gtk-gnutella/ \
 +               http://umn.dl.sourceforge.net/sourceforge/gtk-gnutella/
  
  MAINTAINER=    roman@xpert.com
  COMMENT=       GTK based Gnutella client
  
  LIB_DEPENDS=   xml2.5:${PORTSDIR}/textproc/libxml2
  
 +USE_BZIP2=     yes
  USE_X_PREFIX=  yes
  USE_GMAKE=     yes
  USE_GNOME=     gtk12
 -GNU_CONFIGURE= yes
 +HAS_CONFIGURE= yes
 +CONFIGURE_SCRIPT= Configure
  
 -CONFIGURE_ARGS=        --enable-no-rfc1918
 +CONFIGURE_ARGS=        -edO \
 +               -D official='true' \
 +               -D prefix='${PREFIX}' \
 +               -D privlib='${PREFIX}/share/gtk-gnutella' \
 +               -D optimize='-O2'
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/net/gtk-gnutella/distinfo gtk-gnutella/distinfo
 --- /usr/ports/net/gtk-gnutella/distinfo        Mon Jan 27 17:10:10 2003
 +++ gtk-gnutella/distinfo       Sun Oct 19 19:52:50 2003
 @@ -1 +1 @@
 -MD5 (gtk-gnutella-0.91.1.tar.gz) = bd00261511cd38326357085050423a39
 +MD5 (gtk-gnutella-0.92.1.tar.bz2) = 59d53bb96bf551ce9b04a01a70bcc5b0
 diff -ruN /usr/ports/net/gtk-gnutella/pkg-plist gtk-gnutella/pkg-plist
 --- /usr/ports/net/gtk-gnutella/pkg-plist       Sun Feb  2 19:36:59 2003
 +++ gtk-gnutella/pkg-plist      Sun Oct 19 19:38:16 2003
 @@ -1,17 +1,26 @@
  bin/gtk-gnutella
 +share/gtk-gnutella/gwcache.boot
 +share/gtk-gnutella/hostiles.txt
  share/gtk-gnutella/pixmaps/arrow_down.xpm
  share/gtk-gnutella/pixmaps/arrow_up.xpm
  share/gtk-gnutella/pixmaps/booklib.xpm
  share/gtk-gnutella/pixmaps/booksha.xpm
  share/gtk-gnutella/pixmaps/bookshav.xpm
 +share/gtk-gnutella/pixmaps/download.xpm
  share/gtk-gnutella/pixmaps/exit.xpm
  share/gtk-gnutella/pixmaps/filter.xpm
  share/gtk-gnutella/pixmaps/firewall.xpm
  share/gtk-gnutella/pixmaps/freeze.xpm
 +share/gtk-gnutella/pixmaps/icon.xpm
 +share/gtk-gnutella/pixmaps/leaf.xpm
 +share/gtk-gnutella/pixmaps/legacy.xpm
  share/gtk-gnutella/pixmaps/no_firewall.xpm
  share/gtk-gnutella/pixmaps/offline.xpm
  share/gtk-gnutella/pixmaps/online.xpm
  share/gtk-gnutella/pixmaps/save.xpm
 +share/gtk-gnutella/pixmaps/smallserver.xpm
  share/gtk-gnutella/pixmaps/thaw.xpm
 +share/gtk-gnutella/pixmaps/ultra.xpm
 +share/gtk-gnutella/pixmaps/upload.xpm
  @dirrm share/gtk-gnutella/pixmaps
  @dirrm share/gtk-gnutella

From: Jean-Yves Lefort <jylefort@brutele.be>
To: Andreas Schwarz <andreas.schwarz@de.easynet.net>
Cc: freebsd-gnats-submit@FreeBSD.org, roman@xpert.com
Subject: Re: ports/58266: Update port: net/gtk-gnutella to 0.92.1
Date: Tue, 21 Oct 2003 15:27:20 +0200

 --=.4PpNT0G:4B8xaz
 Content-Type: text/plain; charset=US-ASCII
 Content-Disposition: inline
 Content-Transfer-Encoding: 7bit
 
 On Tue, 21 Oct 2003 00:05:27 +0200
 Andreas Schwarz <andreas.schwarz@de.easynet.net> wrote:
 
 > Hi, maybe it is better to use metaconfigs configure options (without
 > patching the Configure script).
 
 I think you're quite right. However, two notes:
 
 	- you must not specify arbitrary compiler flags
 	- your patch uses GTK+ 1.x, but mine was using GTK+ 2.x
 
 diff -ruN /usr/ports/net/gtk-gnutella/Makefile gtk-gnutella/Makefile
 --- /usr/ports/net/gtk-gnutella/Makefile	Mon Apr 21 07:23:19 2003
 +++ gtk-gnutella/Makefile	Tue Oct 21 15:19:42 2003
 @@ -2,11 +2,11 @@
  # Date created:				19 May, 2000
  # Whom:					rbt@zort.on.ca
  #
 -# $FreeBSD: ports/net/gtk-gnutella/Makefile,v 1.15 2003/04/20 19:37:56 marcus Exp $
 +# $FreeBSD$
  #
  
  PORTNAME=	gtk-gnutella
 -PORTVERSION=	0.91.1
 +PORTVERSION=	0.92.1
  CATEGORIES=	net
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
  		http://gtk-gnutella.sourceforge.net/download/ \
 @@ -16,13 +16,23 @@
  MAINTAINER=	roman@xpert.com
  COMMENT=	GTK based Gnutella client
  
 -LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 -
  USE_X_PREFIX=	yes
 -USE_GMAKE=	yes
 -USE_GNOME=	gtk12
 -GNU_CONFIGURE=	yes
 +USE_BZIP2=	yes
 +USE_GNOME=	gtk20 libxml2
 +HAS_CONFIGURE=	yes
 +CONFIGURE_SCRIPT=	Configure
 +
 +CONFIGURE_ARGS=	-edO						\
 +		-D official='true'				\
 +		-D prefix='${PREFIX}'				\
 +		-D privlib='${PREFIX}/share/gtk-gnutella'	\
 +		-D gtkversion='2'				\
 +		-D optimize='undef'				\
 +		-D ccflags='${CFLAGS}'
 +
 +.include <bsd.port.pre.mk>
  
 -CONFIGURE_ARGS=	--enable-no-rfc1918
 +pre-install:
 +	@${MKDIR} ${PREFIX}/bin		# metaconfig is broken
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -ruN /usr/ports/net/gtk-gnutella/distinfo gtk-gnutella/distinfo
 --- /usr/ports/net/gtk-gnutella/distinfo	Tue Jan 28 07:22:50 2003
 +++ gtk-gnutella/distinfo	Mon Oct 20 03:26:57 2003
 @@ -1 +1 @@
 -MD5 (gtk-gnutella-0.91.1.tar.gz) = bd00261511cd38326357085050423a39
 +MD5 (gtk-gnutella-0.92.1.tar.bz2) = 59d53bb96bf551ce9b04a01a70bcc5b0
 diff -ruN /usr/ports/net/gtk-gnutella/pkg-plist gtk-gnutella/pkg-plist
 --- /usr/ports/net/gtk-gnutella/pkg-plist	Tue Jan 28 07:22:50 2003
 +++ gtk-gnutella/pkg-plist	Mon Oct 20 03:32:52 2003
 @@ -1,17 +1,26 @@
  bin/gtk-gnutella
 +share/gtk-gnutella/gwcache.boot
 +share/gtk-gnutella/hostiles.txt
  share/gtk-gnutella/pixmaps/arrow_down.xpm
  share/gtk-gnutella/pixmaps/arrow_up.xpm
  share/gtk-gnutella/pixmaps/booklib.xpm
  share/gtk-gnutella/pixmaps/booksha.xpm
  share/gtk-gnutella/pixmaps/bookshav.xpm
 +share/gtk-gnutella/pixmaps/download.xpm
  share/gtk-gnutella/pixmaps/exit.xpm
  share/gtk-gnutella/pixmaps/filter.xpm
  share/gtk-gnutella/pixmaps/firewall.xpm
  share/gtk-gnutella/pixmaps/freeze.xpm
 +share/gtk-gnutella/pixmaps/icon.xpm
 +share/gtk-gnutella/pixmaps/leaf.xpm
 +share/gtk-gnutella/pixmaps/legacy.xpm
  share/gtk-gnutella/pixmaps/no_firewall.xpm
  share/gtk-gnutella/pixmaps/offline.xpm
  share/gtk-gnutella/pixmaps/online.xpm
  share/gtk-gnutella/pixmaps/save.xpm
 +share/gtk-gnutella/pixmaps/smallserver.xpm
  share/gtk-gnutella/pixmaps/thaw.xpm
 +share/gtk-gnutella/pixmaps/ultra.xpm
 +share/gtk-gnutella/pixmaps/upload.xpm
  @dirrm share/gtk-gnutella/pixmaps
  @dirrm share/gtk-gnutella
 
 
 Regards,
 Jean-Yves Lefort
 
 -- 
 Jean-Yves Lefort
 
 jylefort@brutele.be
 http://lefort.be.eu.org/
 
 --=.4PpNT0G:4B8xaz
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iD8DBQE/lTQ9yzD7UaO4AGoRAm2HAJ0XXld1FDzAGN24uMrxgfBe6bM9XQCfZrAw
 ALtILWhEAk3v03ps6JB2hlk=
 =KZRv
 -----END PGP SIGNATURE-----
 
 --=.4PpNT0G:4B8xaz--

From: Andreas Schwarz <andreas.schwarz@de.easynet.net>
To: Jean-Yves Lefort <jylefort@brutele.be>
Cc: freebsd-gnats-submit@FreeBSD.org, roman@xpert.com
Subject: Re: ports/58266: Update port: net/gtk-gnutella to 0.92.1
Date: Tue, 21 Oct 2003 16:14:50 +0200

 On Tue, 21 Oct 2003 15:27:20 +0200
 Jean-Yves Lefort <jylefort@brutele.be> wrote:
 
 > On Tue, 21 Oct 2003 00:05:27 +0200
 > Andreas Schwarz <andreas.schwarz@de.easynet.net> wrote:
 > 
 > > Hi, maybe it is better to use metaconfigs configure options (without
 > > patching the Configure script).
 > 
 > I think you're quite right. However, two notes:
 > 
 > 	- you must not specify arbitrary compiler flags
 
 Yes, my fault, have overlooked the optimization line before submitting my
 diffs. It should be only an example how to solve the metaconfig Configure
 in a proper way. I wrote my port some weeks ago for myself, after I saw your
 PR I remembered my problems with metaconfig.
 
 > 	- your patch uses GTK+ 1.x, but mine was using GTK+ 2.x
 
 Ok, but I would recommend a separate port for gtk2, like mozilla-gtk2,
 sylpheed-gtk2, ... .
 
 best regards,
 Andreas

From: "clayton rollins" <crollins666@hotmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Cc: jylefort@brutele.be
Subject: Re: ports/58266: Update port: net/gtk-gnutella to 0.92.1
Date: Tue, 11 Nov 2003 02:05:58 +0000

 This PR duplicates an existing PR for this port upgrade:
 http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/54624
 
 It should also be noted that version 0.93 is out now.
 (See the PR for my proposed patch.)
 
 Peace,
 Clayton
 
 _________________________________________________________________
 Great deals on high-speed Internet access as low as $26.95.  
 https://broadband.msn.com (Prices may vary by service area.)
 
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Tue Nov 25 02:56:19 PST 2003 
State-Changed-Why:  
PR 54624 has a newer version 


Class-Changed-From-To: change-request->update 
Class-Changed-By: mat 
Class-Changed-When: Tue Nov 25 02:56:19 PST 2003 
Class-Changed-Why:  
Accurate class 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58266 
>Unformatted:
