- 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>

6 files changed, 20 insertions, 65 deletions

diff --git a/net/gq/Makefile b/net/gq/Makefile
index 624fa58a8169..603626bc675e 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -6,44 +6,34 @@
 #
 
 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
 .endif
diff --git a/net/gq/distinfo b/net/gq/distinfo
index d0d88bf5f7b3..3912c5df0bf5 100644
--- a/net/gq/distinfo
+++ b/net/gq/distinfo
@@ -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 --git a/net/gq/files/patch-icons-Makefile.in b/net/gq/files/patch-icons-Makefile.in
deleted file mode 100644
index a30acfb9f899..000000000000
--- a/net/gq/files/patch-icons-Makefile.in
+++ /dev/null
@@ -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 --git a/net/gq/files/patch-src-xmlparse.c b/net/gq/files/patch-src-xmlparse.c
deleted file mode 100644
index 260ababa77bb..000000000000
--- a/net/gq/files/patch-src-xmlparse.c
+++ /dev/null
@@ -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 --git a/net/gq/pkg-descr b/net/gq/pkg-descr
index d2c26ed48e3e..4470e8b06342 100644
--- a/net/gq/pkg-descr
+++ b/net/gq/pkg-descr
@@ -9,4 +9,4 @@ GQ is a GTK-based LDAP client. Features include:
   - 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 --git a/net/gq/pkg-plist b/net/gq/pkg-plist
index d6e7dbd3ed48..f71345dfd5a9 100644
--- a/net/gq/pkg-plist
+++ b/net/gq/pkg-plist
@@ -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