8 files changed, 22 insertions, 171 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 0736a866b231..66b6377c717a 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Terminal
-PORTVERSION=	0.4.7
-PORTREVISION=	1
+PORTVERSION=	0.4.8
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME:L}/${PORTVERSION:R}
@@ -27,6 +26,7 @@ USE_XFCE=	configenv libexo
 USE_XORG=	x11
 
 CONFIGURE_ARGS=	--without-gnome-default-appsdir
+CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
 
 OPTIONS=	DBUS	"Enable D-BUS support"			on \
 		NLS	"Enable Native Language Support"	on
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 7acc835b91d5..8fc018c933f1 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/Terminal-0.4.7.tar.bz2) = 12ab46043ebf2de07e5a1c6826c6b0a677eb3ba58cc1c883a1a906b83ac6fd01
-SIZE (xfce4/Terminal-0.4.7.tar.bz2) = 1582320
+SHA256 (xfce4/Terminal-0.4.8.tar.bz2) = fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d
+SIZE (xfce4/Terminal-0.4.8.tar.bz2) = 1585791
diff --git a/x11/Terminal/files/extra-patch-doc-Makefile.in b/x11/Terminal/files/extra-patch-doc-Makefile.in
index 897064379c51..525d8126963b 100644
--- a/x11/Terminal/files/extra-patch-doc-Makefile.in
+++ b/x11/Terminal/files/extra-patch-doc-Makefile.in
@@ -1,17 +1,5 @@
---- doc/Makefile.in.orig	2011-03-07 13:18:35.000000000 +0100
-+++ doc/Makefile.in	2011-03-07 13:28:48.000000000 +0100
-@@ -53,9 +53,9 @@
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
--	html-recursive info-recursive install-data-recursive \
-+	info-recursive install-data-recursive \
- 	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
-+	install-info-recursive \
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
+--- doc/Makefile.in.orig	2011-06-21 22:32:36.000000000 +0200
++++ doc/Makefile.in	2011-06-22 18:31:41.000000000 +0200
 @@ -293,7 +293,6 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -20,44 +8,7 @@
  	po
  
  HTML_STYLESHEET = $(PACKAGE)-html.xsl
-@@ -361,18 +360,6 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--install-cssDATA: $(css_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
--	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
--	done
- 
- uninstall-cssDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -583,9 +570,6 @@
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(cssdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
--	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -624,15 +608,11 @@
- 
- dvi-am:
- 
--html: html-recursive
--
--html-am:
--
- info: info-recursive
+@@ -632,7 +631,7 @@
  
  info-am:
  
@@ -66,32 +17,7 @@
  
  install-dvi: install-dvi-recursive
  
-@@ -640,10 +620,6 @@
- 
- install-exec-am:
- 
--install-html: install-html-recursive
--
--install-html-am:
--
- install-info: install-info-recursive
- 
- install-info-am:
-@@ -685,10 +661,10 @@
- 	all all-am check check-am clean clean-generic clean-libtool \
- 	clean-local ctags ctags-recursive dist-hook distclean \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
--	dvi-am html html-am info info-am install install-am \
--	install-cssDATA install-data install-data-am \
-+	dvi-am info info-am install install-am \
-+	install-data install-data-am \
- 	install-data-local install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-exec-am install-info \
- 	install-info-am install-man install-pdf install-pdf-am \
- 	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
-@@ -700,19 +676,6 @@
+@@ -700,19 +699,6 @@
  # install the html files to the destdir
  install-data-local:
  	for lang in $(ALL_LINGUAS); do \
@@ -105,79 +31,10 @@
 -			done; \
 -			if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
 -				echo "--- Creating symlink to C images for $$lang"; \
--				ln -sf $(docdir)/C/images $$dest/images; \
+-				ln -sf ../C/images $$dest/images; \
 -			fi \
 -		fi; \
  		file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
  		if test -f $$file ; then \
  			if test x"$$lang" = x"C"; then \
-@@ -730,13 +693,6 @@
- uninstall-local:
- 	for lang in $(ALL_LINGUAS); do \
- 		dest=$(DESTDIR)$(docdir)/$$lang; \
--		if test -d $$dest; then \
--			if test -L $$dest/images; then \
--				rm -rf $$dest; \
--			else \
--				rm -f $$dest/*.html; \
--			fi \
--		fi; \
- 		if test x"$$lang" = x"C"; then \
- 			dest=$(DESTDIR)$(mandir)/man1/$(PACKAGE).1; \
- 		else \
-@@ -750,7 +706,7 @@
- 
- # remove generate html from the srcdir
- clean-local:
--	rm -rf $(srcdir)/html $(srcdir)/man
-+	rm -rf $(srcdir)/man
- 
- # regenerate po(t) files
- @GENERATE_DOCUMENTATION_TRUE@update-po:
-@@ -762,9 +718,9 @@
- @GENERATE_DOCUMENTATION_TRUE@	done
- 
- # build the translated help files
--@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STYLESHEET) $(srcdir)/$(MAN_STYLESHEET)
-+@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(MAN_STYLESHEET)
- @GENERATE_DOCUMENTATION_TRUE@	@chmod -R u+w $(srcdir); \
--@GENERATE_DOCUMENTATION_TRUE@	rm -rf $(srcdir)/html $(srcdir)/man; \
-+@GENERATE_DOCUMENTATION_TRUE@	rm -rf $(srcdir)/man; \
- @GENERATE_DOCUMENTATION_TRUE@	echo; \
- @GENERATE_DOCUMENTATION_TRUE@	echo "*** Generating full XML file ***"; \
- @GENERATE_DOCUMENTATION_TRUE@	echo "Creating Terminal-options.xml"; \
-@@ -790,11 +746,9 @@
- @GENERATE_DOCUMENTATION_TRUE@			-i xgen-doc xgen-man; \
- @GENERATE_DOCUMENTATION_TRUE@		echo "Validating DocBook XML files"; \
- @GENERATE_DOCUMENTATION_TRUE@		$(XMLLINT) --noout --valid xgen-doc xgen-man || exit 1; \
--@GENERATE_DOCUMENTATION_TRUE@		echo "Creating the HTML pages"; \
--@GENERATE_DOCUMENTATION_TRUE@		$(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(HTML_STYLESHEET) xgen-doc; \
- @GENERATE_DOCUMENTATION_TRUE@		echo "Creating the MAN page"; \
- @GENERATE_DOCUMENTATION_TRUE@		$(XSLTPROC) --nonet -o $(srcdir)/man/$$lang/$(PACKAGE_NAME).1 $(srcdir)/$(MAN_STYLESHEET) xgen-man; \
--@GENERATE_DOCUMENTATION_TRUE@		chmod -R u+w $(srcdir)/html/$$lang $(srcdir)/man/$$lang; \
-+@GENERATE_DOCUMENTATION_TRUE@		chmod -R u+w $(srcdir)/man/$$lang; \
- @GENERATE_DOCUMENTATION_TRUE@		rm -f xgen-doc xgen-man; \
- @GENERATE_DOCUMENTATION_TRUE@		echo; \
- @GENERATE_DOCUMENTATION_TRUE@	done; \
-@@ -808,7 +762,7 @@
- @GENERATE_DOCUMENTATION_FALSE@	@false
- 
- @GENERATE_DOCUMENTATION_FALSE@doc-build.stamp:
--@GENERATE_DOCUMENTATION_FALSE@	@if test ! -d $(srcdir)/html -a ! -d $(srcdir)/man; then \
-+@GENERATE_DOCUMENTATION_FALSE@	@if test ! -d $(srcdir)/man; then \
- @GENERATE_DOCUMENTATION_FALSE@		echo; \
- @GENERATE_DOCUMENTATION_FALSE@		echo "*** No generated documentation found. If you want to"; \
- @GENERATE_DOCUMENTATION_FALSE@		echo "*** generate the (translated) documentation, run configure"; \
-@@ -827,10 +781,6 @@
- # include the html and man files in the dist
- dist-hook: dist-check-doc doc-build.stamp
- 	for lang in $(ALL_LINGUAS); do \
--		if test -d $(srcdir)/html/$$lang; then \
--			mkdir -p $(distdir)/html/$$lang; \
--			cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
--		fi; \
- 		if test -d $(srcdir)/man/$$lang; then \
- 			mkdir -p $(distdir)/man/$$lang; \
- 			cp $(srcdir)/man/$$lang/* $(distdir)/man/$$lang/; \
-
 
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 4bcb2fd4345e..560fa218de8e 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
 
 PORTNAME=	libexo
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
@@ -14,7 +14,7 @@ DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	Terminal library, extensions to Xfce by os-cillation
+COMMENT=	Application library for the Xfce environment
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
@@ -31,8 +31,11 @@ USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack pkgconfig \
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
 USE_XFCE=	configenv libutil
-
+USE_XORG=	x11
+CONFIGURE_ARGS+=--enable-gio-unix \
+		--with-gio-module-dir=${PREFIX}/lib/gio/modules
 CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
+
 OPTIONS=	APIDOCS	"Install api documentation"		off \
 		PYTHON	"Enable Python support"			off \
 		NLS	"Enable Native Language Support"	on
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 8525cea07226..38ad7ef374f2 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/exo-0.6.1.tar.bz2) = e4497e31b43ee6f47584718e7d398199e3271dec5a183f9c50fd0da4c8ce818d
-SIZE (xfce4/exo-0.6.1.tar.bz2) = 1691261
+SHA256 (xfce4/exo-0.6.2.tar.bz2) = f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39
+SIZE (xfce4/exo-0.6.2.tar.bz2) = 1692288
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 49bca59cf990..62bc4b12835e 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -307,21 +307,12 @@ share/xfce4/helpers/xterm.desktop
 @dirrm include/exo-1
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-%%PYTHON%%share/pygtk/2.0/defs/%%EXODIR%%/exo.defs
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
 %%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
 %%PYTHON%%@dirrmtry share/pygtk/2.0/defs
 %%PYTHON%%@dirrmtry share/pygtk/2.0
 %%PYTHON%%@dirrmtry share/pygtk
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 8858a0b2c07a..1e3b36e5931c 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	1.1.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index f44fa15ee549..59bbc97d436a 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	verve-plugin
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}