Update to 0.92.

7 files changed, 91 insertions, 92 deletions

diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index 6bd5b7595ffb..bad969cbea64 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gswitchit_applet
-PORTVERSION=	0.81
+PORTVERSION=	0.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
@@ -15,7 +15,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11/gswitchit/distinfo b/x11/gswitchit/distinfo
index bd710b04c6d2..8078dd611bcf 100644
--- a/x11/gswitchit/distinfo
+++ b/x11/gswitchit/distinfo
@@ -1 +1 @@
-MD5 (gswitchit_applet-0.81.tar.gz) = 5bc39a8ea9a0a2a16ca9982cfb25ca44
+MD5 (gswitchit_applet-0.92.tar.gz) = 5a14ce9a6ed42997882b5e34c8e00647
diff --git a/x11/gswitchit/files/patch-configure b/x11/gswitchit/files/patch-configure
index b44fb41d422f..0fc4ac72e91b 100644
--- a/x11/gswitchit/files/patch-configure
+++ b/x11/gswitchit/files/patch-configure
@@ -1,32 +1,62 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Feb  7 11:22:34 2002
-+++ configure	Thu Feb  7 11:25:18 2002
-@@ -7478,7 +7478,7 @@
- fi
+--- configure.orig	Fri May 31 14:03:58 2002
++++ configure	Fri May 31 14:04:45 2002
+@@ -5925,6 +5925,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 	
- else
-@@ -7600,7 +7600,7 @@
-         
- 	BUILD_INCLUDED_LIBINTL=yes
- 	USE_INCLUDED_LIBINTL=yes
--        CATOBJEXT=.gmo
-+        CATOBJEXT=.mo
- 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
- 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
-@@ -7676,7 +7676,7 @@
-     fi
- 
-                 for lang in $ALL_LINGUAS; do
--      GMOFILES="$GMOFILES $lang.gmo"
-+      GMOFILES="$GMOFILES $lang.mo"
-       POFILES="$POFILES $lang.po"
-     done
- 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8524,10 +8525,10 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *_nl_domain_bindings__;
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__
+ ; return 0; }
+ EOF
+ if { (eval echo configure:8534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -8913,7 +8914,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *_nl_domain_bindings__;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -8921,7 +8922,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__ + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -8941,7 +8942,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *_nl_domain_bindings__;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -8949,7 +8950,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__ + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:8956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/x11/gswitchit/files/patch-ltmain.sh b/x11/gswitchit/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11/gswitchit/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gswitchit/files/patch-po::Makefile.in.in b/x11/gswitchit/files/patch-po::Makefile.in.in
deleted file mode 100644
index 7cb6478020f3..000000000000
--- a/x11/gswitchit/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/02/07 09:19:46	1.1
-+++ po/Makefile.in.in	2002/02/07 09:19:59
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/x11/gswitchit/files/patch-src::Makefile.in b/x11/gswitchit/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..a1e173840a11
--- /dev/null
+++ b/x11/gswitchit/files/patch-src::Makefile.in
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/Makefile.in	2002/05/31 11:13:42	1.1
++++ src/Makefile.in	2002/05/31 11:14:13
+@@ -176,6 +176,7 @@
+ 			 $(GDK_PIXBUF_LIBS) \
+ 			 $(GCONF_LIBS) \
+ 			 -lxklavier \
++			 -lxkbfile \
+                          -lgconf-gtk-1 
+ 
+ gswitchit_applet_MANS = ../man/gswitchit_applet.1
diff --git a/x11/gswitchit/pkg-plist b/x11/gswitchit/pkg-plist
index 42af024f62ca..9456432b5d4c 100644
--- a/x11/gswitchit/pkg-plist
+++ b/x11/gswitchit/pkg-plist
@@ -1,29 +1,44 @@
 bin/gswitchit-properties_capplet
 bin/gswitchit_applet
+bin/xkb-properties_capplet
 etc/CORBA/servers/gswitchit_applet.gnorba
 etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/General/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/XKB/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/General/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/XKB/%gconf.xml
 etc/gconf/schemas/gswitchit_applet.schemas
 share/gnome/applets/Utility/gswitchit_applet.desktop
-share/gnome/apps/Settings/gswitchit-properties.desktop
-share/gnome/control-center/capplets/gswitchit-properties.desktop
+share/gnome/apps/Settings/XKB/.directory
+share/gnome/apps/Settings/XKB/gswitchit-properties.desktop
+share/gnome/apps/Settings/XKB/xkb-properties.desktop
+share/gnome/control-center/capplets/XKB/.directory
+share/gnome/control-center/capplets/XKB/gswitchit-properties.desktop
+share/gnome/control-center/capplets/XKB/xkb-properties.desktop
+share/gnome/gswitchit_applet/interfaces/gswitchit_applet.glade
 share/gnome/pixmaps/gswitchit/III.xpm
 share/gnome/pixmaps/gswitchit/IV.xpm
 share/gnome/pixmaps/gswitchit/bg.xpm
+share/gnome/pixmaps/gswitchit/el.xpm
 share/gnome/pixmaps/gswitchit/gswitchit.png
 share/gnome/pixmaps/gswitchit/ru.xpm
 share/gnome/pixmaps/gswitchit/th.xpm
 share/gnome/pixmaps/gswitchit/us.xpm
+share/gnome/pixmaps/gswitchit/xkb.png
 share/locale/bg/LC_MESSAGES/gswitchit_applet.mo
 share/locale/de/LC_MESSAGES/gswitchit_applet.mo
 share/locale/el/LC_MESSAGES/gswitchit_applet.mo
 share/locale/ru/LC_MESSAGES/gswitchit_applet.mo
 share/locale/sv/LC_MESSAGES/gswitchit_applet.mo
 @dirrm share/gnome/pixmaps/gswitchit
-@dirrm share/gnome/control-center/capplets
+@dirrm share/gnome/gswitchit_applet/interfaces
+@dirrm share/gnome/gswitchit_applet
+@dirrm share/gnome/control-center/capplets/XKB
+@dirrm share/gnome/apps/Settings/XKB
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/XKB
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/General
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/XKB
 @dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/General
 @dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet