From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 19 22:30:39 2004 Return-Path: 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 DF90E16A4CE for ; Sat, 19 Jun 2004 22:30:38 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D16D943D48 for ; Sat, 19 Jun 2004 22:30:38 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5JMU6kp033053 for ; Sat, 19 Jun 2004 22:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5JMU6ej033048; Sat, 19 Jun 2004 22:30:06 GMT (envelope-from gnats) Resent-Date: Sat, 19 Jun 2004 22:30:06 GMT Resent-Message-Id: <200406192230.i5JMU6ej033048@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, Clayton Rollins Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE81016A4CE for ; Sat, 19 Jun 2004 22:22:31 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7A1C43D45 for ; Sat, 19 Jun 2004 22:22:31 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i5JMLwu6076628 for ; Sat, 19 Jun 2004 22:21:58 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.12.11/8.12.11/Submit) id i5JMLwMV076627; Sat, 19 Jun 2004 22:21:58 GMT (envelope-from nobody) Message-Id: <200406192221.i5JMLwMV076627@www.freebsd.org> Date: Sat, 19 Jun 2004 22:21:58 GMT From: Clayton Rollins To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/68129: [maintainer-update]; port net/gtk-gnutella update to 0.93.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2004 22:30:39 -0000 >Number: 68129 >Category: ports >Synopsis: [maintainer-update]; port net/gtk-gnutella update to 0.93.4 >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: Sat Jun 19 22:30:06 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Clayton Rollins >Release: 4.10 >Organization: n/a >Environment: FreeBSD riot.1138.ws 4.10-STABLE FreeBSD 4.10-STABLE #0: Fri Jun 11 17:51:30 MST 2004 crollins@riot.1138.ws:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: Version 0.93.4 of gtk-gnutella is now available, and the attached patch should properly update the port's Makefile, etc. (If the patch gets mangled, just write me a quick note and I'll happily email the patch file.) This patch also integrates ICU and NLS support, I believe, appropriately. The patch also creates a patch-aa.udiff file, which should be in the files directory, and disables an ICU 2.6 specific check. I also removed an option and decided to use a different definable knob for it's purpose. The option was to use the Configure script interactively in case the user had problems with the way the port manages it. An option to do this seems overkill, as the user isn't likely to want this to persist across versions. (Preferably, they've already contacted me to let me know it needs fixing anyways.) If I've done anything wrong, please let me know and I'll submit a fixed patch. >How-To-Repeat: n/a >Fix: Apply the following patch and assure that patch-aa.udiff is in files: diff -urN ./gtk-gnutella.orig/Makefile ./gtk-gnutella/Makefile --- ./gtk-gnutella.orig/Makefile Tue Feb 3 22:08:07 2004 +++ ./gtk-gnutella/Makefile Sat Jun 19 14:24:24 2004 @@ -8,9 +8,10 @@ # # A quick note on configurable make symbols: # -# 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. +# INTERACTIVE_CONFIGURE: 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. # # WITH_GTK2: Configure and build for gtk2. # @@ -18,16 +19,18 @@ # at a cost in performance. Useful if you intend to move the executable # to multiple machines. # -# WITH_DEBUG: Compile with debugging symbols. Useful if you intend to make a bug -# report. +# 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 -# package requires a working ICU installation to achieve this, which doesn't -# work here, and produces a broken executable. +# WITH_ICU: Compile with unicode support via the ICU library. Note that ICU +# versions previous to 2.6 may not work correctly. +# +# WITHOUT_NLS: Compile without using gettext to provide Native Language +# Support. # PORTNAME= gtk-gnutella -PORTVERSION= 0.93.3 +PORTVERSION= 0.93.4 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -39,14 +42,13 @@ MAINTAINER= crollins666@hotmail.com COMMENT= GTK based Gnutella client -MAN1= gtk-gnutella.1 - USE_PERL5= yes USE_X_PREFIX= yes USE_BZIP2= yes USE_BISON= yes +USE_ICONV= yes +USE_GETTEXT= yes USE_GNOME= libxml2 -USE_REINPLACE= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -Dyacc='bison -y' -Dofficial='true' -Dprefix=${PREFIX} @@ -54,15 +56,22 @@ CONFIGURE_ARGS+= -Dsysman=${PREFIX}/man/man1 -Dlocale=${PREFIX}/share/locale CONFIGURE_ARGS+= -Dccflags='${CFLAGS} -I${LOCALBASE}/include/' -OPTIONS= DEBUG "Build with debugging symbols" off\ +MAN1= gtk-gnutella.1 + +OPTIONS= DEBUG "Build with debugging symbols" off \ GTK2 "Build with gtk2 frontend" off \ - INTERACTIVE "Use Configure in interactive mode" off \ + ICU "Enable non-roman charset support" on \ + NLS "Enable Native Languge Support" on \ PORTABILITY "Use the PATH variable at run-time" off .include -.if !defined(WITH_INTERACTIVE) -CONFIGURE_ARGS+=-d -e +.if !defined(INTERACTIVE_CONFIGURE) +CONFIGURE_ARGS+= -d -e +.endif + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= -Doptimize=-g -Uofficial= .endif .if defined(WITH_GTK2) @@ -73,16 +82,20 @@ USE_GNOME+= gtk12 .endif -.if defined(WITH_PORTABILITY) -CONFIGURE_ARGS+= -Dd_portable=true +.if defined(WITHOUT_NLS) +USE_GETTEXT= no .endif -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= -Doptimize=-g -Uofficial= +.if defined(WITH_ICU) +LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu2 + +# Add threading to the ld flags; icuuc requires these by default +CONFIGURE_ARGS+= -Dldflags=${PTHREAD_LIBS} .endif -post-patch: - @${REINPLACE_CMD} -e 's| icuuc | |' ${WRKSRC}/${CONFIGURE_SCRIPT} +.if defined(WITH_PORTABILITY) +CONFIGURE_ARGS+= -Dd_portable=true +.endif post-install: @${ECHO} 'Installing compressed man page in man/man1/' diff -urN ./gtk-gnutella.orig/distinfo ./gtk-gnutella/distinfo --- ./gtk-gnutella.orig/distinfo Tue Feb 17 12:31:35 2004 +++ ./gtk-gnutella/distinfo Thu Jun 10 18:28:22 2004 @@ -1,2 +1,2 @@ -MD5 (gtk-gnutella-0.93.3.tar.bz2) = 34e357c768e6bbecd267d04b95e9c380 -SIZE (gtk-gnutella-0.93.3.tar.bz2) = 1279197 +MD5 (gtk-gnutella-0.93.4.tar.bz2) = d7eac5792b01694ddcb5969030ec9bbb +SIZE (gtk-gnutella-0.93.4.tar.bz2) = 1284961 diff -urN ./gtk-gnutella.orig/files/patch-aa.udiff ./gtk-gnutella/files/patch-aa.udiff --- ./gtk-gnutella.orig/files/patch-aa.udiff Wed Dec 31 17:00:00 1969 +++ ./gtk-gnutella/files/patch-aa.udiff Sat Jun 12 17:09:28 2004 @@ -0,0 +1,24 @@ +--- Configure.orig Wed Jun 9 01:49:22 2004 ++++ Configure Sat Jun 12 16:48:17 2004 +@@ -3874,8 +3874,8 @@ + $rm -f t.c + + : see if ucnv_open_2_6 exists +-set ucnv_open_2_6 d_ucnv_open_2_6 +-eval $inlibc ++: set ucnv_open_2_6 d_ucnv_open_2_6 ++: eval $inlibc + + : check whether we have a working ICU library + echo " " +@@ -3883,8 +3883,8 @@ + case " $libs " in + *" -licuuc "*) + has_icu=y +- case "$i_uni_putil$d_ucnv_open_2_6" in +- "$define$define") ++ case "$i_uni_putil" in ++ "$define") + echo "Your ICU library is workable." >&4 + val="$define" + ;; >Release-Note: >Audit-Trail: >Unformatted: