Update to 3.6.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10924 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 93 insertions, 0 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
new file mode 100644
index 000000000..c8b042ca2
--- /dev/null
+++ b/x11/libxklavier/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:	libxklavier
+# Date created:				31 May 2002
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.39 2008/03/20 16:07:22 mezz Exp $
+#
+
+PORTNAME=	libxklavier
+PORTVERSION=	3.6
+PORTEPOCH=	1
+CATEGORIES=	x11 gnome
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	gswitchit
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An utility library to make XKB stuff easier
+
+RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
+
+USE_XORG=	x11 xkbfile
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gnomehack libxml2 glib20 ltverhack:12
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-doxygen \
+		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+		--with-xkb-bin-base=${LOCALBASE}/bin \
+		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
+		--disable-gtk-doc \
+		--with-html-dir=${GNOME_HTML_DIR}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
+		${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
new file mode 100644
index 000000000..a9f455ad1
--- /dev/null
+++ b/x11/libxklavier/distinfo
@@ -0,0 +1,3 @@
+MD5 (libxklavier-3.6.tar.gz) = 19b5ba95a7295831c0f4d5be1aae1376
+SHA256 (libxklavier-3.6.tar.gz) = 92e2044414b86b820f85333ae626f3ca9d5bd0b1be35148f3c50f88a87c4d5ce
+SIZE (libxklavier-3.6.tar.gz) = 462046
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
new file mode 100644
index 000000000..a56ec7896
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_props.c.orig	Sun Apr 16 20:51:36 2006
++++ libxklavier/xklavier_props.c	Tue Jun 13 00:11:24 2006
+@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop
+ 					       --varlen);
+ 					var[varlen] = '\0';
+ 					/* Resize the original layout */
+-					((char *)
+-					 g_realloc(*layout,
+-						   laylen + 1))[laylen] =
+-					    '\0';
++					*layout = g_realloc(*layout, laylen + 1);
++					(*layout)[laylen] = '\0';
+ 				}
+ 			}
+ 			layout++;
diff --git a/x11/libxklavier/pkg-descr b/x11/libxklavier/pkg-descr
new file mode 100644
index 000000000..d5000e3ad
--- /dev/null
+++ b/x11/libxklavier/pkg-descr
@@ -0,0 +1,4 @@
+Libxklavier is a utility to simplify setting and changing
+keyboard layouts.
+
+WWW: http://gswitchit.sourceforge.net/
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
new file mode 100644
index 000000000..53fb1e871
--- /dev/null
+++ b/x11/libxklavier/pkg-plist
@@ -0,0 +1,29 @@
+include/libxklavier/xkl_config_item.h
+include/libxklavier/xkl_config_rec.h
+include/libxklavier/xkl_config_registry.h
+include/libxklavier/xkl_engine.h
+include/libxklavier/xkl_engine_marshal.h
+include/libxklavier/xklavier.h
+lib/libxklavier.a
+lib/libxklavier.la
+lib/libxklavier.so
+lib/libxklavier.so.12
+libdata/pkgconfig/libxklavier.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/XklConfigItem.html
+%%DOCSDIR%%/XklConfigRec.html
+%%DOCSDIR%%/XklConfigRegistry.html
+%%DOCSDIR%%/XklEngine.html
+%%DOCSDIR%%/libxklavier-xklavier.html
+%%DOCSDIR%%/libxklavier.devhelp
+%%DOCSDIR%%/libxklavier.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+@dirrm %%DOCSDIR%%
+@dirrm include/libxklavier