ports/64326: Update of net/gq

[Roman Shterenzon]

>Number:         64326
>Category:       ports
>Synopsis:       Update of net/gq
>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:   Tue Mar 16 03:20:19 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Shterenzon
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD alchemy.oven.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Mar 4 07:05:35 IST 2004 root at alchemy.oven.org:/local/src/sys/compile/ALCHEMY i386


>Description:
This updates the port to the current version of the GQ ldap client.
Please check that the PORTVERSION is consistent with the current ports' policy.

>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/gq/Makefile gq/Makefile
--- /usr/ports/net/gq/Makefile	Fri Mar 12 08:05:02 2004
+++ gq/Makefile	Tue Mar 16 13:12:26 2004
@@ -6,34 +6,42 @@
 #
 
 PORTNAME=	gq
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	1.0b1
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gqclient
+DISTNAME=	gq-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	ports at oven.org
 COMMENT=	GTK-based LDAP client
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
-.if defined(WITH_OPENLDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
-.endif
-
-.if !defined(WITHOUT_JPEGPHOTO)
+.if !defined(WITHOUT_JPEG)
 USE_GNOME=	gdkpixbuf
 .endif
 
+USE_GMAKE=		yes
+USE_ICONV=		yes
+USE_OPENLDAP=	yes
+USE_OPENSSL=	yes
 USE_X_PREFIX=	yes
-USE_GNOME+=	gtk12 gnomehier
+USE_GNOME+=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ldap=${LOCALBASE}
 
-pre-configure:
-	@${ECHO_MSG} "You can disable jpegPhoto attr. handling by defining WITHOUT_JPEGPHOTO=yes"
+.if defined(WITH_DND)
+CONFIGURE_ARGS+=	--enable-browser-dnd
+.endif
+
+.if defined(WITH_CACHE)
+CONFIGURE_ARGS+=	--enable-cache
+.endif
+
+post-extract:
+	@${ECHO_MSG} "This port supports the following configuration knobs:"
+	@${ECHO_MSG} "WITHOUT_JPEG=yes  Disable jpegPhoto attr. handling"
+	@${ECHO_MSG} "WITH_DND=yes      Enable Drag and drop support in browse mode"
+	@${ECHO_MSG} "WITH_CACHE=yes    Support the OpenLDAP experimental client cache"
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/net/gq/distinfo gq/distinfo
--- /usr/ports/net/gq/distinfo	Sun Nov 17 17:10:32 2002
+++ gq/distinfo	Tue Feb 17 00:09:58 2004
@@ -1 +1,2 @@
-MD5 (gq-0.6.0.tar.gz) = 8b77859a42d220e689f7c81f58afe94b
+MD5 (gq-1.0beta1.tar.gz) = c904ff52f513a58516d9543f8dc3fe5b
+SIZE (gq-1.0beta1.tar.gz) = 475081
diff -urN /usr/ports/net/gq/files/patch-ab gq/files/patch-ab
--- /usr/ports/net/gq/files/patch-ab	Sun Feb 25 17:42:29 2001
+++ gq/files/patch-ab	Thu Jan  1 02:00:00 1970
@@ -1,11 +0,0 @@
---- icons/Makefile.in.orig	Thu Jun  8 14:42:26 2000
-+++ icons/Makefile.in	Thu Jun  8 14:42:40 2000
-@@ -70,7 +70,7 @@
- 
- EXTRA_DIST = $(PIXMAPS)
- 
--pixmapdir = $(datadir)/pixmaps/gq
-+pixmapdir = $(datadir)/gq
- pixmap_DATA = $(PIXMAPS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff -urN /usr/ports/net/gq/files/patch-configure gq/files/patch-configure
--- /usr/ports/net/gq/files/patch-configure	Thu Jan  1 02:00:00 1970
+++ gq/files/patch-configure	Tue Feb 17 00:40:49 2004
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Feb 17 00:38:43 2004
++++ configure	Tue Feb 17 00:39:12 2004
+@@ -6702,7 +6702,7 @@
+ fi;
+ 
+ if test "x$GCC" = "xyes"; then
+-    for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith -Wfloat-equal
++    for A in -Wall -W -Wno-unused -Wmissing-declarations -Wcast-align -Wpointer-arith
+     do
+ # The following should work as well, but might (?) be less portable
+ #	if ! echo "$CFLAGS" | grep -q -w -- "$A" ; then
diff -urN /usr/ports/net/gq/files/patch-icons::Makefile.in gq/files/patch-icons::Makefile.in
--- /usr/ports/net/gq/files/patch-icons::Makefile.in	Thu Jan  1 02:00:00 1970
+++ gq/files/patch-icons::Makefile.in	Tue Feb 17 00:06:10 2004
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Thu Jun  8 14:42:26 2000
++++ icons/Makefile.in	Thu Jun  8 14:42:40 2000
+@@ -70,7 +70,7 @@
+ 
+ EXTRA_DIST = $(PIXMAPS)
+ 
+-pixmapdir = $(datadir)/pixmaps/gq
++pixmapdir = $(datadir)/gq
+ pixmap_DATA = $(PIXMAPS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
diff -urN /usr/ports/net/gq/pkg-plist gq/pkg-plist
--- /usr/ports/net/gq/pkg-plist	Sun Feb 25 17:42:26 2001
+++ gq/pkg-plist	Tue Mar 16 13:04:48 2004
@@ -1,8 +1,10 @@
 bin/gq
 share/gnome/apps/Internet/gq.desktop
 share/gq/bomb.xpm
+share/gq/hide.xpm
 share/gq/line.xpm
 share/gq/logo.xpm
+share/gq/new.xpm
 share/gq/textarea.xpm
 share/gq/warning.xpm
 @dirrm share/gq
>Release-Note:
>Audit-Trail:
>Unformatted: