Use base libtool.

x11/gnome/gcr/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2012/11/10 10:16:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2012/11/10 10:17:45 ajacoutot Exp $
 
 COMMENT=	library for bits of crypto UI and parsing
 
 GNOME_PROJECT=	gcr
 GNOME_VERSION=	3.6.1
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS +=  gck-1                     1.0 # 0.0
 SHARED_LIBS +=  gcr-3                     2.0 # 1.0
@@ -23,7 +23,7 @@ WANTLIB += gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gpg-error gthread-2.0 gtk-3 harfbuzz icudata
 WANTLIB += icule icuuc m p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render
-WANTLIB += xcb-shm z
+WANTLIB += Xau Xdmcp Xxf86vm drm stdc++ xcb-shm z
 
 MODULES=	devel/gettext \
 		x11/gnome \
@@ -33,11 +33,6 @@ MODGNOME_TOOLS=		goi
 MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_ICON_CACHE=	Yes
 
-# XXX
-# In function `_gck_stringize_rv': gck/gck-misc.c:132: multiple definition of `SECMEM_pool_data_v1_0'
-# gck/tests/test-gck-attributes.c:34: first defined here
-USE_LIBTOOL=	gnu
-
 # asn1Parser(1) is used by configure for parsing ASN.1 files
 BUILD_DEPENDS += security/libtasn1
 

x11/gnome/gcr/patches/patch-gck_tests_test-gck-attributes_c

@@ -0,0 +1,15 @@
+$OpenBSD: patch-gck_tests_test-gck-attributes_c,v 1.1 2012/11/10 10:17:45 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687980
+
+--- gck/tests/test-gck-attributes.c.orig	Sat Nov 10 10:49:40 2012
++++ gck/tests/test-gck-attributes.c	Sat Nov 10 10:49:45 2012
+@@ -31,8 +31,6 @@
+ #include "gck/gck.h"
+ #include "gck/gck-test.h"
+ 
+-EGG_SECURE_DEFINE_GLIB_GLOBALS ();
+-
+ EGG_SECURE_DECLARE (test_gck_attributes);
+ 
+ #define ATTR_TYPE 55

x11/gnome/gcr/patches/patch-gcr_gcr-memory_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcr_gcr-memory_c,v 1.1 2012/11/10 10:17:45 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687980
+
+--- gcr/gcr-memory.c.orig	Sat Nov 10 10:49:59 2012
++++ gcr/gcr-memory.c	Sat Nov 10 10:50:03 2012
+@@ -24,5 +24,3 @@
+ #include "egg/egg-secure-memory.h"
+ 
+ #include <glib.h>
+-
+-EGG_SECURE_DEFINE_GLIB_GLOBALS ();