Update to 2.91.

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

8 files changed, 142 insertions, 0 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
new file mode 100644
index 000000000..7efbb5836
--- /dev/null
+++ b/x11/libxklavier/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	libxklavier
+# Date created:				31 May 2002
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD: ports/x11/libxklavier/Makefile,v 1.28 2006/04/03 21:29:43 marcus Exp $
+#
+
+PORTNAME=	libxklavier
+PORTVERSION=	2.91
+PORTEPOCH=	1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gswitchit
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An utility library to make XKB stuff easier
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnometarget gnomehack libxml2
+INSTALLS_SHLIB=	yes
+USE_GETOPT_LONG=yes
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
+CONFIGURE_ARGS=	--disable-doxygen \
+		--with-xkb-base=${X11BASE}/lib/X11/xkb \
+		--with-xmodmap-base=${X11BASE}/share/gnome/xmodmap \
+		--disable-gtk-doc \
+		--with-html-dir=${GNOME_HTML_DIR}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
+.include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
new file mode 100644
index 000000000..8456fa5a3
--- /dev/null
+++ b/x11/libxklavier/distinfo
@@ -0,0 +1,3 @@
+MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814
+SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b
+SIZE (libxklavier-2.91.tar.gz) = 455935
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
new file mode 100644
index 000000000..4de85e181
--- /dev/null
+++ b/x11/libxklavier/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig	Mon Dec 13 00:57:33 2004
++++ configure	Mon Dec 13 00:58:14 2004
+@@ -20135,9 +20135,9 @@
+ 
+ echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
+ echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
+-if test \( "$enable_xkb_support" == "yes" -a \
+-          "$xkb_headers_present" == "yes" \) -o \
+-        "$enable_xmm_support" == "yes" ; then
++if test \( "$enable_xkb_support" = "yes" -a \
++          "$xkb_headers_present" = "yes" \) -o \
++        "$enable_xmm_support" = "yes" ; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+@@ -21744,14 +21744,14 @@
+ 
+ echo '**********************************************************'
+ echo '  Libxklavier is configured with the following backends:'
+-if test "$enable_xkb_support" == "yes" ; then
+-  if test "$xkb_headers_present" == "yes" ; then
++if test "$enable_xkb_support" = "yes" ; then
++  if test "$xkb_headers_present" = "yes" ; then
+     echo '    XKB (libxkbfile headers are present)'
+   else
+     echo '    XKB (but libxkbfile headers are NOT present)'
+   fi
+ fi
+-if test "$enable_xmm_support" == "yes" ; then
++if test "$enable_xmm_support" = "yes" ; then
+   echo '    xmodmap'
+ fi
+ echo '**********************************************************'
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
new file mode 100644
index 000000000..d4b14aee6
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier.c.orig	Sat Apr 15 21:14:40 2006
++++ libxklavier/xklavier.c	Tue Jun 13 00:07:32 2006
+@@ -394,7 +394,7 @@ xkl_default_log_appender(const gchar fil
+ 			 gint level, const gchar format[], va_list args)
+ {
+ 	time_t now = time(NULL);
+-	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file,
++	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file,
+ 		function);
+ 	vfprintf(stdout, format, args);
+ }
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
new file mode 100644
index 000000000..91d73cf11
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier_config_i18n.c.orig	Tue Jun 13 00:12:44 2006
++++ libxklavier/xklavier_config_i18n.c	Tue Jun 13 00:13:05 2006
+@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s
+ 	iconv_t converter;
+ 	gchar converted[XKL_MAX_CI_DESC_LENGTH];
+ 	gchar *converted_start = converted;
+-	gchar *utf_start = (char *) utf8string;
++	const gchar *utf_start = (const char *) utf8string;
+ 	size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+ 	const gchar *charset;
+ 
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..8b2c1b17f
--- /dev/null
+++ b/x11/libxklavier/pkg-plist
@@ -0,0 +1,30 @@
+include/libxklavier/xklavier.h
+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
+lib/libxklavier.a
+lib/libxklavier.la
+lib/libxklavier.so
+lib/libxklavier.so.11
+libdata/pkgconfig/libxklavier.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libxklavier-XklConfigItem.html
+%%DOCSDIR%%/libxklavier-XklConfigRec.html
+%%DOCSDIR%%/libxklavier-XklConfigRegistry.html
+%%DOCSDIR%%/libxklavier-XklEngine.html
+%%DOCSDIR%%/libxklavier-xklavier.html
+%%DOCSDIR%%/libxklavier.devhelp
+%%DOCSDIR%%/libxklavier.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DATADIR%%/xfree86.xml
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
+@dirrm include/libxklavier