author: Joe Marcus Clarke <marcus@FreeBSD.org> 2004-11-07 22:24:32 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2004-11-07 22:24:32 +0000
commit: 58406bee8938178fc317574c4236434b0dd11a25 (patch)
tree: b4fa34eca69e23769c548b4436cbf65d765e5fe2 /x11
parent: 98eb5c95a29c8dd1a76435744e5316092835f696 (diff)
download: ports-58406bee8938178fc317574c4236434b0dd11a25.tar.gz
ports-58406bee8938178fc317574c4236434b0dd11a25.zip
65 files changed, 1513 insertions, 494 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index a65c580ce39a..4a501d414cb6 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.6.0.4
+PORTVERSION=	2.6.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
@@ -54,6 +54,11 @@ post-extract:
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|[(]datadir[)]/icons/hicolor|(prefix)/share/icons/hicolor|g'
+.if ${OSVERSION} < 600006
+.for po in zh_CN.po
+	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+.endif
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 7c7e375a193c..ff06b0d61aef 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.6.0.4.tar.bz2) = 3a6986217d4db2afd24fcdbf3b9af722
-SIZE (gnome2/gdm-2.6.0.4.tar.bz2) = 3217512
+MD5 (gnome2/gdm-2.6.0.6.tar.bz2) = 8dca7cb1f28d81f60f6e07b3c24288c5
+SIZE (gnome2/gdm-2.6.0.6.tar.bz2) = 3216098
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 0bc57e468b33..35cd08f89e14 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,6 +1,6 @@
---- config/gdm.conf.in.orig	Mon Aug  2 18:20:59 2004
-+++ config/gdm.conf.in	Thu Aug 19 12:54:26 2004
-@@ -77,7 +77,7 @@
+--- config/gdm.conf.in.orig	Tue Oct 26 23:18:21 2004
++++ config/gdm.conf.in	Tue Oct 26 23:20:49 2004
+@@ -76,7 +76,7 @@
  # To try to kill all clients started at greeter time or in the Init script.
  # doesn't always work, only if those clients have a window of their own
  #KillInitClients=true
@@ -9,7 +9,7 @@
  # You should probably never change this value unless you have a weird setup
  PidFile=/var/run/gdm.pid
  # Note that a post login script is run before a PreSession script.
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
  # Reboot, Halt and suspend commands, you can add different commands
  # separated by a semicolon and gdm will use the first one it can find
  #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
@@ -18,23 +18,22 @@
  #SuspendCommand=
  # Probably should not touch the below this is the standard setup
  ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -132,11 +132,10 @@
+@@ -131,11 +131,11 @@
  #FlexiReapDelayMinutes=5
  # the X nest command
- Xnest=@X_SERVER_PATH@/Xnest -audit 0 -name Xnest
+ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
 -# Automatic VT allocation.  Right now only works on Linux.  This way
--# we force X to use specific vts.  turn VTAllocation to false if this
--# is causing problems.
++# Automatic VT allocation.  This way
+ # we force X to use specific vts.  turn VTAllocation to false if this
+ # is causing problems.
 -#FirstVT=7
 -#VTAllocation=true
-+# Automatic VT allocation. This way we force X to use specific vts.
-+# Turn VTAllocation to false if this is causing problems.
 +#FirstVT=9
 +VTAllocation=false
  # Should double login be treated with a warning (and possibility to change
- # vts on linux systems for console logins)
+ # vts on linux and freebsd systems for console logins)
  #DoubleLoginWarning=true
-@@ -241,7 +240,7 @@
+@@ -240,7 +240,7 @@
  # The specific gtkrc file we use.  It should be the full path to the gtkrc
  # that we need.  Unless you need a specific gtkrc that doesn't correspond to
  # a specific theme, then just use the GtkTheme key
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index de8e5ea8d080..27ffdec94143 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -57,7 +57,7 @@
 -Malay			ms_MY.UTF-8,ms_MY
 -Marathi			mr_IN.UTF-8,mr_IN
 -Mongolian		mn_MN.UTF-8,mn_MN
--Norwegian(bokmal)	no_NO.UTF-8,no_NO
+-Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
 -Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
 -Oriya			or_IN.UTF-8,or_IN
 -Panjabi			pa_IN.UTF-8,pa_IN
@@ -120,7 +120,7 @@
 +Japanese               ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP
 +Korean                 ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR
 +Lithuanian             lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13
-+Norwegian(bokmal)      no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15
++Norwegian(bokmal)      nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15
 +Polish                 pl_PL.UTF-8,pl_PL.ISO8859-2
 +Portuguese             pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1
 +Portuguese(Brazilian)  pt_PT.UTF-8,pt_BR.ISO8859-1
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 317dabf10ec2..0e69f9f5c7d9 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -138,6 +138,7 @@ share/locale/az/LC_MESSAGES/gdm.mo
 share/locale/be/LC_MESSAGES/gdm.mo
 share/locale/bg/LC_MESSAGES/gdm.mo
 share/locale/bn/LC_MESSAGES/gdm.mo
+share/locale/bs/LC_MESSAGES/gdm.mo
 share/locale/ca/LC_MESSAGES/gdm.mo
 share/locale/cs/LC_MESSAGES/gdm.mo
 share/locale/cy/LC_MESSAGES/gdm.mo
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 28b69fcfec0c..4d86584d6f0b 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.6.2.1
-PORTREVISION=	4
+PORTVERSION=	2.8.1.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.8
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -29,7 +28,15 @@ USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack gnomepanel \
 		gstreamerplugins gail
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		FREEBSD_SYS=${FREEBSD_SYS}
+
+GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \
+		gswitchit.schemas gtik.schemas gweather.schemas \
+		mailcheck.schemas mini-commander.schemas mixer.schemas \
+		modemlights.schemas multiload.schemas stickynotes.schemas
+
+FREEBSD_SYS?=	/usr/src/sys
 
 .include <bsd.port.pre.mk>
 
@@ -37,7 +44,20 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
 PLIST_SUB=	BATTERY="@comment "
 .else
+GCONF_SCHEMAS+=	battstat.schemas
 PLIST_SUB=	BATTERY=""
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "              W  A  R  N  I  N  G"
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel  *"
+	@${ECHO_MSG} "* sources installed. If your kernel sources         *"
+	@${ECHO_MSG} "* are somewhere other than /usr/src/sys, you        *"
+	@${ECHO_MSG} "* may set the FREEBSD_SYS variable to the           *"
+	@${ECHO_MSG} "* correct path.                                     *"
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index fa0dd052696d..2f9ff553586d 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.6.2.1.tar.bz2) = d29dc21035db8b93671058d7f1ac4aaa
-SIZE (gnome2/gnome-applets-2.6.2.1.tar.bz2) = 5478737
+MD5 (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 897d6f7aed1717c5be9d5707c0407604
+SIZE (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 6405066
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 73b0823ce82e..0186faf0ee14 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Sun Feb 22 19:22:49 2004
-+++ configure	Sun Feb 22 19:24:33 2004
-@@ -22912,6 +22912,7 @@
+--- configure.orig	Sat Oct 16 15:45:26 2004
++++ configure	Sat Oct 16 15:47:04 2004
+@@ -463,7 +463,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE ACPIINC BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -24323,6 +24323,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -8,16 +17,29 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -23034,7 +23035,7 @@
- 
- 	;;
-   # list of supported OS cores that do not use libapm
--  *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+  i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
- 	;;
-   *)
- 	echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-@@ -24905,14 +24906,14 @@
+@@ -24384,6 +24385,7 @@
+ 
+ HAVE_LIBAPM=no
+ NEED_LIBAPM=no
++ACPIINC=
+ build_battstat_applet=no
+ 
+ if test x$disable_battstat = xno; then
+@@ -24535,7 +24537,12 @@
+ 
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++           if [ -n "${FREEBSD_SYS}" ]; then
++	       ACPIINC="-I${FREEBSD_SYS}"
++	   else
++               ACPIINC="-I/usr/src/sys"
++	   fi
+ 	   ;;
+        *)
+ 	   echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -26615,14 +26622,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
  cat >>confdefs.h <<_ACEOF
@@ -34,3 +56,11 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
+@@ -27773,6 +27780,7 @@
+ s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t
+ s,@CDROM_HOST@,$CDROM_HOST,;t t
+ s,@CDROM_LIBS@,$CDROM_LIBS,;t t
++s,@ACPIINC@,$ACPIINC,;t t
+ s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t
+ s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t
+ s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t
diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi
new file mode 100644
index 000000000000..4025a9a360f1
--- /dev/null
+++ b/x11/gnome-applets/files/patch-battstat-acpi
@@ -0,0 +1,459 @@
+--- battstat/Makefile.in.orig	Mon Sep 27 18:39:44 2004
++++ battstat/Makefile.in	Mon Sep 27 18:40:56 2004
+@@ -173,6 +173,8 @@
+ pixmapsdir = $(datadir)/pixmaps
+ pixmaps_DATA = battstat.png
+ 
++ACPIINC = @ACPIINC@
++
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm
+ @NEED_LIBAPM_FALSE@APMLIB = 
+@@ -191,6 +193,7 @@
+ 	$(GNOME_APPLETS_CFLAGS) \
+ 	$(LIBGLADE_CFLAGS) \
+ 	$(APMINC) \
++	$(ACPIINC) \
+ 	-DDATA_DIR=\"$(datadir)\" \
+ 	-DGLADE_DIR=\"$(gladedir)\" \
+ 	-DG_LOG_DOMAIN=\"battstat_applet\" \
+@@ -205,7 +208,9 @@
+ 	properties.c \
+ 	battstat_applet.c \
+ 	acpi-linux.c \
+-	acpi-linux.h
++	acpi-linux.h \
++	acpi-freebsd.c \
++	acpi-freebsd.h
+ 
+ 
+ battstat_applet_2_LDADD = \
+@@ -242,7 +247,7 @@
+ PROGRAMS = $(libexec_PROGRAMS)
+ 
+ am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
+-	battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
++	battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT)
+ battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@	apmlib/libapm.a
+@@ -259,6 +264,7 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/acpi-freebsd.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/battstat_applet.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/properties.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -330,6 +336,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@
+ 
+--- battstat/acpi-freebsd.h.orig	Mon Sep 27 18:39:30 2004
++++ battstat/acpi-freebsd.h	Mon Sep 27 18:39:30 2004
+@@ -0,0 +1,45 @@
++/*
++ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __ACPI_FREEBSD_H__
++#define __ACPI_FREEBSD_H__
++
++#define ACPIDEV "/dev/acpi"
++
++#define BATT_MIN 0
++#define BATT_MAX 64
++
++#define ACPI_ACLINE "hw.acpi.acline"
++#define ACPI_TIME "hw.acpi.battery.time"
++#define ACPI_LIFE "hw.acpi.battery.life"
++#define ACPI_STATE "hw.acpi.battery.state"
++
++struct acpi_info {
++  gboolean  ac_online;
++  int       acpifd;
++  int       max_capacity;
++  int       low_capacity;
++  int       critical_capacity;
++};
++
++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
++gboolean acpi_process_event(struct acpi_info * acpiinfo);
++gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
++void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
++
++#endif /* __ACPI_FREEBSD_H__ */
+--- battstat/acpi-freebsd.c.orig	Tue Sep 28 16:55:52 2004
++++ battstat/acpi-freebsd.c	Tue Sep 28 17:00:32 2004
+@@ -0,0 +1,213 @@
++/* battstat        A GNOME battery meter for laptops.
++ * Copyright (C) 2000 by J�rgen Pehrson <jp@spektr.eu.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $
++ */
++
++/*
++ * ACPI battery functions for FreeBSD >= 5.2.
++ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef __FreeBSD__
++
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/ioctl.h>
++#include <machine/apm_bios.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <glib.h>
++
++#include <dev/acpica/acpiio.h>
++#include <contrib/dev/acpica/acpi.h>
++
++#include "acpi-freebsd.h"
++
++static gboolean
++update_ac_info(struct acpi_info * acpiinfo)
++{
++  int acline;
++  size_t len = sizeof(acline);
++
++  acpiinfo->ac_online = FALSE;
++
++  if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  acpiinfo->ac_online = acline ? TRUE : FALSE;
++
++  return TRUE;
++}
++
++static gboolean
++update_battery_info(struct acpi_info * acpiinfo)
++{
++  union acpi_battery_ioctl_arg battio;
++  int i;
++
++  /* We really don't have to do this here.  All of the relevant battery
++   * info can be obtained through sysctl.  However, one day, the rate
++   * may be useful to get time left to full charge.
++   */
++
++  for(i = BATT_MIN; i < BATT_MAX; i++) {
++    battio.unit = i;
++    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) {
++      continue;
++    }
++
++    acpiinfo->max_capacity += battio.bif.lfcap;
++    acpiinfo->low_capacity += battio.bif.wcap;
++    acpiinfo->critical_capacity += battio.bif.lcap;
++  }
++
++  return TRUE;
++}
++
++gboolean
++acpi_freebsd_init(struct acpi_info * acpiinfo)
++{
++  int acpi_fd;
++
++  g_assert(acpiinfo);
++
++  acpi_fd = open(ACPIDEV, O_RDONLY);
++  if (acpi_fd >= 0) {
++    acpiinfo->acpifd = acpi_fd;
++  }
++  else {
++    acpiinfo->acpifd = -1;
++    return FALSE;
++  }
++
++  update_battery_info(acpiinfo);
++  update_ac_info(acpiinfo);
++
++  return TRUE;
++}
++
++void
++acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
++{
++  g_assert(acpiinfo);
++
++  if (acpiinfo->acpifd >= 0) {
++    close(acpiinfo->acpifd);
++    acpiinfo->acpifd = -1;
++  }
++}
++
++/* XXX This is a hack since user-land applications can't get ACPI events yet.
++ * Devd provides this (or supposedly provides this), but you need to be
++ * root to access devd.
++ */
++gboolean
++acpi_process_event(struct acpi_info * acpiinfo)
++{
++  g_assert(acpiinfo);
++
++  update_ac_info(acpiinfo);
++  update_battery_info(acpiinfo);
++
++  return TRUE;
++}
++
++gboolean
++acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo)
++{
++  int time;
++  int life;
++  int acline;
++  int state;
++  size_t len;
++  int rate;
++  int remain;
++  union acpi_battery_ioctl_arg battio;
++  gboolean charging;
++  int i;
++
++  g_assert(acpiinfo);
++
++  charging = FALSE;
++
++  for(i = BATT_MIN; i < BATT_MAX; i++) {
++    battio.unit = i;
++    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) {
++      continue;
++    }
++
++    remain += battio.bst.cap;
++    rate += battio.bst.rate;
++  }
++
++  len = sizeof(time);
++  if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  len = sizeof(life);
++  if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  len = sizeof(state);
++  if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0;
++  if (state & ACPI_BATT_STAT_CHARGING) {
++    apminfo->ai_batt_stat = 3;
++    charging = TRUE;
++  }
++  else if (state & ACPI_BATT_STAT_CRITICAL) {
++    /* Add a special check here since FreeBSD's ACPI interface will tell us
++     * when the battery is critical.
++     */
++    apminfo->ai_batt_stat = 2;
++  }
++  else {
++    apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0;
++  }
++  apminfo->ai_batt_life = life;
++  if (!charging) {
++    apminfo->ai_batt_time = time * 60;
++  }
++  else if (charging && rate > 0) {
++    apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60);
++  }
++  else
++    /* This multiplication is a hack to make sure the -1 survives so the applet
++     * can process it.  Battstat wants the remaining time in minutes, but
++     * ai_batt_time is in seconds.  In order to make both ACPI and APM work
++     * with the fewest amount of hacks, we will just assume everything is
++     * in seconds.
++     */
++    apminfo->ai_batt_time = -1 * 60;
++
++  return TRUE;
++}
++#endif
+--- battstat/battstat_applet.c.orig	Mon Sep 13 04:33:31 2004
++++ battstat/battstat_applet.c	Fri Oct  1 16:46:01 2004
+@@ -62,6 +62,9 @@
+ #ifdef __linux__
+ #include "acpi-linux.h"
+ #endif
++#ifdef __FreeBSD__
++#include "acpi-freebsd.h"
++#endif
+ 
+ #ifndef gettext_noop
+ #define gettext_noop(String) (String)
+@@ -237,6 +240,24 @@
+ #endif
+ 
+ #ifdef __FreeBSD__
++struct acpi_info acpiinfo;
++gboolean using_acpi;
++int acpi_count;
++
++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
++
++gboolean acpi_callback (gpointer data)
++{
++  ProgressData * battstat = (ProgressData *) data;
++
++  if (acpi_process_event(&acpiinfo)) {
++    acpi_freebsd_read(&apminfo, &acpiinfo);
++    pixmap_timeout(data);
++  }
++
++  return TRUE;
++}
++
+ void
+ apm_readinfo (PanelApplet *applet, ProgressData * battstat)
+ {
+@@ -247,13 +268,22 @@
+   int fd;
+   if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
+ 
+-  fd = open(APMDEVICE, O_RDONLY);
+-  if (fd == -1) cleanup (applet, 1);
++  if (using_acpi) {
++    if (acpi_count <= 0) {
++      acpi_count = 30;
++      acpi_freebsd_read(&apminfo, &acpiinfo);
++    }
++    acpi_count--;
++  }
++  else {
++    fd = open(APMDEVICE, O_RDONLY);
++    if (fd == -1) cleanup (applet, 1);
+ 
+-  if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
+-    err(1, "ioctl(APMIO_GETINFO)");
++    if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
++      err(1, "ioctl(APMIO_GETINFO)");
+ 
+-  close(fd);
++    close(fd);
++  }
+ }
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ void
+@@ -361,7 +391,7 @@
+ 
+ #ifdef __FreeBSD__
+ 	acline_status = apminfo.ai_acline ? 1 : 0;
+-	time = apminfo.ai_batt_time;
++	time = (int) (apminfo.ai_batt_time / 60);
+ 	batt_life = apminfo.ai_batt_life;
+ #elif defined (__NetBSD__) || defined(__OpenBSD__)
+ 	acline_status = apminfo.ac_state ? 1 : 0;
+@@ -375,8 +405,10 @@
+ 
+ 	if (batt_life > 100) batt_life = 100;
+ 
+-	hours = time / 60;
+-	mins = time % 60;
++	if (time >= 0) {
++		hours = time / 60;
++		mins = time % 60;
++	}
+ 
+ 	if (acline_status && batt_life == 100)
+ 		return g_strdup_printf (_("Battery charged (%d%%)"), batt_life);
+@@ -912,6 +944,13 @@
+      pdata->acpiwatch = 0;
+      acpi_linux_cleanup(&acpiinfo);
+    }
++#elif defined(__FreeBSD__)
++   if (using_acpi) {
++     if (pdata->acpiwatch != 0)
++       g_source_remove(pdata->acpiwatch);
++     pdata->acpiwatch = 0;
++     acpi_freebsd_cleanup(&acpiinfo);
++   }
+ #endif
+ 
+    if (pdata->suspend_cmd)
+@@ -1052,6 +1091,7 @@
+ 	"Lennart Poettering <lennart@poettering.de> (Linux ACPI support)",
+ 	"Seth Nickell <snickell@stanford.edu> (GNOME2 port)",
+ 	"Davyd Madeley <davyd@ucc.asn.au>",
++	"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)",
+ 	NULL
+    };
+ 
+@@ -1760,11 +1800,18 @@
+       using_acpi = TRUE;
+       acpi_count = 0;
+   }
++#elif defined(__FreeBSD__)
++  if (acpi_freebsd_init(&acpiinfo)) {
++    using_acpi = TRUE;
++    acpi_count = 0;
++  }
++  else
++    using_acpi = FALSE;
+ #endif
+   apm_readinfo (applet, NULL);
+ 
+ #ifdef __FreeBSD__
+-  if(apminfo.ai_status == 0) cleanup (applet, 2);
++  if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2);
+ #endif
+   
+   battstat = g_new0 (ProgressData, 1);
+@@ -1803,6 +1850,10 @@
+     battstat->acpiwatch = g_io_add_watch (acpiinfo.channel,
+         G_IO_IN | G_IO_ERR | G_IO_HUP,
+         acpi_callback, battstat);
++  }
++#elif defined(__FreeBSD__)
++  if (using_acpi) {
++    battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat);
+   }
+ #endif
+ 
diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
new file mode 100644
index 000000000000..ecaea9dab09e
--- /dev/null
+++ b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
@@ -0,0 +1,11 @@
+--- battstat/battstat.schemas.in.orig	Fri Oct  1 16:22:39 2004
++++ battstat/battstat.schemas.in	Fri Oct  1 16:22:46 2004
+@@ -115,7 +115,7 @@
+         <key>/schemas/apps/battstat-applet/prefs/suspend_command</key>
+         <owner>battstat-applet</owner>
+         <type>string</type>
+-        <default>/usr/bin/apm -s</default>
++        <default>/usr/sbin/apm -s</default>
+         <locale name="C">
+ 	  <short>Suspend Command</short>
+           <long>Command to send to suspend the computer</long>
diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
index b7ca26a8262a..f66bc56578d7 100644
--- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c
+++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
@@ -1,6 +1,6 @@
---- wireless/wireless-applet.c.orig	Tue Apr 13 06:39:46 2004
-+++ wireless/wireless-applet.c	Tue Jun 15 01:22:59 2004
-@@ -30,6 +30,15 @@
+--- wireless/wireless-applet.c.orig	Mon Aug 16 04:45:55 2004
++++ wireless/wireless-applet.c	Mon Sep 20 17:17:27 2004
+@@ -30,12 +30,25 @@
  #include <math.h>
  #include <dirent.h>
  
@@ -16,9 +16,7 @@
  #include <gnome.h>
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -37,7 +46,11 @@
- 
- #include <egg-screen-help.h>
+ #include <glade/glade.h>
  
 +#ifdef __FreeBSD__
 +#define CFG_DEVICE "an0"
@@ -28,7 +26,7 @@
  #define CFG_UPDATE_INTERVAL 2
  
  typedef enum {
-@@ -94,6 +107,12 @@
+@@ -92,6 +105,12 @@
  		WirelessApplet *applet);
  static void wireless_applet_about_cb (BonoboUIComponent *uic,
  		WirelessApplet *applet);
@@ -41,8 +39,8 @@
  static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data);
  
  static const BonoboUIVerb wireless_menu_verbs [] = {
-@@ -157,9 +176,11 @@
- 	g_free (tmp);
+@@ -159,9 +178,11 @@
+ 	g_free (tltp);
  
  	/* Update the image */
 +#ifndef __FreeBSD__
@@ -54,7 +52,7 @@
  		state = PIX_BROKEN;
  	else if (percent == 0)
  		state = PIX_NO_LINK;
-@@ -190,6 +211,7 @@
+@@ -192,6 +213,7 @@
  	int percent;
  
  	/* Calculate the percentage based on the link quality */
@@ -62,7 +60,7 @@
  	if (level < 0) {
  		percent = -1;
  	} else {
-@@ -200,6 +222,9 @@
+@@ -202,6 +224,9 @@
  			percent = CLAMP (percent, 0, 100);
  		}
  	}
@@ -72,7 +70,7 @@
  
  	wireless_applet_draw (applet, percent);
  }
-@@ -242,14 +267,147 @@
+@@ -244,14 +269,179 @@
  	}
  }
  
@@ -129,7 +127,39 @@
 +
 +	signal_strength = (long int) (wreq.wi_val[1]);
 +
-+	memcpy(level, &signal_strength, sizeof(level));
++#ifdef WI_RID_READ_APS
++	if (signal_strength <= 0) {
++		/* we fail to get signal strength by usual means, try another way */
++		static time_t last_scan;
++		static long int cached;
++		time_t now = time(NULL);
++		
++		/* XXX: this is long operation, and we will scan station not often then one in 5 secs */
++		if (now > last_scan + 5) {
++			struct wi_apinfo *w;
++			int nstations;
++			
++			bzero((char *)&wreq, sizeof(wreq));
++			wreq.wi_len = WI_MAX_DATALEN;
++			wreq.wi_type = WI_RID_READ_APS;
++
++			(void)wi_getval(applet, device, &wreq);
++		
++			nstations = *(int *)wreq.wi_val;
++			if (nstations > 0) {
++				w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
++				signal_strength = (long int)w->signal;
++			}
++			
++			cached = signal_strength;
++			last_scan = now;
++		} else {
++			signal_strength = cached;
++		}
++	}
++#endif
++
++	memcpy(level, &signal_strength, sizeof( *level ));
 +
 +	return;
 +}
@@ -222,7 +252,7 @@
  	gboolean found = FALSE;
  
  	/* resest list of available wireless devices */
-@@ -257,8 +415,35 @@
+@@ -259,8 +449,37 @@
  	g_list_free (applet->devices);
  	applet->devices = NULL;
  
@@ -245,7 +275,9 @@
 +						found = TRUE;
 +				}
 +		}
-+		else if (g_strncasecmp (device, "wi", 2)==0 || g_strncasecmp (device, "ath", 3)==0) {
++		else if (g_strncasecmp (device, "wi",   2)==0 || 
++			 g_strncasecmp (device, "ath",  3)==0 ||
++			 g_strncasecmp (device, "ndis", 4)==0) {
 +				applet->devices = g_list_prepend (applet->devices, g_strdup (device));
 +				if (g_strcasecmp (applet->device, device)==0) {
 +						get_wi_data (applet, device, &level);
@@ -258,7 +290,7 @@
  		char *ptr;
  
  		fgets (line, 256, applet->file);
-@@ -292,6 +477,7 @@
+@@ -294,6 +513,7 @@
  				found = TRUE;
  			}
  		}
@@ -266,7 +298,7 @@
  	} while (1);
  
  	if (g_list_length (applet->devices)==1) {
-@@ -303,17 +489,23 @@
+@@ -305,17 +525,23 @@
  	}
  
  	/* rewind the /proc/net/wireless file */
@@ -290,23 +322,20 @@
  
  	wireless_applet_read_device_state (applet);
  
-@@ -360,6 +552,7 @@
+@@ -362,10 +588,12 @@
  static void
  start_file_read (WirelessApplet *applet)
  {
 +#ifndef __FreeBSD__
  	applet->file = fopen ("/proc/net/wireless", "rt");
  	if (applet->file == NULL) {
- 		gtk_tooltips_set_tip (applet->tips,
-@@ -368,6 +561,7 @@
- 				NULL);
  		show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
  	}
 +#endif
  }
  
  static void
-@@ -670,8 +864,10 @@
+@@ -668,8 +896,10 @@
  		applet->prefs = NULL;
  	}
  
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 23785f86439c..e235aa2c792a 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,51 +1,6 @@
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
 bin/gswitchit-plugins-capplet
-%%BATTERY%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
-%%BATTERY%%etc/gconf/schemas/battstat.schemas
-%%BATTERY%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/cdplayer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/charpick.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/drivemount.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/geyes.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gkb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gswitchit.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gtik.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gweather.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mailcheck.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mini-commander.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mixer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/modemlights.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/multiload.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/stickynotes.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
 etc/sound/events/mailcheck.soundlist
 include/libgswitchit/gswitchit_plugin.h
@@ -194,6 +149,7 @@ share/gnome/gkb/SE_Swedish.keyprop
 share/gnome/gkb/SE_Swedish_x.keyprop
 share/gnome/gkb/SI_Slovenian.keyprop
 share/gnome/gkb/SI_Slovenian_x.keyprop
+share/gnome/gkb/SK__x.keyprop
 share/gnome/gkb/SR_Dutch.keyprop
 share/gnome/gkb/Slovak.keyprop
 share/gnome/gkb/Slovene.keyprop
@@ -252,7 +208,7 @@ share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gswitchit/gswitchit-plugins.glade
 share/gnome/gswitchit/gswitchit-properties.glade
-share/gnome/gweather/Locations
+share/gnome/gweather/Locations.xml
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/legal.xml
@@ -580,11 +536,6 @@ share/gnome/help/char-palette/it/figures/charpick_chargroup.png
 share/gnome/help/char-palette/it/legal.xml
 share/gnome/help/char-palette/ja/char-palette.xml
 share/gnome/help/char-palette/ja/figures/charpalette_applet.png
-share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/ja/figures/charpick_applet.png
-share/gnome/help/char-palette/ja/figures/charpick_characters.png
-share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
-share/gnome/help/char-palette/ja/figures/mailcheck_applet.png
 share/gnome/help/char-palette/ja/legal.xml
 share/gnome/help/char-palette/ko/char-palette.xml
 share/gnome/help/char-palette/ko/figures/charpalette_applet.png
@@ -818,6 +769,8 @@ share/gnome/help/gkb/zh_HK/legal.xml
 share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
 share/gnome/help/gkb/zh_TW/gkb.xml
 share/gnome/help/gkb/zh_TW/legal.xml
+share/gnome/help/gswitchit/C/gswitchit.xml
+share/gnome/help/gswitchit/C/legal.xml
 share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
@@ -1349,6 +1302,8 @@ share/gnome/omf/gnome-applets/gkb-zh_HK.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gkb-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gswitchit-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-de.omf
@@ -1641,6 +1596,7 @@ share/gnome/pixmaps/gkb/yu.png
 share/gnome/pixmaps/gnome-cpu.png
 share/gnome/pixmaps/gnome-eyes.png
 share/gnome/pixmaps/gnome-mini-commander.png
+share/gnome/pixmaps/gnome-mixer-applet.png
 share/gnome/pixmaps/gswitchit-applet.png
 share/gnome/pixmaps/gswitchit-properties-capplet.png
 share/gnome/pixmaps/mailcheck/eclouds.png
@@ -1651,7 +1607,6 @@ share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
-share/gnome/pixmaps/mixer/gnome-mixer-applet.png
 share/gnome/pixmaps/mixer/volume-max.png
 share/gnome/pixmaps/mixer/volume-medium.png
 share/gnome/pixmaps/mixer/volume-min.png
@@ -1764,6 +1719,7 @@ share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1785,17 +1741,18 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
@@ -2006,6 +1963,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gtik2_applet2/C/figures
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/C
+@dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/gkb/zh_TW/figures
 @dirrm share/gnome/help/gkb/zh_TW
 @dirrm share/gnome/help/gkb/zh_HK/figures
@@ -2285,6 +2244,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 7d0085385bd5..03fa441302e1 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.8
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,12 +20,12 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 157cde1df0e2..fd37f714c120 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a
-SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159
+MD5 (gnome2/gnome-desktop-2.8.1.tar.bz2) = 47f9b9508c4a0349d66fa1138b521794
+SIZE (gnome2/gnome-desktop-2.8.1.tar.bz2) = 1132666
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index f2699e459a3b..a4be6d322f61 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -183,6 +183,7 @@ share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -207,20 +208,21 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/omf/gnome-desktop
-@dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl/eu
+@dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl/eu
+@dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback/eu
+@dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl/eu
+@dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
 @dirrm share/gnome/gnome-about
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 65f532081d2d..064ce43d2107 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.8
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,21 +21,43 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop \
 		libwnck
+WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	gnome-panel.1 gnome-panel-preferences.1
+MAN1=		gnome-panel.1
+GCONF_SCHEMAS=	clock.schemas fish.schemas gnome-panel-screenshot.schemas \
+		panel-compatibility.schemas panel-general.schemas \
+		panel-global.schemas panel-object.schemas \
+		panel-toplevel.schemas window-list.schemas \
+		workspace-switcher.schemas
 
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-eds
+.else
+CONFIGURE_ARGS+=--disable-eds
+.endif
+
+.if ${OSVERSION} < 600006
 post-patch:
-.for po in da.po it.po zh_TW.po
+.for po in da.po it.po zh_CN.po zh_TW.po
 	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
 .endfor
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 0a30f300febf..454689617e2e 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.6.2.tar.bz2) = 41318b24e18f497b4418c7d60aaf33f6
-SIZE (gnome2/gnome-panel-2.6.2.tar.bz2) = 3082567
+MD5 (gnome2/gnome-panel-2.8.1.tar.bz2) = 77aea214467da238170ed10dbc825799
+SIZE (gnome2/gnome-panel-2.8.1.tar.bz2) = 3210138
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index a8e8e95e3e4b..9b385b60a358 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,43 +1,12 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
-bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/clock.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/fish.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-panel-screenshot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-compatibility.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-general.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-global.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-object.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-toplevel.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/window-list.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/workspace-switcher.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
@@ -73,7 +42,6 @@ share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
 share/doc/panel-applet/style.css
 share/doc/panel-applet/up.png
-share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
@@ -322,7 +290,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/panel/panel-properties-dialog.glade
 share/gnome/panel/panel-run-dialog.glade
@@ -355,6 +322,7 @@ share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
@@ -390,6 +358,7 @@ share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ab5ff700a301..094f576055b2 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~marcus/:local \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.6 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.8 \
 		    	marcus/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -24,19 +24,20 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-halt-command=/sbin/shutdown \
 		--with-reboot-command=/sbin/shutdown
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
-	gnome-session-save.1
-MAN5=	default.session.5
+MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
+		session-properties.1 gnome-session-save.1
+MAN5=		default.session.5
+GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash04-12.png
+SPLASH_IMG=	gnome-splash28.png
 
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 47fa01285ba3..8f05e97ece4c 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.6.2.tar.bz2) = 0c80fbb64123cef7f2d7a9b69b0b965e
-SIZE (gnome2/gnome-session-2.6.2.tar.bz2) = 873420
-MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
-SIZE (gnome2/gnome-splash04-12.png) = 75841
+MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98
+SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921
+MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
+SIZE (gnome2/gnome-splash28.png) = 121715
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 60c14531bce0..2b05e8c0027e 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig	Wed May  8 14:36:22 2002
-+++ gnome-session/Makefile.in	Wed May  8 14:36:34 2002
-@@ -129,7 +129,7 @@
+--- gnome-session/Makefile.in.orig	Mon May 31 14:34:48 2004
++++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
+@@ -153,7 +153,7 @@
  
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(DISABLE_DEPRECATED_CFLAGS)				$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DDEFAULTDIR="\"$(defaultdir)\""
+ INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
  
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
new file mode 100644
index 000000000000..7e56843ac733
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_manager.c
@@ -0,0 +1,14 @@
+--- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
++++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
+@@ -1042,9 +1042,10 @@
+ 
+       if (interact_ping_replied)
+ 	{
++	  IceConn ice_conn;
+ 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
+ 	  print_client (client);
+-	  IceConn ice_conn = SmsGetIceConnection (client->connection);
++	  ice_conn = SmsGetIceConnection (client->connection);
+ 	  interact_ping_replied = FALSE;
+ 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
+ 	}
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index ae71556f4a43..6107618a5527 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -4,9 +4,6 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-session.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
 share/gnome/control-center-2.0/capplets/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
@@ -16,9 +13,9 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
@@ -55,6 +52,8 @@ share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
@@ -72,6 +71,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index a6905e02a207..303ea7a5d354 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.8
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,9 +20,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui vte
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-terminal.schemas
+
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 53e2076ddaee..97c12e3c7f68 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.6.1.tar.bz2) = 43e04260410e66e767a4b247d0af8b46
-SIZE (gnome2/gnome-terminal-2.6.1.tar.bz2) = 1999378
+MD5 (gnome2/gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672
+SIZE (gnome2/gnome-terminal-2.8.0.tar.bz2) = 2195403
diff --git a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c b/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c
deleted file mode 100644
index 57c197bee543..000000000000
--- a/x11/gnome-terminal/files/patch-src-eggcellrendererkeys.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/eggcellrendererkeys.c.orig	Thu Jul 29 23:34:48 2004
-+++ src/eggcellrendererkeys.c	Thu Jul 29 23:35:36 2004
-@@ -584,7 +584,7 @@
- void
- egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                         guint                keyval,
--                                        GdkModifierType      mask)
-+                                        EggVirtualModifierType mask)
- {
-   char *text;
-   gboolean changed;
-@@ -626,7 +626,7 @@
- void
- egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                         guint               *keyval,
--                                        GdkModifierType     *mask)
-+                                        EggVirtualModifierType *mask)
- {
-   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
- 
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 12dd4ed33afc..2ef85466b931 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-terminal
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-terminal.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
@@ -90,6 +87,7 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/bn/LC_MESSAGES/gnome-terminal.mo
+share/locale/bs/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/cs/LC_MESSAGES/gnome-terminal.mo
 share/locale/cy/LC_MESSAGES/gnome-terminal.mo
@@ -100,6 +98,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/eu/LC_MESSAGES/gnome-terminal.mo
 share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
@@ -120,6 +119,7 @@ share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nb/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/nn/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index e6a2a83ba130..160b270c9c7b 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-fifth-toe
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -28,14 +28,13 @@ RUN_DEPENDS=	pan:${PORTSDIR}/news/pan2 \
 		${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \
 		bluefish:${PORTSDIR}/www/bluefish-devel \
 		gossip:${PORTSDIR}/net/gossip \
-		inkscape:${PORTSDIR}/graphics/inkscape \
 		straw:${PORTSDIR}/net/straw \
 		liferea:${PORTSDIR}/net/liferea \
 		gnotime:${PORTSDIR}/deskutils/gnotime \
 		sound-juicer:${PORTSDIR}/audio/sound-juicer \
 		rhythmbox:${PORTSDIR}/audio/rhythmbox \
-		network-admin:${PORTSDIR}/sysutils/gnomesystemtools \
-		jamboree:${PORTSDIR}/audio/jamboree
+		jamboree:${PORTSDIR}/audio/jamboree \
+		${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data
 
 .if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD)
 RUN_DEPENDS+=	totem:${PORTSDIR}/multimedia/totem
@@ -43,6 +42,12 @@ RUN_DEPENDS+=	totem:${PORTSDIR}/multimedia/totem
 
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+RUN_DEPENDS+=	inkscape:${PORTSDIR}/graphics/inkscape
+.endif
+
 do-install:	# empty
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 6f21feaef3b2..d0a5cd8fc05c 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-lite
diff --git a/x11/gnome2-lite/pkg-message b/x11/gnome2-lite/pkg-message
index 1ef09fe3d3c0..0b0e5564e4be 100644
--- a/x11/gnome2-lite/pkg-message
+++ b/x11/gnome2-lite/pkg-message
@@ -2,7 +2,7 @@
 
 The GNOME 2 desktop Lite edition has been successfully installed.
 
-The Lite edition does not include all the components of the standard 
+The Lite edition does not include all the components of the standard
 GNOME 2 desktop as detailed at http://www.gnome.org.  If you wish to
 install the full desktop, you can remove this port, and install the
 x11/gnome2 port or package.  That can be best accomplished using
@@ -12,7 +12,7 @@ the following commands:
 # cd /usr/ports/x11/gnome2
 # make install clean
 
-Alternatively, you can install additional GNOME components individually 
+Alternatively, you can install additional GNOME components individually
 using either their ports or packages.
 
 For more help on using GNOME on FreeBSD, please see the FreeBSD GNOME project
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 369b4a0b4e8d..c37a59cd35ec 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome2-power-tools
-PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -22,11 +21,10 @@ RUN_DEPENDS=	${X11BASE}/lib/epiphany/extensions/libgesturesextension.so:${PORTSD
 		${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
 		${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \
 		splashsetter:${PORTSDIR}/deskutils/splashsetter \
-		gnome-nettool:${PORTSDIR}/net/gnomenettool \
 		gdesklets:${PORTSDIR}/deskutils/gdesklets \
-		vino-session:${PORTSDIR}/net/vino \
 		cog:${PORTSDIR}/sysutils/cog \
 		gnome-blog-poster:${PORTSDIR}/deskutils/gnomeblog \
+		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
 		gnomesu:${PORTSDIR}/sysutils/gnomesu
 
 NO_BUILD=	yes
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 7b335621179a..df554fa020b8 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -47,7 +47,13 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
 		${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
-		dasher:${PORTSDIR}/accessibility/dasher
+		dasher:${PORTSDIR}/accessibility/dasher \
+		evolution-2.0:${PORTSDIR}/mail/evolution \
+		${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
+		network-admin:${PORTSDIR}/sysutils/gnomesystemtools \
+		gnome-nettool:${PORTSDIR}/net/gnomenettool \
+		vino-session:${PORTSDIR}/net/vino \
+		ximian-connector-setup-2.0:${PORTSDIR}/mail/ximian-connector
 
 NO_BUILD=	yes
 
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 28b69fcfec0c..4d86584d6f0b 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.6.2.1
-PORTREVISION=	4
+PORTVERSION=	2.8.1.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.8
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -29,7 +28,15 @@ USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack gnomepanel \
 		gstreamerplugins gail
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		FREEBSD_SYS=${FREEBSD_SYS}
+
+GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \
+		gswitchit.schemas gtik.schemas gweather.schemas \
+		mailcheck.schemas mini-commander.schemas mixer.schemas \
+		modemlights.schemas multiload.schemas stickynotes.schemas
+
+FREEBSD_SYS?=	/usr/src/sys
 
 .include <bsd.port.pre.mk>
 
@@ -37,7 +44,20 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC"
 PLIST_SUB=	BATTERY="@comment "
 .else
+GCONF_SCHEMAS+=	battstat.schemas
 PLIST_SUB=	BATTERY=""
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "              W  A  R  N  I  N  G"
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel  *"
+	@${ECHO_MSG} "* sources installed. If your kernel sources         *"
+	@${ECHO_MSG} "* are somewhere other than /usr/src/sys, you        *"
+	@${ECHO_MSG} "* may set the FREEBSD_SYS variable to the           *"
+	@${ECHO_MSG} "* correct path.                                     *"
+	@${ECHO_MSG} "*****************************************************"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index fa0dd052696d..2f9ff553586d 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.6.2.1.tar.bz2) = d29dc21035db8b93671058d7f1ac4aaa
-SIZE (gnome2/gnome-applets-2.6.2.1.tar.bz2) = 5478737
+MD5 (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 897d6f7aed1717c5be9d5707c0407604
+SIZE (gnome2/gnome-applets-2.8.1.1.tar.bz2) = 6405066
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 73b0823ce82e..0186faf0ee14 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Sun Feb 22 19:22:49 2004
-+++ configure	Sun Feb 22 19:24:33 2004
-@@ -22912,6 +22912,7 @@
+--- configure.orig	Sat Oct 16 15:45:26 2004
++++ configure	Sat Oct 16 15:47:04 2004
+@@ -463,7 +463,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE ACPIINC BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -24323,6 +24323,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -8,16 +17,29 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -23034,7 +23035,7 @@
- 
- 	;;
-   # list of supported OS cores that do not use libapm
--  *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+  i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
- 	;;
-   *)
- 	echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-@@ -24905,14 +24906,14 @@
+@@ -24384,6 +24385,7 @@
+ 
+ HAVE_LIBAPM=no
+ NEED_LIBAPM=no
++ACPIINC=
+ build_battstat_applet=no
+ 
+ if test x$disable_battstat = xno; then
+@@ -24535,7 +24537,12 @@
+ 
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++           if [ -n "${FREEBSD_SYS}" ]; then
++	       ACPIINC="-I${FREEBSD_SYS}"
++	   else
++               ACPIINC="-I/usr/src/sys"
++	   fi
+ 	   ;;
+        *)
+ 	   echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -26615,14 +26622,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
  cat >>confdefs.h <<_ACEOF
@@ -34,3 +56,11 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
+@@ -27773,6 +27780,7 @@
+ s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t
+ s,@CDROM_HOST@,$CDROM_HOST,;t t
+ s,@CDROM_LIBS@,$CDROM_LIBS,;t t
++s,@ACPIINC@,$ACPIINC,;t t
+ s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t
+ s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t
+ s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t
diff --git a/x11/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi
new file mode 100644
index 000000000000..4025a9a360f1
--- /dev/null
+++ b/x11/gnomeapplets2/files/patch-battstat-acpi
@@ -0,0 +1,459 @@
+--- battstat/Makefile.in.orig	Mon Sep 27 18:39:44 2004
++++ battstat/Makefile.in	Mon Sep 27 18:40:56 2004
+@@ -173,6 +173,8 @@
+ pixmapsdir = $(datadir)/pixmaps
+ pixmaps_DATA = battstat.png
+ 
++ACPIINC = @ACPIINC@
++
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a
+ @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm
+ @NEED_LIBAPM_FALSE@APMLIB = 
+@@ -191,6 +193,7 @@
+ 	$(GNOME_APPLETS_CFLAGS) \
+ 	$(LIBGLADE_CFLAGS) \
+ 	$(APMINC) \
++	$(ACPIINC) \
+ 	-DDATA_DIR=\"$(datadir)\" \
+ 	-DGLADE_DIR=\"$(gladedir)\" \
+ 	-DG_LOG_DOMAIN=\"battstat_applet\" \
+@@ -205,7 +208,9 @@
+ 	properties.c \
+ 	battstat_applet.c \
+ 	acpi-linux.c \
+-	acpi-linux.h
++	acpi-linux.h \
++	acpi-freebsd.c \
++	acpi-freebsd.h
+ 
+ 
+ battstat_applet_2_LDADD = \
+@@ -242,7 +247,7 @@
+ PROGRAMS = $(libexec_PROGRAMS)
+ 
+ am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
+-	battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
++	battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT)
+ battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@	apmlib/libapm.a
+@@ -259,6 +264,7 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/acpi-freebsd.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/battstat_applet.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/properties.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -330,6 +336,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@
+ 
+--- battstat/acpi-freebsd.h.orig	Mon Sep 27 18:39:30 2004
++++ battstat/acpi-freebsd.h	Mon Sep 27 18:39:30 2004
+@@ -0,0 +1,45 @@
++/*
++ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __ACPI_FREEBSD_H__
++#define __ACPI_FREEBSD_H__
++
++#define ACPIDEV "/dev/acpi"
++
++#define BATT_MIN 0
++#define BATT_MAX 64
++
++#define ACPI_ACLINE "hw.acpi.acline"
++#define ACPI_TIME "hw.acpi.battery.time"
++#define ACPI_LIFE "hw.acpi.battery.life"
++#define ACPI_STATE "hw.acpi.battery.state"
++
++struct acpi_info {
++  gboolean  ac_online;
++  int       acpifd;
++  int       max_capacity;
++  int       low_capacity;
++  int       critical_capacity;
++};
++
++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
++gboolean acpi_process_event(struct acpi_info * acpiinfo);
++gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
++void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
++
++#endif /* __ACPI_FREEBSD_H__ */
+--- battstat/acpi-freebsd.c.orig	Tue Sep 28 16:55:52 2004
++++ battstat/acpi-freebsd.c	Tue Sep 28 17:00:32 2004
+@@ -0,0 +1,213 @@
++/* battstat        A GNOME battery meter for laptops.
++ * Copyright (C) 2000 by J�rgen Pehrson <jp@spektr.eu.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
++ *
++ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $
++ */
++
++/*
++ * ACPI battery functions for FreeBSD >= 5.2.
++ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#ifdef __FreeBSD__
++
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/ioctl.h>
++#include <machine/apm_bios.h>
++#include <stdlib.h>
++#include <errno.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <glib.h>
++
++#include <dev/acpica/acpiio.h>
++#include <contrib/dev/acpica/acpi.h>
++
++#include "acpi-freebsd.h"
++
++static gboolean
++update_ac_info(struct acpi_info * acpiinfo)
++{
++  int acline;
++  size_t len = sizeof(acline);
++
++  acpiinfo->ac_online = FALSE;
++
++  if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  acpiinfo->ac_online = acline ? TRUE : FALSE;
++
++  return TRUE;
++}
++
++static gboolean
++update_battery_info(struct acpi_info * acpiinfo)
++{
++  union acpi_battery_ioctl_arg battio;
++  int i;
++
++  /* We really don't have to do this here.  All of the relevant battery
++   * info can be obtained through sysctl.  However, one day, the rate
++   * may be useful to get time left to full charge.
++   */
++
++  for(i = BATT_MIN; i < BATT_MAX; i++) {
++    battio.unit = i;
++    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) {
++      continue;
++    }
++
++    acpiinfo->max_capacity += battio.bif.lfcap;
++    acpiinfo->low_capacity += battio.bif.wcap;
++    acpiinfo->critical_capacity += battio.bif.lcap;
++  }
++
++  return TRUE;
++}
++
++gboolean
++acpi_freebsd_init(struct acpi_info * acpiinfo)
++{
++  int acpi_fd;
++
++  g_assert(acpiinfo);
++
++  acpi_fd = open(ACPIDEV, O_RDONLY);
++  if (acpi_fd >= 0) {
++    acpiinfo->acpifd = acpi_fd;
++  }
++  else {
++    acpiinfo->acpifd = -1;
++    return FALSE;
++  }
++
++  update_battery_info(acpiinfo);
++  update_ac_info(acpiinfo);
++
++  return TRUE;
++}
++
++void
++acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
++{
++  g_assert(acpiinfo);
++
++  if (acpiinfo->acpifd >= 0) {
++    close(acpiinfo->acpifd);
++    acpiinfo->acpifd = -1;
++  }
++}
++
++/* XXX This is a hack since user-land applications can't get ACPI events yet.
++ * Devd provides this (or supposedly provides this), but you need to be
++ * root to access devd.
++ */
++gboolean
++acpi_process_event(struct acpi_info * acpiinfo)
++{
++  g_assert(acpiinfo);
++
++  update_ac_info(acpiinfo);
++  update_battery_info(acpiinfo);
++
++  return TRUE;
++}
++
++gboolean
++acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo)
++{
++  int time;
++  int life;
++  int acline;
++  int state;
++  size_t len;
++  int rate;
++  int remain;
++  union acpi_battery_ioctl_arg battio;
++  gboolean charging;
++  int i;
++
++  g_assert(acpiinfo);
++
++  charging = FALSE;
++
++  for(i = BATT_MIN; i < BATT_MAX; i++) {
++    battio.unit = i;
++    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) {
++      continue;
++    }
++
++    remain += battio.bst.cap;
++    rate += battio.bst.rate;
++  }
++
++  len = sizeof(time);
++  if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  len = sizeof(life);
++  if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  len = sizeof(state);
++  if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) {
++    return FALSE;
++  }
++
++  apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0;
++  if (state & ACPI_BATT_STAT_CHARGING) {
++    apminfo->ai_batt_stat = 3;
++    charging = TRUE;
++  }
++  else if (state & ACPI_BATT_STAT_CRITICAL) {
++    /* Add a special check here since FreeBSD's ACPI interface will tell us
++     * when the battery is critical.
++     */
++    apminfo->ai_batt_stat = 2;
++  }
++  else {
++    apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0;
++  }
++  apminfo->ai_batt_life = life;
++  if (!charging) {
++    apminfo->ai_batt_time = time * 60;
++  }
++  else if (charging && rate > 0) {
++    apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60);
++  }
++  else
++    /* This multiplication is a hack to make sure the -1 survives so the applet
++     * can process it.  Battstat wants the remaining time in minutes, but
++     * ai_batt_time is in seconds.  In order to make both ACPI and APM work
++     * with the fewest amount of hacks, we will just assume everything is
++     * in seconds.
++     */
++    apminfo->ai_batt_time = -1 * 60;
++
++  return TRUE;
++}
++#endif
+--- battstat/battstat_applet.c.orig	Mon Sep 13 04:33:31 2004
++++ battstat/battstat_applet.c	Fri Oct  1 16:46:01 2004
+@@ -62,6 +62,9 @@
+ #ifdef __linux__
+ #include "acpi-linux.h"
+ #endif
++#ifdef __FreeBSD__
++#include "acpi-freebsd.h"
++#endif
+ 
+ #ifndef gettext_noop
+ #define gettext_noop(String) (String)
+@@ -237,6 +240,24 @@
+ #endif
+ 
+ #ifdef __FreeBSD__
++struct acpi_info acpiinfo;
++gboolean using_acpi;
++int acpi_count;
++
++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
++
++gboolean acpi_callback (gpointer data)
++{
++  ProgressData * battstat = (ProgressData *) data;
++
++  if (acpi_process_event(&acpiinfo)) {
++    acpi_freebsd_read(&apminfo, &acpiinfo);
++    pixmap_timeout(data);
++  }
++
++  return TRUE;
++}
++
+ void
+ apm_readinfo (PanelApplet *applet, ProgressData * battstat)
+ {
+@@ -247,13 +268,22 @@
+   int fd;
+   if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
+ 
+-  fd = open(APMDEVICE, O_RDONLY);
+-  if (fd == -1) cleanup (applet, 1);
++  if (using_acpi) {
++    if (acpi_count <= 0) {
++      acpi_count = 30;
++      acpi_freebsd_read(&apminfo, &acpiinfo);
++    }
++    acpi_count--;
++  }
++  else {
++    fd = open(APMDEVICE, O_RDONLY);
++    if (fd == -1) cleanup (applet, 1);
+ 
+-  if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
+-    err(1, "ioctl(APMIO_GETINFO)");
++    if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
++      err(1, "ioctl(APMIO_GETINFO)");
+ 
+-  close(fd);
++    close(fd);
++  }
+ }
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ void
+@@ -361,7 +391,7 @@
+ 
+ #ifdef __FreeBSD__
+ 	acline_status = apminfo.ai_acline ? 1 : 0;
+-	time = apminfo.ai_batt_time;
++	time = (int) (apminfo.ai_batt_time / 60);
+ 	batt_life = apminfo.ai_batt_life;
+ #elif defined (__NetBSD__) || defined(__OpenBSD__)
+ 	acline_status = apminfo.ac_state ? 1 : 0;
+@@ -375,8 +405,10 @@
+ 
+ 	if (batt_life > 100) batt_life = 100;
+ 
+-	hours = time / 60;
+-	mins = time % 60;
++	if (time >= 0) {
++		hours = time / 60;
++		mins = time % 60;
++	}
+ 
+ 	if (acline_status && batt_life == 100)
+ 		return g_strdup_printf (_("Battery charged (%d%%)"), batt_life);
+@@ -912,6 +944,13 @@
+      pdata->acpiwatch = 0;
+      acpi_linux_cleanup(&acpiinfo);
+    }
++#elif defined(__FreeBSD__)
++   if (using_acpi) {
++     if (pdata->acpiwatch != 0)
++       g_source_remove(pdata->acpiwatch);
++     pdata->acpiwatch = 0;
++     acpi_freebsd_cleanup(&acpiinfo);
++   }
+ #endif
+ 
+    if (pdata->suspend_cmd)
+@@ -1052,6 +1091,7 @@
+ 	"Lennart Poettering <lennart@poettering.de> (Linux ACPI support)",
+ 	"Seth Nickell <snickell@stanford.edu> (GNOME2 port)",
+ 	"Davyd Madeley <davyd@ucc.asn.au>",
++	"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)",
+ 	NULL
+    };
+ 
+@@ -1760,11 +1800,18 @@
+       using_acpi = TRUE;
+       acpi_count = 0;
+   }
++#elif defined(__FreeBSD__)
++  if (acpi_freebsd_init(&acpiinfo)) {
++    using_acpi = TRUE;
++    acpi_count = 0;
++  }
++  else
++    using_acpi = FALSE;
+ #endif
+   apm_readinfo (applet, NULL);
+ 
+ #ifdef __FreeBSD__
+-  if(apminfo.ai_status == 0) cleanup (applet, 2);
++  if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2);
+ #endif
+   
+   battstat = g_new0 (ProgressData, 1);
+@@ -1803,6 +1850,10 @@
+     battstat->acpiwatch = g_io_add_watch (acpiinfo.channel,
+         G_IO_IN | G_IO_ERR | G_IO_HUP,
+         acpi_callback, battstat);
++  }
++#elif defined(__FreeBSD__)
++  if (using_acpi) {
++    battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat);
+   }
+ #endif
+ 
diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
new file mode 100644
index 000000000000..ecaea9dab09e
--- /dev/null
+++ b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
@@ -0,0 +1,11 @@
+--- battstat/battstat.schemas.in.orig	Fri Oct  1 16:22:39 2004
++++ battstat/battstat.schemas.in	Fri Oct  1 16:22:46 2004
+@@ -115,7 +115,7 @@
+         <key>/schemas/apps/battstat-applet/prefs/suspend_command</key>
+         <owner>battstat-applet</owner>
+         <type>string</type>
+-        <default>/usr/bin/apm -s</default>
++        <default>/usr/sbin/apm -s</default>
+         <locale name="C">
+ 	  <short>Suspend Command</short>
+           <long>Command to send to suspend the computer</long>
diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
index b7ca26a8262a..f66bc56578d7 100644
--- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
+++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
@@ -1,6 +1,6 @@
---- wireless/wireless-applet.c.orig	Tue Apr 13 06:39:46 2004
-+++ wireless/wireless-applet.c	Tue Jun 15 01:22:59 2004
-@@ -30,6 +30,15 @@
+--- wireless/wireless-applet.c.orig	Mon Aug 16 04:45:55 2004
++++ wireless/wireless-applet.c	Mon Sep 20 17:17:27 2004
+@@ -30,12 +30,25 @@
  #include <math.h>
  #include <dirent.h>
  
@@ -16,9 +16,7 @@
  #include <gnome.h>
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -37,7 +46,11 @@
- 
- #include <egg-screen-help.h>
+ #include <glade/glade.h>
  
 +#ifdef __FreeBSD__
 +#define CFG_DEVICE "an0"
@@ -28,7 +26,7 @@
  #define CFG_UPDATE_INTERVAL 2
  
  typedef enum {
-@@ -94,6 +107,12 @@
+@@ -92,6 +105,12 @@
  		WirelessApplet *applet);
  static void wireless_applet_about_cb (BonoboUIComponent *uic,
  		WirelessApplet *applet);
@@ -41,8 +39,8 @@
  static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data);
  
  static const BonoboUIVerb wireless_menu_verbs [] = {
-@@ -157,9 +176,11 @@
- 	g_free (tmp);
+@@ -159,9 +178,11 @@
+ 	g_free (tltp);
  
  	/* Update the image */
 +#ifndef __FreeBSD__
@@ -54,7 +52,7 @@
  		state = PIX_BROKEN;
  	else if (percent == 0)
  		state = PIX_NO_LINK;
-@@ -190,6 +211,7 @@
+@@ -192,6 +213,7 @@
  	int percent;
  
  	/* Calculate the percentage based on the link quality */
@@ -62,7 +60,7 @@
  	if (level < 0) {
  		percent = -1;
  	} else {
-@@ -200,6 +222,9 @@
+@@ -202,6 +224,9 @@
  			percent = CLAMP (percent, 0, 100);
  		}
  	}
@@ -72,7 +70,7 @@
  
  	wireless_applet_draw (applet, percent);
  }
-@@ -242,14 +267,147 @@
+@@ -244,14 +269,179 @@
  	}
  }
  
@@ -129,7 +127,39 @@
 +
 +	signal_strength = (long int) (wreq.wi_val[1]);
 +
-+	memcpy(level, &signal_strength, sizeof(level));
++#ifdef WI_RID_READ_APS
++	if (signal_strength <= 0) {
++		/* we fail to get signal strength by usual means, try another way */
++		static time_t last_scan;
++		static long int cached;
++		time_t now = time(NULL);
++		
++		/* XXX: this is long operation, and we will scan station not often then one in 5 secs */
++		if (now > last_scan + 5) {
++			struct wi_apinfo *w;
++			int nstations;
++			
++			bzero((char *)&wreq, sizeof(wreq));
++			wreq.wi_len = WI_MAX_DATALEN;
++			wreq.wi_type = WI_RID_READ_APS;
++
++			(void)wi_getval(applet, device, &wreq);
++		
++			nstations = *(int *)wreq.wi_val;
++			if (nstations > 0) {
++				w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
++				signal_strength = (long int)w->signal;
++			}
++			
++			cached = signal_strength;
++			last_scan = now;
++		} else {
++			signal_strength = cached;
++		}
++	}
++#endif
++
++	memcpy(level, &signal_strength, sizeof( *level ));
 +
 +	return;
 +}
@@ -222,7 +252,7 @@
  	gboolean found = FALSE;
  
  	/* resest list of available wireless devices */
-@@ -257,8 +415,35 @@
+@@ -259,8 +449,37 @@
  	g_list_free (applet->devices);
  	applet->devices = NULL;
  
@@ -245,7 +275,9 @@
 +						found = TRUE;
 +				}
 +		}
-+		else if (g_strncasecmp (device, "wi", 2)==0 || g_strncasecmp (device, "ath", 3)==0) {
++		else if (g_strncasecmp (device, "wi",   2)==0 || 
++			 g_strncasecmp (device, "ath",  3)==0 ||
++			 g_strncasecmp (device, "ndis", 4)==0) {
 +				applet->devices = g_list_prepend (applet->devices, g_strdup (device));
 +				if (g_strcasecmp (applet->device, device)==0) {
 +						get_wi_data (applet, device, &level);
@@ -258,7 +290,7 @@
  		char *ptr;
  
  		fgets (line, 256, applet->file);
-@@ -292,6 +477,7 @@
+@@ -294,6 +513,7 @@
  				found = TRUE;
  			}
  		}
@@ -266,7 +298,7 @@
  	} while (1);
  
  	if (g_list_length (applet->devices)==1) {
-@@ -303,17 +489,23 @@
+@@ -305,17 +525,23 @@
  	}
  
  	/* rewind the /proc/net/wireless file */
@@ -290,23 +322,20 @@
  
  	wireless_applet_read_device_state (applet);
  
-@@ -360,6 +552,7 @@
+@@ -362,10 +588,12 @@
  static void
  start_file_read (WirelessApplet *applet)
  {
 +#ifndef __FreeBSD__
  	applet->file = fopen ("/proc/net/wireless", "rt");
  	if (applet->file == NULL) {
- 		gtk_tooltips_set_tip (applet->tips,
-@@ -368,6 +561,7 @@
- 				NULL);
  		show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
  	}
 +#endif
  }
  
  static void
-@@ -670,8 +864,10 @@
+@@ -668,8 +896,10 @@
  		applet->prefs = NULL;
  	}
  
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 23785f86439c..e235aa2c792a 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1,51 +1,6 @@
 bin/gkb_xmmap
 bin/gnome-keyboard-layout
 bin/gswitchit-plugins-capplet
-%%BATTERY%%@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
-%%BATTERY%%etc/gconf/schemas/battstat.schemas
-%%BATTERY%%@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battstat.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/cdplayer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/cdplayer.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/charpick.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/charpick.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/drivemount.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/drivemount.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/geyes.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/geyes.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gkb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gkb.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gswitchit.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gswitchit.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gtik.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtik.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gweather.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gweather.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mailcheck.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mailcheck.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mini-commander.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mini-commander.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mixer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mixer.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/modemlights.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/modemlights.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/multiload.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/multiload.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/stickynotes.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/stickynotes.schemas > /dev/null || /usr/bin/true
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
 etc/sound/events/mailcheck.soundlist
 include/libgswitchit/gswitchit_plugin.h
@@ -194,6 +149,7 @@ share/gnome/gkb/SE_Swedish.keyprop
 share/gnome/gkb/SE_Swedish_x.keyprop
 share/gnome/gkb/SI_Slovenian.keyprop
 share/gnome/gkb/SI_Slovenian_x.keyprop
+share/gnome/gkb/SK__x.keyprop
 share/gnome/gkb/SR_Dutch.keyprop
 share/gnome/gkb/Slovak.keyprop
 share/gnome/gkb/Slovene.keyprop
@@ -252,7 +208,7 @@ share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
 share/gnome/gswitchit/gswitchit-plugins.glade
 share/gnome/gswitchit/gswitchit-properties.glade
-share/gnome/gweather/Locations
+share/gnome/gweather/Locations.xml
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/legal.xml
@@ -580,11 +536,6 @@ share/gnome/help/char-palette/it/figures/charpick_chargroup.png
 share/gnome/help/char-palette/it/legal.xml
 share/gnome/help/char-palette/ja/char-palette.xml
 share/gnome/help/char-palette/ja/figures/charpalette_applet.png
-share/gnome/help/char-palette/ja/figures/charpalette_chargroup.png
-share/gnome/help/char-palette/ja/figures/charpick_applet.png
-share/gnome/help/char-palette/ja/figures/charpick_characters.png
-share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
-share/gnome/help/char-palette/ja/figures/mailcheck_applet.png
 share/gnome/help/char-palette/ja/legal.xml
 share/gnome/help/char-palette/ko/char-palette.xml
 share/gnome/help/char-palette/ko/figures/charpalette_applet.png
@@ -818,6 +769,8 @@ share/gnome/help/gkb/zh_HK/legal.xml
 share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
 share/gnome/help/gkb/zh_TW/gkb.xml
 share/gnome/help/gkb/zh_TW/legal.xml
+share/gnome/help/gswitchit/C/gswitchit.xml
+share/gnome/help/gswitchit/C/legal.xml
 share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
@@ -1349,6 +1302,8 @@ share/gnome/omf/gnome-applets/gkb-zh_HK.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gkb-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/gswitchit-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/gtik2_applet2-de.omf
@@ -1641,6 +1596,7 @@ share/gnome/pixmaps/gkb/yu.png
 share/gnome/pixmaps/gnome-cpu.png
 share/gnome/pixmaps/gnome-eyes.png
 share/gnome/pixmaps/gnome-mini-commander.png
+share/gnome/pixmaps/gnome-mixer-applet.png
 share/gnome/pixmaps/gswitchit-applet.png
 share/gnome/pixmaps/gswitchit-properties-capplet.png
 share/gnome/pixmaps/mailcheck/eclouds.png
@@ -1651,7 +1607,6 @@ share/gnome/pixmaps/mailcheck/email.png
 share/gnome/pixmaps/mailcheck/tux-anim.png
 share/gnome/pixmaps/mini-commander/browser-mini.xpm
 share/gnome/pixmaps/mini-commander/history-mini.xpm
-share/gnome/pixmaps/mixer/gnome-mixer-applet.png
 share/gnome/pixmaps/mixer/volume-max.png
 share/gnome/pixmaps/mixer/volume-medium.png
 share/gnome/pixmaps/mixer/volume-min.png
@@ -1764,6 +1719,7 @@ share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1785,17 +1741,18 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/mi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
@@ -2006,6 +1963,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gtik2_applet2/C/figures
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/C
+@dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/gkb/zh_TW/figures
 @dirrm share/gnome/help/gkb/zh_TW
 @dirrm share/gnome/help/gkb/zh_HK/figures
@@ -2285,6 +2244,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_HK.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gswitchit-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 7d0085385bd5..03fa441302e1 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.8
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,12 +20,12 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--with-kde-datadir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 157cde1df0e2..fd37f714c120 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a
-SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159
+MD5 (gnome2/gnome-desktop-2.8.1.tar.bz2) = 47f9b9508c4a0349d66fa1138b521794
+SIZE (gnome2/gnome-desktop-2.8.1.tar.bz2) = 1132666
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index f2699e459a3b..a4be6d322f61 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -183,6 +183,7 @@ share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -207,20 +208,21 @@ share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/omf/gnome-desktop
-@dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl/eu
+@dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl/eu
+@dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback/eu
+@dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl/eu
+@dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
 @dirrm share/gnome/gnome-about
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 65f532081d2d..064ce43d2107 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.8
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,21 +21,43 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop \
 		libwnck
+WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-kde-datadir=${LOCALBASE}/share \
 		--with-kde-docdir=${LOCALBASE}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	gnome-panel.1 gnome-panel-preferences.1
+MAN1=		gnome-panel.1
+GCONF_SCHEMAS=	clock.schemas fish.schemas gnome-panel-screenshot.schemas \
+		panel-compatibility.schemas panel-general.schemas \
+		panel-global.schemas panel-object.schemas \
+		panel-toplevel.schemas window-list.schemas \
+		workspace-switcher.schemas
 
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-eds
+.else
+CONFIGURE_ARGS+=--disable-eds
+.endif
+
+.if ${OSVERSION} < 600006
 post-patch:
-.for po in da.po it.po zh_TW.po
+.for po in da.po it.po zh_CN.po zh_TW.po
 	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
 .endfor
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 0a30f300febf..454689617e2e 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.6.2.tar.bz2) = 41318b24e18f497b4418c7d60aaf33f6
-SIZE (gnome2/gnome-panel-2.6.2.tar.bz2) = 3082567
+MD5 (gnome2/gnome-panel-2.8.1.tar.bz2) = 77aea214467da238170ed10dbc825799
+SIZE (gnome2/gnome-panel-2.8.1.tar.bz2) = 3210138
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index a8e8e95e3e4b..9b385b60a358 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -1,43 +1,12 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
-bin/gnome-panel-preferences
 bin/gnome-panel-screenshot
 bin/panel-test-applets
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/clock.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/clock.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/fish.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fish.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-panel-screenshot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-panel-screenshot.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-compatibility.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-compatibility.schemas > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-general.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-general.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-global.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-global.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-object.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-object.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/panel-toplevel.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/panel-toplevel.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/window-list.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/window-list.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/workspace-switcher.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/workspace-switcher.schemas > /dev/null || /usr/bin/true
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
@@ -73,7 +42,6 @@ share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
 share/doc/panel-applet/style.css
 share/doc/panel-applet/up.png
-share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
@@ -322,7 +290,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/panel/panel-properties-dialog.glade
 share/gnome/panel/panel-run-dialog.glade
@@ -355,6 +322,7 @@ share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/bs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
@@ -390,6 +358,7 @@ share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index ab5ff700a301..094f576055b2 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://people.FreeBSD.org/~marcus/:local \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.6 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.8 \
 		    	marcus/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -24,19 +24,20 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-halt-command=/sbin/shutdown \
 		--with-reboot-command=/sbin/shutdown
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
-	gnome-session-save.1
-MAN5=	default.session.5
+MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
+		session-properties.1 gnome-session-save.1
+MAN5=		default.session.5
+GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash04-12.png
+SPLASH_IMG=	gnome-splash28.png
 
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 47fa01285ba3..8f05e97ece4c 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.6.2.tar.bz2) = 0c80fbb64123cef7f2d7a9b69b0b965e
-SIZE (gnome2/gnome-session-2.6.2.tar.bz2) = 873420
-MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
-SIZE (gnome2/gnome-splash04-12.png) = 75841
+MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98
+SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921
+MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
+SIZE (gnome2/gnome-splash28.png) = 121715
diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in
index 60c14531bce0..2b05e8c0027e 100644
--- a/x11/gnomesession/files/patch-gnome-session_Makefile.in
+++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig	Wed May  8 14:36:22 2002
-+++ gnome-session/Makefile.in	Wed May  8 14:36:34 2002
-@@ -129,7 +129,7 @@
+--- gnome-session/Makefile.in.orig	Mon May 31 14:34:48 2004
++++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
+@@ -153,7 +153,7 @@
  
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(DISABLE_DEPRECATED_CFLAGS)				$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DDEFAULTDIR="\"$(defaultdir)\""
+ INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
  
diff --git a/x11/gnomesession/files/patch-gnome-session_manager.c b/x11/gnomesession/files/patch-gnome-session_manager.c
new file mode 100644
index 000000000000..7e56843ac733
--- /dev/null
+++ b/x11/gnomesession/files/patch-gnome-session_manager.c
@@ -0,0 +1,14 @@
+--- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
++++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
+@@ -1042,9 +1042,10 @@
+ 
+       if (interact_ping_replied)
+ 	{
++	  IceConn ice_conn;
+ 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
+ 	  print_client (client);
+-	  IceConn ice_conn = SmsGetIceConnection (client->connection);
++	  ice_conn = SmsGetIceConnection (client->connection);
+ 	  interact_ping_replied = FALSE;
+ 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
+ 	}
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index ae71556f4a43..6107618a5527 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -4,9 +4,6 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-session.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
 share/gnome/control-center-2.0/capplets/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
@@ -16,9 +13,9 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
@@ -55,6 +52,8 @@ share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
@@ -72,6 +71,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index a6905e02a207..303ea7a5d354 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.8
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,9 +20,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier libgnomeui vte
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui vte
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-terminal.schemas
+
 .include <bsd.port.mk>
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 53e2076ddaee..97c12e3c7f68 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.6.1.tar.bz2) = 43e04260410e66e767a4b247d0af8b46
-SIZE (gnome2/gnome-terminal-2.6.1.tar.bz2) = 1999378
+MD5 (gnome2/gnome-terminal-2.8.0.tar.bz2) = 93e59f24b35bd867653664565adb4672
+SIZE (gnome2/gnome-terminal-2.8.0.tar.bz2) = 2195403
diff --git a/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c b/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c
deleted file mode 100644
index 57c197bee543..000000000000
--- a/x11/gnometerminal/files/patch-src-eggcellrendererkeys.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/eggcellrendererkeys.c.orig	Thu Jul 29 23:34:48 2004
-+++ src/eggcellrendererkeys.c	Thu Jul 29 23:35:36 2004
-@@ -584,7 +584,7 @@
- void
- egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                         guint                keyval,
--                                        GdkModifierType      mask)
-+                                        EggVirtualModifierType mask)
- {
-   char *text;
-   gboolean changed;
-@@ -626,7 +626,7 @@
- void
- egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                         guint               *keyval,
--                                        GdkModifierType     *mask)
-+                                        EggVirtualModifierType *mask)
- {
-   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
- 
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 12dd4ed33afc..2ef85466b931 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-terminal
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-terminal.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-terminal.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/application-registry/gnome-terminal.applications
 share/gnome/applications/gnome-terminal.desktop
@@ -90,6 +87,7 @@ share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/bn/LC_MESSAGES/gnome-terminal.mo
+share/locale/bs/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
 share/locale/cs/LC_MESSAGES/gnome-terminal.mo
 share/locale/cy/LC_MESSAGES/gnome-terminal.mo
@@ -100,6 +98,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/eu/LC_MESSAGES/gnome-terminal.mo
 share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
@@ -120,6 +119,7 @@ share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nb/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/nn/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index d752f7c6c44c..4bb69b27dbab 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.6.1.2
-CATEGORIES?=	x11 gnome
+PORTVERSION=	2.8.0
+CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
-MAINTAINER?=	gnome@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
@@ -20,6 +20,7 @@ RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack esound \
@@ -30,4 +31,24 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas \
+		desktop_gnome_accessibility_startup.schemas \
+		desktop_gnome_applications_browser.schemas \
+		desktop_gnome_applications_help_viewer.schemas \
+		desktop_gnome_applications_terminal.schemas \
+		desktop_gnome_applications_window_manager.schemas \
+		desktop_gnome_background.schemas \
+		desktop_gnome_file_views.schemas \
+		desktop_gnome_interface.schemas desktop_gnome_lockdown.schemas \
+		desktop_gnome_peripherals_keyboard.schemas \
+		desktop_gnome_peripherals_mouse.schemas \
+		desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \
+		desktop_gnome_typing_break.schemas
+
+.if defined(NOPORTDOCS)
+post-patch:
+	@${REINPLACE_CMD} -e 's|gnome-data po doc|gnome-data po|g' \
+		${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index eaf124ea95a5..0ce1fe747796 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnome-2.6.1.2.tar.bz2) = 5970203d9f6822652cc95bdd72082bfb
-SIZE (gnome2/libgnome-2.6.1.2.tar.bz2) = 1050839
+MD5 (gnome2/libgnome-2.8.0.tar.bz2) = dab4ecbfa7ec1a2f22d2a48b6b83e937
+SIZE (gnome2/libgnome-2.8.0.tar.bz2) = 1164177
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
index 131cf3baa5a4..157a59be15ac 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-ag
@@ -11,7 +11,7 @@ $FreeBSD$
 -		"/bin/zsh", "/usr/bin/zsh",
 -		"/bin/tcsh", "/usr/bin/tcsh",
 -		"/bin/ksh", "/usr/bin/ksh",
--		"/bin/csh", "/bin/sh", 0
+-		"/bin/csh", "/bin/sh", NULL
 +		"/bin/csh", "/bin/sh",
 +		LOCALBASE "/bin/bash",
 +		LOCALBASE "/bin/zsh",
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index a3e14ed9e902..5a240a06a94c 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,6 +1,6 @@
---- libgnome/Makefile.in.orig	Wed Feb 25 01:17:58 2004
-+++ libgnome/Makefile.in	Wed Feb 25 01:20:59 2004
-@@ -159,6 +159,9 @@
+--- libgnome/Makefile.in.orig	Mon May 31 16:33:14 2004
++++ libgnome/Makefile.in	Mon May 31 16:33:45 2004
+@@ -211,6 +211,9 @@
  libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
  
  INCLUDES = \
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
index 90fcdd22c777..9dd33f9c2838 100644
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -1,6 +1,6 @@
---- libgnome/gnome-program.c.orig	Wed Jul 23 05:35:30 2003
-+++ libgnome/gnome-program.c	Mon Dec 22 01:19:23 2003
-@@ -894,17 +894,17 @@
+--- libgnome/gnome-program.c.orig	Mon May 31 16:37:02 2004
++++ libgnome/gnome-program.c	Mon May 31 16:37:05 2004
+@@ -895,17 +895,17 @@
  	attr_rel = "";
  	break;
      case GNOME_FILE_DOMAIN_DATADIR:
@@ -21,7 +21,7 @@
  	attr_name = GNOME_PARAM_GNOME_DATADIR;
  	attr_rel = "/pixmaps";
  	break;
-@@ -916,7 +916,7 @@
+@@ -917,7 +917,7 @@
      case GNOME_FILE_DOMAIN_HELP:
  	prefix_rel = "/share/gnome/help";
  	attr_name = GNOME_PARAM_GNOME_DATADIR;
@@ -30,7 +30,7 @@
  	break;
      case GNOME_FILE_DOMAIN_APP_LIBDIR:
  	prefix_rel = "/lib";
-@@ -925,19 +925,19 @@
+@@ -926,19 +926,19 @@
  	search_path = FALSE;
  	break;
      case GNOME_FILE_DOMAIN_APP_DATADIR:
@@ -53,7 +53,7 @@
  	attr_name = GNOME_PARAM_APP_DATADIR;
  	attr_rel = "/pixmaps";
  	search_path = FALSE;
-@@ -958,12 +958,12 @@
+@@ -959,12 +959,12 @@
  
  	attr_name = GNOME_PARAM_APP_DATADIR;
  
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index d8fed71104d6..c4423ffe156f 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,49 +1,4 @@
 bin/gnome-open
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_accessibility_startup.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_browser.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_applications_browser.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_browser.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_background.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_background.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_background.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_file_views.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_file_views.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_file_views.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_interface.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_interface.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_interface.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_lockdown.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_lockdown.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_lockdown.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_sound.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_sound.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_sound.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_thumbnailers.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_thumbnailers.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_typing_break.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_typing_break.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_typing_break.schemas > /dev/null || /usr/bin/true
 etc/sound/events/gnome-2.soundlist
 etc/sound/events/gtk-events-2.soundlist
 include/libgnome-2.0/libgnome/gnome-config.h
@@ -64,9 +19,35 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h
 lib/bonobo/monikers/libmoniker_extra_2.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.600
+lib/libgnome-2.so.800
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
+share/doc/libgnome/ch01s02.html
+share/doc/libgnome/ch01s03.html
+share/doc/libgnome/ch01s04.html
+share/doc/libgnome/ch01s05.html
+share/doc/libgnome/home.png
+share/doc/libgnome/index.html
+share/doc/libgnome/index.sgml
+share/doc/libgnome/left.png
+share/doc/libgnome/libgnome-gnome-config.html
+share/doc/libgnome/libgnome-gnome-exec.html
+share/doc/libgnome/libgnome-gnome-gconf.html
+share/doc/libgnome/libgnome-gnome-help.html
+share/doc/libgnome/libgnome-gnome-i18n.html
+share/doc/libgnome/libgnome-gnome-init.html
+share/doc/libgnome/libgnome-gnome-program.html
+share/doc/libgnome/libgnome-gnome-score.html
+share/doc/libgnome/libgnome-gnome-sound.html
+share/doc/libgnome/libgnome-gnome-triggers.html
+share/doc/libgnome/libgnome-gnome-url.html
+share/doc/libgnome/libgnome-gnome-util.html
+share/doc/libgnome/libgnome-libgnometypebuiltins.html
+share/doc/libgnome/libgnome.devhelp
+share/doc/libgnome/libgnome.html
+share/doc/libgnome/right.png
+share/doc/libgnome/style.css
+share/doc/libgnome/up.png
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo
@@ -106,6 +87,8 @@ share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
+share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
+share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/no/LC_MESSAGES/libgnome-2.0.mo
@@ -119,8 +102,8 @@ share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnome-2.0.mo
-share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
 share/locale/th/LC_MESSAGES/libgnome-2.0.mo
@@ -131,6 +114,6 @@ share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
-@dirrm %%DOCSDIR%%
+@dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 663ef1dea8d4..1955960680b4 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 1301aca675d8..2e5931ed00c5 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.6.2.tar.bz2) = d5530d4cb207bba0f019277cd8a4c0d8
-SIZE (gnome2/yelp-2.6.2.tar.bz2) = 632824
+MD5 (gnome2/yelp-2.6.4.tar.bz2) = 77d919335650ef0d114c951637669bda
+SIZE (gnome2/yelp-2.6.4.tar.bz2) = 639056
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 7af16743627f..b0f00dab87cd 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.6.3
+PORTVERSION=	2.8.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=    gnome2
 
 MAINTAINER=	klammer@webonaut.com
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index fb3733900239..9066e03b2c2b 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/zenity-2.6.3.tar.bz2) = ce6678c406e9a834e4da04ca00338931
-SIZE (gnome2/zenity-2.6.3.tar.bz2) = 650351
+MD5 (gnome2/zenity-2.8.1.tar.bz2) = a566a88b88c8f530939e900539cb8d28
+SIZE (gnome2/zenity-2.8.1.tar.bz2) = 731091
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 1ecb7a4364e3..d1a62bf16c78 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -47,6 +47,7 @@ share/locale/az/LC_MESSAGES/zenity-0.1.mo
 share/locale/be/LC_MESSAGES/zenity-0.1.mo
 share/locale/bg/LC_MESSAGES/zenity-0.1.mo
 share/locale/bn/LC_MESSAGES/zenity-0.1.mo
+share/locale/bs/LC_MESSAGES/zenity-0.1.mo
 share/locale/ca/LC_MESSAGES/zenity-0.1.mo
 share/locale/cs/LC_MESSAGES/zenity-0.1.mo
 share/locale/cy/LC_MESSAGES/zenity-0.1.mo
@@ -71,12 +72,15 @@ share/locale/id/LC_MESSAGES/zenity-0.1.mo
 share/locale/is/LC_MESSAGES/zenity-0.1.mo
 share/locale/it/LC_MESSAGES/zenity-0.1.mo
 share/locale/ja/LC_MESSAGES/zenity-0.1.mo
+share/locale/kn/LC_MESSAGES/zenity-0.1.mo
 share/locale/ko/LC_MESSAGES/zenity-0.1.mo
 share/locale/lt/LC_MESSAGES/zenity-0.1.mo
 share/locale/mi/LC_MESSAGES/zenity-0.1.mo
+share/locale/mk/LC_MESSAGES/zenity-0.1.mo
 share/locale/ml/LC_MESSAGES/zenity-0.1.mo
 share/locale/mn/LC_MESSAGES/zenity-0.1.mo
 share/locale/ms/LC_MESSAGES/zenity-0.1.mo
+share/locale/nb/LC_MESSAGES/zenity-0.1.mo
 share/locale/ne/LC_MESSAGES/zenity-0.1.mo
 share/locale/nl/LC_MESSAGES/zenity-0.1.mo
 share/locale/nn/LC_MESSAGES/zenity-0.1.mo
@@ -95,6 +99,7 @@ share/locale/sr@Latn/LC_MESSAGES/zenity-0.1.mo
 share/locale/sv/LC_MESSAGES/zenity-0.1.mo
 share/locale/ta/LC_MESSAGES/zenity-0.1.mo
 share/locale/th/LC_MESSAGES/zenity-0.1.mo
+share/locale/tr/LC_MESSAGES/zenity-0.1.mo
 share/locale/uk/LC_MESSAGES/zenity-0.1.mo
 share/locale/vi/LC_MESSAGES/zenity-0.1.mo
 share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2004-11-07 22:24:32 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2004-11-07 22:24:32 +0000
commit	58406bee8938178fc317574c4236434b0dd11a25 (patch)
tree	b4fa34eca69e23769c548b4436cbf65d765e5fe2 /x11
parent	98eb5c95a29c8dd1a76435744e5316092835f696 (diff)
download	ports-58406bee8938178fc317574c4236434b0dd11a25.tar.gz ports-58406bee8938178fc317574c4236434b0dd11a25.zip