Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

7 files changed, 31 insertions, 81 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index ea20a7162988..b61e50b2a49f 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.32 2007/02/24 21:00:46 mezz Exp $
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	2.91
-PORTREVISION=	5
+PORTVERSION=	3.1
 PORTEPOCH=	1
-CATEGORIES=	x11
+CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
 
@@ -34,10 +33,4 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	does not build on 4.X
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 8456fa5a39e7..83004073cea0 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814
-SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b
-SIZE (libxklavier-2.91.tar.gz) = 455935
+MD5 (libxklavier-3.1.tar.gz) = 56c4bea91ccbd0d09e3bcf58dff5732a
+SHA256 (libxklavier-3.1.tar.gz) = 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e
+SIZE (libxklavier-3.1.tar.gz) = 472712
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
index 4de85e18100f..d6d10d94182c 100644
--- a/x11/libxklavier/files/patch-configure
+++ b/x11/libxklavier/files/patch-configure
@@ -1,33 +1,35 @@
---- configure.orig	Mon Dec 13 00:57:33 2004
-+++ configure	Mon Dec 13 00:58:14 2004
-@@ -20135,9 +20135,9 @@
+--- configure.orig	Sat Nov  4 15:13:39 2006
++++ configure	Sat Nov  4 15:14:10 2006
+@@ -23045,9 +23045,9 @@ fi
  
- 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
+ { 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
+-          "$libxkbfile_present" == "yes" \) -o \
+-        "$enable_xmodmap_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
++          "$libxkbfile_present" = "yes" \) -o \
++        "$enable_xmodmap_support" = "yes" ; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
  else
-@@ -21744,14 +21744,14 @@
+@@ -24885,8 +24885,8 @@ fi
  
  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 "$libxkbfile_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)'
++  if test "$libxkbfile_present" = "yes" ; then
+     echo "    XKB, libxkbfile is present"
+     echo "         default ruleset: $xkb_default_ruleset"
+     echo "         base: $xkb_base"
+@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ;
+     echo "    XKB, libxkbfile is NOT present"
    fi
  fi
--if test "$enable_xmm_support" == "yes" ; then
-+if test "$enable_xmm_support" = "yes" ; then
-   echo '    xmodmap'
+-if test "$enable_xmodmap_support" == "yes" ; then
++if test "$enable_xmodmap_support" = "yes" ; then
+   echo "    xmodmap, default ruleset: $xmodmap_default_ruleset"
+   echo "             base: $xmodmap_base"
  fi
- echo '**********************************************************'
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
deleted file mode 100644
index fe26e5ca94ed..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- libxklavier/xklavier_config.c.orig	Sat Apr 15 21:04:38 2006
-+++ libxklavier/xklavier_config.c	Tue Feb 27 14:57:27 2007
-@@ -243,7 +243,7 @@
- 		return FALSE;
- 
- 	nodes = xpath_obj->nodesetval;
--	if (nodes != NULL && nodes->nodeTab != NULL) {
-+	if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) {
- 		rv = xkl_read_config_item(*nodes->nodeTab, pitem);
- 		if (pnode != NULL) {
- 			*pnode = *nodes->nodeTab;
-@@ -275,7 +275,11 @@
- gchar *
- xkl_strings_concat_comma_separated(gchar ** array)
- {
--	return g_strjoinv(",", array);
-+	if (array) {
-+		return g_strjoinv(",", array);
-+	} else {
-+		return g_strdup("");
-+	}
- }
- 
- void
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
deleted file mode 100644
index 91d73cf112a3..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
deleted file mode 100644
index 200a1bda64f9..000000000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier/xklavier_xmm.c.orig	Sat Dec 16 01:25:29 2006
-+++ libxklavier/xklavier_xmm.c	Sat Dec 16 01:29:39 2006
-@@ -107,7 +107,7 @@ xkl_xmm_find_switch_option(XklEngine * e
- 	const XmmSwitchOption *rv = xkl_xmm_shortcut_get_current(engine);
- 
- 	if (rv != NULL) {
--		XmmShortcut *sc = rv->shortcuts;
-+		const XmmShortcut *sc = rv->shortcuts;
- 		while (sc->keysym != XK_VoidSymbol) {
- 			if ((XKeysymToKeycode
- 			     (xkl_engine_get_display(engine),
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 8b2c1b17f954..af1dcbcf8cf2 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -10,6 +10,7 @@ lib/libxklavier.so
 lib/libxklavier.so.11
 libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml