4 files changed, 25 insertions, 25 deletions

diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 0471f34d9266..ba849736d7eb 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	3.8.14c
-PORTREVISION=	1
+PORTVERSION=	3.8.16
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xfce.org/archive/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	nakai@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv \
@@ -57,8 +56,11 @@ pre-everything::
 .endif
 
 pre-patch:
-	@${PERL} -pi -e \
-		's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|=aclocal|=${TRUE}|g ; \
+		 s|=autoconf|=${TRUE}|g ; \
+		 s|=automake|=${TRUE}|g ; \
+		 s|=autoheader|=${TRUE}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
 	@${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
 
diff --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo
index 277295a38aae..a919b7c2659b 100644
--- a/x11-wm/xfce4/distinfo
+++ b/x11-wm/xfce4/distinfo
@@ -1 +1 @@
-MD5 (xfce-3.8.14c.tar.gz) = 64f83b3fe758777593da353c6f1c2044
+MD5 (xfce-3.8.16.tar.gz) = e73dba58bb04eb1facc682b308a422b3
diff --git a/x11-wm/xfce4/files/patch-xfumed.c b/x11-wm/xfce4/files/patch-xfumed.c
deleted file mode 100644
index ec04814bf811..000000000000
--- a/x11-wm/xfce4/files/patch-xfumed.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- xfumed/xfumed.c.orig	Wed Nov  7 13:09:02 2001
-+++ xfumed/xfumed.c	Sat Mar  2 02:48:53 2002
-@@ -163,7 +163,6 @@
- 	g_error ("xfumed: Couldn't open file %s\n", filename);
-     }
- 
--  g_free (home);
-   g_free (filename);
- 
-   if (xfmenu->ctree)
-@@ -476,7 +475,6 @@
- 
-   home = g_getenv ("HOME");
-   filename = g_strconcat (home, "/", RCFILE, NULL);
--  g_free (home);
-   backup = g_strconcat (filename, ".bak", NULL);
- 
-   if ((backup_fp = fopen (backup, "w")) && (fp = fopen (filename, "r")))
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index c1fed1fd3215..ba601eb956a6 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -21,6 +21,7 @@ bin/xfplay
 bin/xfprint
 bin/xfrun
 bin/xfsamba
+bin/xfskin
 bin/xfsound
 bin/xfterm
 bin/xftrash
@@ -52,6 +53,7 @@ etc/xfce/xinitrc.mwm
 etc/xfce/xsession
 etc/xfce/xtree.reg
 lib/gtk/themes/engines/libxfce.so
+share/locale/bg/LC_MESSAGES/xfce.mo
 share/locale/ca/LC_MESSAGES/xfce.mo
 share/locale/cs/LC_MESSAGES/xfce.mo
 share/locale/da/LC_MESSAGES/xfce.mo
@@ -65,6 +67,7 @@ share/locale/gl/LC_MESSAGES/xfce.mo
 share/locale/hu/LC_MESSAGES/xfce.mo
 share/locale/it/LC_MESSAGES/xfce.mo
 share/locale/ja/LC_MESSAGES/xfce.mo
+share/locale/ms/LC_MESSAGES/xfce.mo
 share/locale/nl/LC_MESSAGES/xfce.mo
 share/locale/pl/LC_MESSAGES/xfce.mo
 share/locale/pt_BR/LC_MESSAGES/xfce.mo
@@ -132,7 +135,7 @@ share/xfce/backdrops/Linea.xpm
 share/xfce/backdrops/Marbled.xpm
 share/xfce/backdrops/Master-Plan.jpg
 share/xfce/backdrops/Maze.xpm
-share/xfce/backdrops/MiceBlue.jpg
+share/xfce/backdrops/Metal-blue.jpg
 share/xfce/backdrops/Nebula.xpm
 share/xfce/backdrops/Notes.xpm
 share/xfce/backdrops/Overdriven.jpg
@@ -423,7 +426,9 @@ share/xfce/icons/X_server.xpm
 share/xfce/icons/Xmix.xpm
 share/xfce/icons/Xterm.xpm
 share/xfce/icons/Xv.xpm
+share/xfce/icons/playball.xpm
 share/xfce/icons/xfsamba.xpm
+share/xfce/icons/xfskin.xpm
 share/xfce/palettes/Alpine
 share/xfce/palettes/Altxfce
 share/xfce/palettes/Altxfce2
@@ -444,7 +449,9 @@ share/xfce/palettes/BlueX3
 share/xfce/palettes/BlueX4
 share/xfce/palettes/Bronze
 share/xfce/palettes/Bronze2
+share/xfce/palettes/Cadmium
 share/xfce/palettes/CandyBox
+share/xfce/palettes/CandyBox2
 share/xfce/palettes/Cheese
 share/xfce/palettes/Chrome
 share/xfce/palettes/Citrouille
@@ -454,6 +461,7 @@ share/xfce/palettes/Clinky
 share/xfce/palettes/Craters
 share/xfce/palettes/DarkMetal
 share/xfce/palettes/Default
+share/xfce/palettes/DefaultTextured
 share/xfce/palettes/Defcon
 share/xfce/palettes/Desert
 share/xfce/palettes/Dolly
@@ -470,6 +478,7 @@ share/xfce/palettes/Grayscale
 share/xfce/palettes/GreenIron
 share/xfce/palettes/GreySlate
 share/xfce/palettes/Ground
+share/xfce/palettes/GtkXfce
 share/xfce/palettes/Helice
 share/xfce/palettes/HiContrast
 share/xfce/palettes/HiTech
@@ -477,6 +486,9 @@ share/xfce/palettes/HiTech2
 share/xfce/palettes/Iceland
 share/xfce/palettes/Jazza
 share/xfce/palettes/Jazza2
+share/xfce/palettes/KDE
+share/xfce/palettes/KStyle2
+share/xfce/palettes/KXfce
 share/xfce/palettes/Kdetheme
 share/xfce/palettes/LightBulb
 share/xfce/palettes/LightBulb2
@@ -491,6 +503,7 @@ share/xfce/palettes/Metal
 share/xfce/palettes/Military
 share/xfce/palettes/Modern
 share/xfce/palettes/Modern2
+share/xfce/palettes/Monkey
 share/xfce/palettes/Moz9
 share/xfce/palettes/Moz9-2
 share/xfce/palettes/Nature
@@ -499,6 +512,7 @@ share/xfce/palettes/Netsy
 share/xfce/palettes/OldWood
 share/xfce/palettes/Pale
 share/xfce/palettes/Paper
+share/xfce/palettes/Pelgrim
 share/xfce/palettes/Pinky
 share/xfce/palettes/Plum
 share/xfce/palettes/Power
@@ -510,6 +524,7 @@ share/xfce/palettes/Quartz
 share/xfce/palettes/Reader
 share/xfce/palettes/Salmon
 share/xfce/palettes/Salmon2
+share/xfce/palettes/SaltLake
 share/xfce/palettes/Sand
 share/xfce/palettes/Silver
 share/xfce/palettes/Silver2
@@ -541,6 +556,7 @@ share/xfce/palettes/Vanadium
 share/xfce/palettes/Win
 share/xfce/palettes/Win2
 share/xfce/palettes/Win3
+share/xfce/palettes/XLight
 share/xfce/palettes/Xfce-1
 share/xfce/palettes/Xfce-2
 share/xfce/sounds/alert01.wav