Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

12 files changed, 114 insertions, 79 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index d00571d57dd5..3ec757055fd6 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	1.04
-PORTREVISION=	1
+PORTVERSION=	2.0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,10 +20,12 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2
 INSTALLS_SHLIB=	yes
+USE_GETOPT_LONG=yes
 USE_LIBTOOL_VER=15
+CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xkb-base=${X11BASE}/lib/X11/xkb
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 12b8565f2e87..3236c8a12b54 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,2 +1,2 @@
-MD5 (libxklavier-1.04.tar.gz) = 322078ad3681465f69a65c0758c74460
-SIZE (libxklavier-1.04.tar.gz) = 422337
+MD5 (libxklavier-2.0.tar.gz) = 9257653ee3d194d9c8d669e969fe4332
+SIZE (libxklavier-2.0.tar.gz) = 435898
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
new file mode 100644
index 000000000000..4de85e18100f
--- /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_config_i18n.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c
deleted file mode 100644
index fed33a78f971..000000000000
--- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libxklavier/xklavier_config_i18n.c.orig	Mon Oct 25 21:55:29 2004
-+++ libxklavier/xklavier_config_i18n.c	Mon Oct 25 21:56:51 2004
-@@ -142,13 +142,14 @@
-     XklDebug( 0,
-               "Unable to convert %s from UTF-8 to %s, this string will probably display wrong.",
-               utf8string, charset );
-+    iconv_close( converter );
-     return strdup( utf8string );
-   }
-   *convertedStart = '\0';
- 
-   iconv_close( converter );
- 
--  return converted;
-+  return strdup( converted );
- }
- 
- /*
diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
deleted file mode 100644
index 946d2d5808b9..000000000000
--- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libxklavier/xklavier_config_xkb.c.orig	Fri Oct  1 22:04:54 2004
-+++ libxklavier/xklavier_config_xkb.c	Tue Oct 12 18:44:59 2004
-@@ -184,10 +184,11 @@
- 
-   if ( supportState == UNCHECKED )
-   {
-+    XkbRF_RulesPtr rulesPtr;
-     XklDebug( 100, "!!! Checking multiple layouts support\n" );
-     supportState = NON_SUPPORTED;
- #ifdef XKB_HEADERS_PRESENT
--    XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
-+    rulesPtr = _XklLoadRulesSet();
-     if ( rulesPtr )
-     {
-       XkbRF_VarDefsRec varDefs;
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
new file mode 100644
index 000000000000..195b48534da1
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -0,0 +1,23 @@
+--- libxklavier/xklavier.c.orig	Tue Nov  2 16:58:48 2004
++++ libxklavier/xklavier.c	Tue Nov 23 19:56:29 2004
+@@ -536,7 +536,7 @@
+                             int level, const char format[], va_list args )
+ {
+   time_t now = time( NULL );
+-  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function );
++  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function );
+   vfprintf( stdout, format, args );
+ }
+ 
+@@ -700,9 +700,10 @@
+ {
+   if ( xklVTable == NULL )
+   {
++    char *p;
+     XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
+     /* force the crash! */
+-    char *p = NULL; *p = '\0';
++    p = NULL; *p = '\0';
+   }
+ }
+ 
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 000000000000..0ef120607f55
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier_config_i18n.c.orig	Tue Nov 23 18:33:37 2004
++++ libxklavier/xklavier_config_i18n.c	Tue Nov 23 18:34:30 2004
+@@ -106,7 +106,7 @@
+   iconv_t converter;
+   static char converted[XKL_MAX_CI_DESC_LENGTH];
+   char *convertedStart = converted;
+-  char *utfStart = ( char * ) utf8string;
++  const char *utfStart = ( const char * ) utf8string;
+   size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+   const char *charset;
+ 
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
new file mode 100644
index 000000000000..8dbfe37c7977
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
@@ -0,0 +1,22 @@
+--- libxklavier/xklavier_evt_xmm.c.orig	Tue Nov 30 02:18:31 2004
++++ libxklavier/xklavier_evt_xmm.c	Tue Nov 30 02:20:24 2004
+@@ -13,15 +13,15 @@
+ {
+   if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
+   {
+-    XklDebug( 200, "Processing the KeyPress event\n" );
+     int currentShortcut = 0;
+     const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, 
+-                                                            kpe->state,
+-                                                            &currentShortcut );
++                                   kpe->state,
++                                   &currentShortcut );
++    XklDebug( 200, "Processing the KeyPress event\n" );
+     if( sop != NULL )
+     {
+-      XklDebug( 150, "It is THE shortcut\n" );
+       XklState state;
++      XklDebug( 150, "It is THE shortcut\n" );
+       _XklXmmGetRealState( &state );
+       if( state.group != -1 )
+       {
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
new file mode 100644
index 000000000000..6db8c55088c3
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_xmm.c.orig	Tue Nov 30 02:17:37 2004
++++ libxklavier/xklavier_xmm.c	Tue Nov 30 02:17:51 2004
+@@ -66,10 +66,11 @@
+ const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+ {
+   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
++  XmmSwitchOptionPtr switchOption;
+   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
+   if( optionName == NULL )
+     return NULL;
+-  XmmSwitchOptionPtr switchOption = allSwitchOptions;
++  switchOption = allSwitchOptions;
+   while( switchOption->optionName != NULL )
+   {
+     if( !strcmp( switchOption->optionName, optionName ) )
diff --git a/x11/libxklavier/files/patch-tests-test_config.c b/x11/libxklavier/files/patch-tests-test_config.c
deleted file mode 100644
index cc374f0b96d2..000000000000
--- a/x11/libxklavier/files/patch-tests-test_config.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/test_config.c.orig	Fri Oct  1 21:52:02 2004
-+++ tests/test_config.c	Tue Oct 12 18:46:32 2004
-@@ -46,6 +46,7 @@
-   const char* layouts = NULL;
-   const char* options = NULL;
-   int debugLevel = 0;
-+  Display* dpy;
- 
-   while (1)
-   {
-@@ -89,7 +90,7 @@
-     exit( 0 );
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/files/patch-tests-test_monitor.c b/x11/libxklavier/files/patch-tests-test_monitor.c
deleted file mode 100644
index 3fcc08426904..000000000000
--- a/x11/libxklavier/files/patch-tests-test_monitor.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/test_monitor.c.orig	Fri Oct  1 21:52:02 2004
-+++ tests/test_monitor.c	Tue Oct 12 18:47:32 2004
-@@ -42,6 +42,7 @@
-   int c;
-   int debugLevel = 0;
-   XkbEvent ev;
-+  Display* dpy;
- 
-   while (1)
-   {
-@@ -63,7 +64,7 @@
-     }
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index d58809c9513d..0a50a33fefdd 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -2,8 +2,8 @@ include/libxklavier/xklavier.h
 include/libxklavier/xklavier_config.h
 lib/libxklavier.a
 lib/libxklavier.so
-lib/libxklavier.so.8
+lib/libxklavier.so.10
 libdata/pkgconfig/libxklavier.pc
-share/libxklavier/xfree86.xml
-@dirrm share/libxklavier
+%%DATADIR%%/xfree86.xml
+@dirrm %%DATADIR%%
 @dirrm include/libxklavier