ports/62093: [maintainer-update]; port net/gtk-gnutella update

[Clayton Rollins]

>Number:         62093
>Category:       ports
>Synopsis:       [maintainer-update]; port net/gtk-gnutella update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 29 19:30:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Clayton Rollins
>Release:        FreeBSD 4.9-RC #1
>Organization:
N/A
>Environment:
FreeBSD riot.1138.ws 4.9-RC FreeBSD 4.9-RC #1: Sun Oct 12 13:57:06 NUT 2003     crollins at riot.1138.ws:/usr/obj/usr/src/sys/MYKERNEL  i386     
>Description:
This update fixes many memory leaks and a few segfaults. As the
previous version is buggy, it would be nice to get this in soon.

I tried to use the new OPTIONS feature and added a SIZE line to
distinfo. Let me know if there's anything else that should be done,
or if I did anything wrong.

You can get the patch at: http://216.19.22.118/update.udiff . (A 
possibly mangled version is included below, as my ISP has been
on/off a lot lately.)

Cheers,
Clayton

diff -urN ./Makefile /home/crollins/tmp/0.93.3/gtk-gnutella/Makefile
--- ./Makefile	Tue Jan 13 21:33:18 2004
+++ /home/crollins/tmp/0.93.3/gtk-gnutella/Makefile	Thu Jan 29 19:53:26 2004
@@ -8,7 +8,7 @@
 #
 # A quick note on configurable make symbols:
 #
-# RUN_INTERACTIVE: Launches Configure in it's default mode, which is *very*
+# WITH_INTERACTIVE: Launches Configure in it's default mode, which is *very*
 #	interactive. Disabled here by default to conform to FreeBSD guidelines,
 #	this mode is useful if you have problems with the default Configure.
 #
@@ -18,7 +18,7 @@
 #	at a cost in performance. Useful if you intend to move the executable
 #	to multiple machines.
 #
-# DEBUG: Compile with debugging symbols. Useful if you intend to make a bug
+# WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make a bug
 #	report.
 #
 # Note that unicode support is currently unavailable for this platform. This
@@ -27,7 +27,7 @@
 #

 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.93.2
+PORTVERSION=	0.93.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -53,11 +53,14 @@
 CONFIGURE_ARGS+=	-Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale
 CONFIGURE_ARGS+=	-Dccflags='${CFLAGS} -I${LOCALBASE}/include/'

-.if exists(/bin/sleep)
-SLEEP=		/bin/sleep 3
-.endif
+OPTIONS=	DEBUG "Build with debugging symbols" off\
+		GTK2 "Build with gtk2 frontend" off \
+		INTERACTIVE "Use Configure in interactive mode" off \
+		PORTABILITY "Use the PATH variable at run-time" off
+
+.include <bsd.port.pre.mk>

-.if !defined(RUN_INTERACTIVE)
+.if !defined(WITH_INTERACTIVE)
 CONFIGURE_ARGS+=-d -e
 .endif

@@ -65,7 +68,6 @@
 CONFIGURE_ARGS+=	-Dgtkversion=2
 USE_GNOME+=		gtk20
 .else
-BROKEN=	"GTK1 version of 0.93.2 is broken. Fix coming 18/01/04"
 CONFIGURE_ARGS+=	-Dgtkversion=1
 USE_GNOME+=		gtk12
 .endif
@@ -74,30 +76,10 @@
 CONFIGURE_ARGS+=	-Dd_portable=true
 .endif

-.if defined(DEBUG)
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	-Doptimize=-g  -Uofficial=
 .endif

-pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	@${ECHO} ''
-	@${ECHO} '        ===> NOTICE <==='
-	@${ECHO} ''
-	@${ECHO} 'You may use the following make options.'
-	@${ECHO} 'See the Makefile for complete descriptions.'
-	@${ECHO} ''
-	@${ECHO} 'RUN_INTERACTIVE:		Use Configure in interactive mode.'
-	@${ECHO} ''
-	@${ECHO} 'WITH_GTK2:			Build with gtk2 frontend.'
-	@${ECHO} ''
-	@${ECHO} 'DEBUG:				Build with debugging symbols.'
-	@${ECHO}
-	@${ECHO} 'WITH_PORTABILITY:		Configure code to use the PATH variable at'
-	@${ECHO} ' 				run-time, at a cost in performance.'
-	@${ECHO}
-	@${SLEEP}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's| icuuc | |' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
@@ -106,4 +88,4 @@
 	@${CP} ${WRKSRC}/src/gtk-gnutella.man ${WRKSRC}/src/gtk-gnutella.1
 	@${INSTALL_MAN} ${WRKSRC}/src/gtk-gnutella.1 ${PREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN ./distinfo /home/crollins/tmp/0.93.3/gtk-gnutella/distinfo
--- ./distinfo	Wed Jan  7 17:23:32 2004
+++ /home/crollins/tmp/0.93.3/gtk-gnutella/distinfo	Thu Jan 29 16:19:22 2004
@@ -1 +1,2 @@
-MD5 (gtk-gnutella-0.93.2.tar.bz2) = a89c3bc8e94a9bc63d0d7e1a9573e104
+MD5 (gtk-gnutella-0.93.3.tar.bz2) = 34e357c768e6bbecd267d04b95e9c380
+SIZE = 1279197

>How-To-Repeat:
      
>Fix:
Apply the above patch.     
>Release-Note:
>Audit-Trail:
>Unformatted: