Update to 0.81.

6 files changed, 159 insertions, 10 deletions

diff --git a/x11/gswitchit/Makefile b/x11/gswitchit/Makefile
index c7f7059728c1..6bd5b7595ffb 100644
--- a/x11/gswitchit/Makefile
+++ b/x11/gswitchit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gswitchit_applet
-PORTVERSION=	0.70
-PORTREVISION=	1
+PORTVERSION=	0.81
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gswitchit
@@ -16,8 +15,7 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
-
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -26,7 +24,7 @@ MAN1=		gswitchit_applet.1
 pre-patch:
 	@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
 		${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/x11/gswitchit/distinfo b/x11/gswitchit/distinfo
index 26d7698912ec..bd710b04c6d2 100644
--- a/x11/gswitchit/distinfo
+++ b/x11/gswitchit/distinfo
@@ -1 +1 @@
-MD5 (gswitchit_applet-0.70.tar.gz) = 2d72bf1d8c82debbbd651a01b006d80e
+MD5 (gswitchit_applet-0.81.tar.gz) = 5bc39a8ea9a0a2a16ca9982cfb25ca44
diff --git a/x11/gswitchit/files/patch-configure b/x11/gswitchit/files/patch-configure
new file mode 100644
index 000000000000..bb193a809cdd
--- /dev/null
+++ b/x11/gswitchit/files/patch-configure
@@ -0,0 +1,74 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Feb  7 11:22:34 2002
++++ configure	Thu Feb  7 11:25:18 2002
+@@ -6997,7 +6997,7 @@
+ #line 6998 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ iconv_t cd = iconv_open("","");
+        iconv(cd,NULL,NULL,NULL,NULL);
+@@ -7014,12 +7014,12 @@
+ rm -f conftest*
+     if test "$am_cv_func_iconv" != yes; then
+       am_save_LIBS="$LIBS"
+-      LIBS="$LIBS -liconv"
++      LIBS="$LIBS -lgiconv"
+       cat > conftest.$ac_ext <<EOF
+ #line 7020 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ int main() {
+ iconv_t cd = iconv_open("","");
+          iconv(cd,NULL,NULL,NULL,NULL);
+@@ -7057,7 +7057,7 @@
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -7095,7 +7095,7 @@
+   fi
+   LIBICONV=
+   if test "$am_cv_lib_iconv" = yes; then
+-    LIBICONV="-liconv"
++    LIBICONV="-lgiconv"
+   fi
+   
+ 
+@@ -7478,7 +7478,7 @@
+ fi
+ 
+ 
+-	     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
+ 
diff --git a/x11/gswitchit/files/patch-ltmain.sh b/x11/gswitchit/files/patch-ltmain.sh
new file mode 100644
index 000000000000..91713d2306f8
--- /dev/null
+++ b/x11/gswitchit/files/patch-ltmain.sh
@@ -0,0 +1,45 @@
+
+$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
new file mode 100644
index 000000000000..7cb6478020f3
--- /dev/null
+++ b/x11/gswitchit/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$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/pkg-plist b/x11/gswitchit/pkg-plist
index c36832bf0193..42af024f62ca 100644
--- a/x11/gswitchit/pkg-plist
+++ b/x11/gswitchit/pkg-plist
@@ -1,11 +1,29 @@
 bin/gswitchit-properties_capplet
 bin/gswitchit_applet
 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/schemas/apps/gswitchit_applet/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/General/%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/gswitchit-properties.desktop
-share/gnome/pixmaps/gswitchit.png
-share/gnome/pixmaps/ru.xpm
-share/gnome/pixmaps/us.xpm
+share/gnome/control-center/capplets/gswitchit-properties.desktop
+share/gnome/pixmaps/gswitchit/III.xpm
+share/gnome/pixmaps/gswitchit/IV.xpm
+share/gnome/pixmaps/gswitchit/bg.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/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 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/General
+@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet