Import of pkgsrc-2013Q2

databases/gq/DESCR

@@ -0,0 +1,13 @@
+  GQ is a GTK-based LDAP client that enables you to search and browse any LDAP
+V2- or V3-compliant server (OpenLDAP, Novell, Netscape, etc.).  With sufficient
+permissions, you can also add, edit, and delete entries.
+
+  Features include:
+	* LDAP browser
+	* LDAP V3 Schema browser
+	* Template builder
+	* Export subtree or whole server to LDIF
+	* Use any number of servers
+	* Search based on single argument or LDAP filter
+	* Edit and delete entries Add entries using an existing entry,
+	  or based on your own template)

databases/gq/Makefile

@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.63 2013/06/06 12:54:10 wiz Exp $
+
+DISTNAME=	gq-1.2.3
+PKGREVISION=	26
+CATEGORIES=	databases net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
+
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://gq-project.org/
+COMMENT=	GTK-based LDAP client
+LICENSE=	gnu-gpl-v2
+
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake perl pkg-config intltool
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-browser-dnd
+CONFIGURE_ARGS+=	--enable-cache
+CONFIGURE_ARGS+=	--with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
+
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.pkg.mk"

databases/gq/PLIST

@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:43:15 joerg Exp $
+bin/gq
+share/applications/gq.desktop
+share/gq/gq.glade
+share/mime/packages/gq-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

databases/gq/distinfo

@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.12 2012/05/06 20:12:35 dholland Exp $
+
+SHA1 (gq-1.2.3.tar.gz) = dc11f4c1c05037786ca6b212f4945fc20ecd33a4
+RMD160 (gq-1.2.3.tar.gz) = 4e8bf1700f4d7aacd906559e01a11654f6ce0f90
+Size (gq-1.2.3.tar.gz) = 423119 bytes
+SHA1 (patch-aa) = b243ab8d862e1aae6dc3a1e4769faa8e8949efe6
+SHA1 (patch-ab) = aa4918c9ee9900b839c58692e68c4adb675dcb17
+SHA1 (patch-ac) = d2180a16425a672c93c19697d9648e4c552cdcb8
+SHA1 (patch-ad) = 9a9a2e038163ab6a39f5325bbcdd01fa7589885b
+SHA1 (patch-ae) = aeda3e38a58b8211b8df2534409d928766078287
+SHA1 (patch-an) = 29806e725bfa9f4827b2f7367006005b7ad44c6c
+SHA1 (patch-src_Makefile.in) = 0a210f4550a7d4805d1d351ae67e6459e37cdc37
+SHA1 (patch-src_gq-hash_h) = ad63f914ffabca9f74ef0926727396d1cf699bfd
+SHA1 (patch-src_gq-server-list_h) = fe85a8ae6326bd8ae8da35df5d558f409302be48
+SHA1 (patch-src_state_c) = 6b5fd642fb86498575434b12444c50eb80d5592e

databases/gq/patches/patch-aa

@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2008/01/10 21:42:51 adam Exp $
+
+--- config.h.in.orig	2008-01-08 17:41:44.000000000 +0100
++++ config.h.in
+@@ -53,6 +53,9 @@
+ /* Define to 1 if you have the `iswspace' function. */
+ #undef HAVE_ISWSPACE
+ 
++/* Define if you have the btowc function.  */
++#undef HAVE_BTOWC
++
+ /* Define if you have Kerberos installed */
+ #undef HAVE_KERBEROS
+ 

databases/gq/patches/patch-ab

@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2008/01/10 21:42:51 adam Exp $
+
+--- configure.orig	2008-01-08 17:41:30.000000000 +0100
++++ configure
+@@ -6240,7 +6240,7 @@ fi
+ for ac_func in ldap_str2objectclass ldap_memfree ldap_rename ldap_str2dn \
+ 	       ldap_initialize \
+ 	       iswspace snprintf \
+-	       g_snprintf
++	       g_snprintf btowc
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -7629,7 +7629,7 @@ echo "${ECHO_T}no" >&6; }
+ 
+ # a backup of the working CFLAGS
+ WARN_CFLAGS=""
+-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
+ 	if test -z "`echo "$CFLAGS" | grep -w -- "$A" 2> /dev/null`" ; then
+ 		gq_cv_compiler_supports_flag "$A"

databases/gq/patches/patch-ac

@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.2 2008/01/10 21:42:51 adam Exp $
+
+--- src/filter.c.orig	2007-05-14 18:26:50.000000000 +0200
++++ src/filter.c
+@@ -1036,11 +1036,11 @@ static char *unindent_filter(char *inden
+ 	       break;
+ 	  default:
+ 	       /* caught spaces before -- this is testing for \n etc */
+-#if defined(HAVE_ISWSPACE)
++#if defined(HAVE_ISWSPACE) && defined(HAVE_BTOWC)
+ 	       if(!iswspace(btowc(c)))
+ #else
+                if(!isspace(c))
+-#endif /* HAVE_ISWSPACE */
++#endif /* HAVE_ISWSPACE && HAVE_BTOWC */
+ 		    unindented[f++] = c;
+ 	       break;
+ 	  }

databases/gq/patches/patch-ad

@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.2 2008/01/10 21:42:51 adam Exp $
+
+--- src/dt_password.c.orig	2007-05-14 18:26:51.000000000 +0200
++++ src/dt_password.c
+@@ -48,6 +48,15 @@
+ #include <openssl/md5.h>
+ #include <openssl/md4.h>
+ #include <openssl/sha.h>
++#include <openssl/opensslv.h>
++#if OPENSSL_VERSION_NUMBER >= 0x00907000L
++# define des_fcrypt		DES_fcrypt
++# define des_cblock		DES_cblock
++# define des_set_odd_parity	DES_set_odd_parity
++# define des_set_key_unchecked(key,schedule)	DES_set_key_unchecked(key, &(schedule))
++# define des_ecb_encrypt(input, output, ks, enc)	DES_ecb_encrypt(input, output, &(schedule), enc)
++# define des_key_schedule	DES_key_schedule
++#endif
+ #endif /* defined(HAVE_LIBCRYPTO) */
+ 
+ #include "common.h"

databases/gq/patches/patch-ae

@@ -0,0 +1,62 @@
+$NetBSD: patch-ae,v 1.3 2010/01/08 17:21:19 joerg Exp $
+
+--- src/gq-hash-openssl.c.orig	2007-05-14 16:26:50.000000000 +0000
++++ src/gq-hash-openssl.c
+@@ -60,7 +60,7 @@ gq_hash_crypt(gchar const *data, gsize l
+      salt->str[2] = 0;
+ 
+      g_byte_array_append(gb, (guchar*)"{CRYPT}", 7);
+-     des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
++     DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
+ 
+      g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf));
+ 
+@@ -242,7 +242,7 @@ static const char *lmhash_key = "KGS!@#$
+ /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be
+    handled by toupper) */
+ 
+-static void lm_make_key(const char *pw, des_cblock *key)
++static void lm_make_key(const char *pw, DES_cblock *key)
+ {
+      int i;
+      char *k = (char *) key;
+@@ -253,7 +253,7 @@ static void lm_make_key(const char *pw, 
+ 	  k[i+1]  = (pw[i] << (7 - i)) & 0xff;
+      }
+ 
+-     des_set_odd_parity(key);
++     DES_set_odd_parity(key);
+ }
+ 
+ GByteArray*
+@@ -262,10 +262,10 @@ gq_hash_lmhash(gchar const* data, gsize 
+      unsigned int i;
+      char hex[2];
+      char plain[15];
+-     des_key_schedule schedule;
++     DES_key_schedule schedule;
+      GByteArray *gb = NULL;
+-     des_cblock ckey1, ckey2;
+-     des_cblock bin1,  bin2;
++     DES_cblock ckey1, ckey2;
++     DES_cblock bin1,  bin2;
+ 
+      memset(plain, 0, sizeof(plain));
+ 
+@@ -274,12 +274,12 @@ gq_hash_lmhash(gchar const* data, gsize 
+      }
+ 
+      lm_make_key(plain, &ckey1);
+-     des_set_key_unchecked(&ckey1, schedule);
+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT);
++     DES_set_key_unchecked(&ckey1, &schedule);
++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT);
+ 
+      lm_make_key(plain + 7, &ckey2);
+-     des_set_key_unchecked(&ckey2, schedule);
+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT);
++     DES_set_key_unchecked(&ckey2, &schedule);
++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT);
+ 
+      gb = g_byte_array_new();
+ 

databases/gq/patches/patch-an

@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.2 2008/01/10 21:42:54 adam Exp $
+
+--- src/gq.c.orig	2008-01-10 22:31:56.000000000 +0100
++++ src/gq.c
+@@ -32,6 +32,10 @@
+ # include  <config.h>
+ #endif /* HAVE_CONFIG_H */
+ 
++#ifdef HAVE_LOCALE_H
++# include  <locale.h>
++#endif /* HAVE_LOCALE_H */
++
+ #ifdef DEBUG
+ #  include "debug.h"
+ #  ifdef HAVE_MCHECK

databases/gq/patches/patch-src_Makefile.in

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2011/03/29 10:44:17 adam Exp $
+
+Crypto libraries are required for linking gq.
+
+--- src/Makefile.in.orig	2011-03-29 10:24:01.000000000 +0000
++++ src/Makefile.in
+@@ -403,7 +403,7 @@ clean-binPROGRAMS:
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ gq$(EXEEXT): $(gq_OBJECTS) $(gq_DEPENDENCIES) 
+ 	@rm -f gq$(EXEEXT)
+-	$(OBJCLINK) $(gq_OBJECTS) $(gq_LDADD) $(LIBS)
++	$(OBJCLINK) $(gq_OBJECTS) $(gq_LDADD) $(LIBS) $(CRYPTO_LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)

databases/gq/patches/patch-src_gq-hash_h

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gq-hash_h,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/gq-hash.h~	2007-05-14 16:26:51.000000000 +0000
++++ src/gq-hash.h
+@@ -24,7 +24,7 @@
+ #ifndef GQ_ENCRYPTION_H
+ #define GQ_ENCRYPTION_H
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "util.h"
+ 
+ G_BEGIN_DECLS

databases/gq/patches/patch-src_gq-server-list_h

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gq-server-list_h,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/gq-server-list.h~	2007-05-14 16:26:50.000000000 +0000
++++ src/gq-server-list.h
+@@ -26,7 +26,7 @@
+ #ifndef GQ_SERVER_LIST_H
+ #define GQ_SERVER_LIST_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gq-server.h" // for GqServer
+ 
+ G_BEGIN_DECLS

databases/gq/patches/patch-src_state_c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_state_c,v 1.1 2012/05/06 20:12:35 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/state.c~	2007-05-14 16:26:51.000000000 +0000
++++ src/state.c
+@@ -36,7 +36,7 @@
+ #include <errno.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include "xmlparse.h"