From tkato432@yahoo.com  Fri Aug 10 18:01:07 2007
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B92F16A418
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 10 Aug 2007 18:01:07 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa06.dion.ne.jp (msa06.dion.ne.jp [222.3.140.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A30013C45E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 10 Aug 2007 18:01:07 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from localhost.localdomain (ZT068219.ppp.dion.ne.jp [59.128.68.219])
	by msa106.dion.ne.jp (DION MAIL) with ESMTP id DEF11784037
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 11 Aug 2007 03:01:00 +0900 (JST)
Message-Id: <20070811030017.f50f4cdc.tkato432@yahoo.com>
Date: Sat, 11 Aug 2007 03:00:17 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: net/gq to 1.2.2

>Number:         115393
>Category:       ports
>Synopsis:       Update port: net/gq to 1.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 10 18:10:03 GMT 2007
>Closed-Date:    Wed Aug 15 14:50:39 GMT 2007
>Last-Modified:  Wed Aug 15 14:50:39 GMT 2007
>Originator:     KATO Tsuguru
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.2

Remove file:
files/patch-icons-Makefile.in
files/patch-src-xmlparse.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/net/gq/Makefile net/gq/Makefile
--- /usr/ports/net/gq/Makefile	Sun May 20 13:54:55 2007
+++ net/gq/Makefile	Thu Aug  9 16:31:48 2007
@@ -6,43 +6,33 @@
 #
 
 PORTNAME=	gq
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	gqclient
-DISTNAME=	gq-${PORTVERSION:S/r/rc/}
+MASTER_SITES=	SF/gqclient
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based LDAP client
 
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring
 
-USE_GCC=	3.4+
-USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_GETTEXT=	yes
-USE_OPENLDAP=	yes
-USE_OPENSSL=	yes
+OPTIONS=	DND	"Enable Drag and drop support in browse mode" On \
+		CACHE	"Support the OpenLDAP experimental client cache" On
+
+USE_GNOME=	gnomehier gnometarget libglade2
 USE_XLIB=	yes
-USE_GNOME=	gnomehier gtk20 libxml2 libglade2 intltool
+USE_OPENSSL=	yes
+USE_OPENLDAP=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-ldap-prefix=${LOCALBASE}
 
-OPTIONS=	JPEG	"Enable jpegPhoto attr. handling" On \
-		DND	"Enable Drag and drop support in browse mode" On \
-		CACHE	"Support the OpenLDAP experimental client cache" On
-
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-	       	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_JPEG)
-USE_GNOME+=	gdkpixbuf
-.endif
 
 .if !defined(WITHOUT_DND)
 CONFIGURE_ARGS+=	--enable-browser-dnd
diff -urN /usr/ports/net/gq/distinfo net/gq/distinfo
--- /usr/ports/net/gq/distinfo	Tue Dec  5 03:49:09 2006
+++ net/gq/distinfo	Thu Aug  2 00:34:23 2007
@@ -1,3 +1,3 @@
-MD5 (gq-1.2.1.tar.gz) = e56613c81e70727c20ffe9974cdc6df0
-SHA256 (gq-1.2.1.tar.gz) = d99956fff7cd9762fd1a264c65f70f8ce2cb966bafe951a53146539e90311113
-SIZE (gq-1.2.1.tar.gz) = 395701
+MD5 (gq-1.2.2.tar.gz) = 107d8a971c14b52b2bedbf3944840bea
+SHA256 (gq-1.2.2.tar.gz) = 4a5dc43346d2d3b0e9a791ea92cfe3b1dbb787d69dd59eb1645e77e104ff801a
+SIZE (gq-1.2.2.tar.gz) = 396277
diff -urN /usr/ports/net/gq/files/patch-icons-Makefile.in net/gq/files/patch-icons-Makefile.in
--- /usr/ports/net/gq/files/patch-icons-Makefile.in	Mon May 15 01:20:53 2006
+++ net/gq/files/patch-icons-Makefile.in	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- icons/Makefile.in.orig	Mon Apr 10 19:22:45 2006
-+++ icons/Makefile.in	Wed Apr 19 10:26:21 2006
-@@ -193,7 +193,7 @@
- 	warning.xpm
- 
- EXTRA_DIST = $(PIXMAPS)
--pixmapdir = $(datadir)/pixmaps/gq
-+pixmapdir = $(datadir)/gq
- pixmap_DATA = $(PIXMAPS)
- all: all-am
- 
diff -urN /usr/ports/net/gq/files/patch-src-xmlparse.c net/gq/files/patch-src-xmlparse.c
--- /usr/ports/net/gq/files/patch-src-xmlparse.c	Mon May 15 01:20:53 2006
+++ net/gq/files/patch-src-xmlparse.c	Thu Jan  1 09:00:00 1970
@@ -1,24 +0,0 @@
---- src/xmlparse.c.orig	Wed Apr  5 08:53:55 2006
-+++ src/xmlparse.c	Wed Apr 19 10:35:15 2006
-@@ -51,7 +51,7 @@
- #include "xmlparse.h"
- 
- #define malloc g_malloc
--#define calloc(n,s) g_malloc0(n * s)
-+#define calloc(n,s) g_malloc0((n) * (s))
- 
- #define TAGSTACK_INCR 20
- 
-@@ -162,10 +162,11 @@
-     e->attrs = NULL;
-     if (attrs) {
- 	for (i = 0 ; attrs[i] ; i++) ;
--	e->attrs = calloc(i, sizeof(xmlChar *));
-+	e->attrs = calloc(i+1, sizeof(xmlChar *));
- 	for (i = 0 ; attrs[i] ; i++) {
- 	    e->attrs[i] = (guchar*)strdup((gchar*)attrs[i]);
- 	}
-+	e->attrs[i] = NULL;
-     }
-     
-     /* lookup handler */
diff -urN /usr/ports/net/gq/pkg-descr net/gq/pkg-descr
--- /usr/ports/net/gq/pkg-descr	Mon Jul 10 12:46:36 2000
+++ net/gq/pkg-descr	Thu Aug  2 01:22:32 2007
@@ -9,4 +9,4 @@
   - use any number of servers
   - search based on single argument or LDAP filter
 
-WWW: http://biot.com/gq/
+WWW: http://www.gq-project.org/
diff -urN /usr/ports/net/gq/pkg-plist net/gq/pkg-plist
--- /usr/ports/net/gq/pkg-plist	Sun May 20 13:54:56 2007
+++ net/gq/pkg-plist	Thu Aug  2 01:30:24 2007
@@ -1,16 +1,16 @@
 bin/gq
 share/applications/gq.desktop
 %%DATADIR%%/gq.glade
-%%DATADIR%%/hide.xpm
-%%DATADIR%%/new.xpm
 share/mime/packages/gq-ldif.xml
-share/mime/text/x-ldif.xml
 share/pixmaps/gq/bomb.xpm
 share/pixmaps/gq/entry.png
 share/pixmaps/gq/gq.xpm
+share/pixmaps/gq/hide.xpm
+share/pixmaps/gq/new.xpm
 share/pixmaps/gq/textview.png
 share/pixmaps/gq/warning.xpm
 @dirrm share/pixmaps/gq
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@exec %%PREFIX%%/bin/update-mime-database %%PREFIX%%/share/mime
 @unexec %%PREFIX%%/bin/update-mime-database %%PREFIX%%/share/mime
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Tue Aug 14 10:14:39 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115393 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115393: commit references a PR
Date: Wed, 15 Aug 2007 14:49:06 +0000 (UTC)

 rafan       2007-08-15 14:49:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/gq               Makefile distinfo pkg-descr pkg-plist 
   Removed files:
     net/gq/files         patch-icons-Makefile.in 
                          patch-src-xmlparse.c 
   Log:
   - Update to 1.2.2
   - Use macro from bsd.sites.mk
   - Remove USE_GCC as we have 3.4 in all supported version
   - Update WWW entry
   
   PR:             ports/115393
   Submitted by:   KATO Tsuguru <tkato432 at yahoo.com>
   
   Revision  Changes    Path
   1.40      +13 -23    ports/net/gq/Makefile
   1.12      +3 -3      ports/net/gq/distinfo
   1.2       +0 -11     ports/net/gq/files/patch-icons-Makefile.in (dead)
   1.2       +0 -24     ports/net/gq/files/patch-src-xmlparse.c (dead)
   1.2       +1 -1      ports/net/gq/pkg-descr
   1.8       +3 -3      ports/net/gq/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rafan 
State-Changed-When: Wed Aug 15 14:50:37 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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