From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 9 18:10:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD7F916A473 for ; Wed, 9 Jan 2008 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B097213C448 for ; Wed, 9 Jan 2008 18:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m09IA2hw059740 for ; Wed, 9 Jan 2008 18:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m09IA2nc059739; Wed, 9 Jan 2008 18:10:02 GMT (envelope-from gnats) Resent-Date: Wed, 9 Jan 2008 18:10:02 GMT Resent-Message-Id: <200801091810.m09IA2nc059739@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB0A816A4A7 for ; Wed, 9 Jan 2008 18:02:53 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id 6B55113C465 for ; Wed, 9 Jan 2008 18:02:53 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (Y125164.ppp.dion.ne.jp [219.108.125.164]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 7C3F247C031 for ; Thu, 10 Jan 2008 03:02:45 +0900 (JST) Message-Id: <20080110030022.34ec0656.tkato432@yahoo.com> Date: Thu, 10 Jan 2008 03:00:22 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/119503: Update port: net-p2p/gtkhx to 0.9.4 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, 09 Jan 2008 18:10:03 -0000 >Number: 119503 >Category: ports >Synopsis: Update port: net-p2p/gtkhx to 0.9.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 Jan 09 18:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.2-RELEASE-p8 i386 >Organization: >Environment: >Description: - Upatet to version 0.9.4 New file: files/patch-src__files.c Remove file: files/patch-Makefile.in files/patch-intl::Makefile.in files/patch-plugins::Makefile.in files/patch-po::Makefile.in.in files/patch-sounds::Makefile.in files/patch-src::Makefile.in files/patch-src::xfers.c >How-To-Repeat: >Fix: diff -urN /usr/ports/net-p2p/gtkhx/Makefile net-p2p/gtkhx/Makefile --- /usr/ports/net-p2p/gtkhx/Makefile Sat Jan 5 19:58:06 2008 +++ net-p2p/gtkhx/Makefile Sun Jan 6 02:05:59 2008 @@ -6,29 +6,23 @@ # PORTNAME= gtkhx -PORTVERSION= 0.9.3 -PORTREVISION= 6 +PORTVERSION= 0.9.4 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gtkhx +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A GTK+ version of Hx, a UNIX Hotline Client -USE_XLIB= yes -USE_GNOME= gdkpixbuf +USE_GNOME= gdkpixbuf gnomehack gnometarget USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= gtkhx.1 .include -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - .if !defined(WITHOUT_NLS) PLIST_SUB+= NLS="" USE_GETTEXT= yes @@ -36,5 +30,15 @@ PLIST_SUB+= NLS="@comment " CONFIGURE_ARGS+=--disable-nls .endif + +post-patch: + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|-I/usr/local/include||g ; \ + s|-L/usr/local/lib||g ; \ + s|^mandir =.*$$|mandir = $${prefix}/man/man1|g' + @${REINPLACE_CMD} -e 's|^CC =|#CC =|g' ${WRKSRC}/plugins/eliza/Makefile + @${REINPLACE_CMD} -e 's|^CC=|#CC=|g ; \ + s|$$CFLAGS -O2|$$CFLAGS|g ; \ + s|-g -Wall|$$CFLAGS -Wall|g' ${WRKSRC}/configure .include diff -urN /usr/ports/net-p2p/gtkhx/distinfo net-p2p/gtkhx/distinfo --- /usr/ports/net-p2p/gtkhx/distinfo Mon Jan 23 06:23:06 2006 +++ net-p2p/gtkhx/distinfo Sun Jan 6 01:15:42 2008 @@ -1,3 +1,3 @@ -MD5 (gtkhx-0.9.3.tar.gz) = 3ba38e64b5040b0b615087e1ef5d18fd -SHA256 (gtkhx-0.9.3.tar.gz) = ccbc0a2c8f7e77671f000426b4b587a874bcb0bf9b9b9b04644b057a4f3f8c01 -SIZE (gtkhx-0.9.3.tar.gz) = 562708 +MD5 (gtkhx-0.9.4.tar.gz) = d61d7dc2df66d934464e0bb8cd0fe45e +SHA256 (gtkhx-0.9.4.tar.gz) = b6dc5f2c8e23a7e78bf81eee73f29878f028def7c1552cd83466abf274ae1db2 +SIZE (gtkhx-0.9.4.tar.gz) = 579966 diff -urN /usr/ports/net-p2p/gtkhx/files/patch-Makefile.in net-p2p/gtkhx/files/patch-Makefile.in --- /usr/ports/net-p2p/gtkhx/files/patch-Makefile.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- Makefile.in.orig Tue Feb 19 22:14:44 2002 -+++ Makefile.in Fri Mar 15 17:01:22 2002 -@@ -16,7 +16,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - - bindir = @bindir@ -@@ -102,7 +102,7 @@ - icon_DATA = icons.rsrc - - man_DATA = gtkhx.1 --mandir = $(prefix)/share/man/man1 -+mandir = $(prefix)/man/man1 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h diff -urN /usr/ports/net-p2p/gtkhx/files/patch-intl::Makefile.in net-p2p/gtkhx/files/patch-intl::Makefile.in --- /usr/ports/net-p2p/gtkhx/files/patch-intl::Makefile.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-intl::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- intl/Makefile.in.orig Tue Feb 19 22:14:43 2002 -+++ intl/Makefile.in Fri Mar 15 13:43:30 2002 -@@ -26,7 +26,7 @@ - top_builddir = .. - VPATH = @srcdir@ - --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - transform = @program_transform_name@ - libdir = @libdir@ diff -urN /usr/ports/net-p2p/gtkhx/files/patch-plugins::Makefile.in net-p2p/gtkhx/files/patch-plugins::Makefile.in --- /usr/ports/net-p2p/gtkhx/files/patch-plugins::Makefile.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-plugins::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- plugins/Makefile.in.orig Tue Feb 19 22:14:43 2002 -+++ plugins/Makefile.in Fri Mar 15 13:43:31 2002 -@@ -16,7 +16,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - - bindir = @bindir@ diff -urN /usr/ports/net-p2p/gtkhx/files/patch-po::Makefile.in.in net-p2p/gtkhx/files/patch-po::Makefile.in.in --- /usr/ports/net-p2p/gtkhx/files/patch-po::Makefile.in.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-po::Makefile.in.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Tue Feb 19 22:14:43 2002 -+++ po/Makefile.in.in Fri Mar 15 13:43:31 2002 -@@ -20,7 +20,7 @@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - datadir = @datadir@ - localedir = $(datadir)/locale diff -urN /usr/ports/net-p2p/gtkhx/files/patch-sounds::Makefile.in net-p2p/gtkhx/files/patch-sounds::Makefile.in --- /usr/ports/net-p2p/gtkhx/files/patch-sounds::Makefile.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-sounds::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- sounds/Makefile.in.orig Tue Feb 19 22:14:43 2002 -+++ sounds/Makefile.in Fri Mar 15 13:43:31 2002 -@@ -16,7 +16,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - - bindir = @bindir@ diff -urN /usr/ports/net-p2p/gtkhx/files/patch-src::Makefile.in net-p2p/gtkhx/files/patch-src::Makefile.in --- /usr/ports/net-p2p/gtkhx/files/patch-src::Makefile.in Mon Mar 18 01:23:38 2002 +++ net-p2p/gtkhx/files/patch-src::Makefile.in Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Tue Feb 19 22:14:43 2002 -+++ src/Makefile.in Fri Mar 15 13:43:31 2002 -@@ -16,7 +16,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ -+prefix = ${PREFIX} - exec_prefix = @exec_prefix@ - - bindir = @bindir@ diff -urN /usr/ports/net-p2p/gtkhx/files/patch-src::xfers.c net-p2p/gtkhx/files/patch-src::xfers.c --- /usr/ports/net-p2p/gtkhx/files/patch-src::xfers.c Thu Mar 28 09:24:29 2002 +++ net-p2p/gtkhx/files/patch-src::xfers.c Thu Jan 1 09:00:00 1970 @@ -1,13 +0,0 @@ ---- src/xfers.c.orig Fri Mar 22 16:26:04 2002 -+++ src/xfers.c Tue Mar 26 17:39:53 2002 -@@ -611,7 +611,9 @@ - pthread_join(htxf->tid, &thread_retval); - } - #ifdef USE_IPV6 -- freeaddrinfo(htxf->listen_addr); -+ if(htxf->listen_addr) { -+ freeaddrinfo(htxf->listen_addr); -+ } - #endif - g_free(htxf); - if (nxfers > (i+1)) { diff -urN /usr/ports/net-p2p/gtkhx/files/patch-src__files.c net-p2p/gtkhx/files/patch-src__files.c --- /usr/ports/net-p2p/gtkhx/files/patch-src__files.c Thu Jan 1 09:00:00 1970 +++ net-p2p/gtkhx/files/patch-src__files.c Sun Jan 6 01:52:19 2008 @@ -0,0 +1,20 @@ +--- src/files.c.orig Tue Apr 8 05:05:31 2003 ++++ src/files.c Sun Jan 6 01:52:06 2008 +@@ -1000,7 +1000,7 @@ + gtk_hlist_clear(GTK_HLIST(files_list)); + + for (fh = cfl->fh; (guint32)((char *)fh - (char *)cfl->fh) < cfl->fhlen; +- (char *)fh += fh->len + SIZEOF_HL_DATA_HDR) { ++ fh = (char *)fh + fh->len + SIZEOF_HL_DATA_HDR) { + fh->fnlen = ntohl(fh->fnlen); + fh->len = ntohs(fh->len); + fh->fsize = ntohl(fh->fsize); +@@ -1304,7 +1304,7 @@ + return 0; + + for (fh = cfl->fh; (guint32)((char *)fh - (char *)cfl->fh) < cfl->fhlen; +- (char *)fh += fh->len + SIZEOF_HL_DATA_HDR) { ++ fh = (char *)fh + fh->len + SIZEOF_HL_DATA_HDR) { + if ((int)fh->fnlen == len && !strncmp(fh->fname, ent, len)) + return 1; + } >Release-Note: >Audit-Trail: >Unformatted: