3 files changed, 8 insertions, 33 deletions

diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 6fd5ec80df20..98ebb9163269 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	squeeze
 PORTVERSION=	0.2.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	archivers xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -19,22 +19,14 @@ LIB_DEPENDS=	libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils libtool
-USE_XFCE=	configenv libutil thunar
+USES=		tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils \
+	libtool xfce
+USE_XFCE=	thunar
 USE_XORG=	x11
 USE_GNOME=	gtk20 glib20 intltool intlhack
 USE_LDCONFIG=	yes
 MAKE_JOB_SAFE=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
-
-post-patch:
-# Needed to remove gtk-doc installation
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -e "s|docs||g" ${WRKSRC}/Makefile.in
-.endif
+CONFIGURE_ARGS=--disable-static --without-html-dir
 
 .include <bsd.port.mk>
diff --git a/archivers/squeeze/pkg-plist b/archivers/squeeze/pkg-plist
index 1af2be04d648..781bcb93af80 100644
--- a/archivers/squeeze/pkg-plist
+++ b/archivers/squeeze/pkg-plist
@@ -5,7 +5,6 @@ include/libsqueeze-0.2/libsqueeze/libsqueeze-module.h
 include/libsqueeze-0.2/libsqueeze/libsqueeze-vfs-mime.h
 include/libsqueeze-0.2/libsqueeze/libsqueeze-view.h
 include/libsqueeze-0.2/libsqueeze/libsqueeze.h
-lib/libsqueeze-0.2.a
 lib/libsqueeze-0.2.so
 lib/libsqueeze-0.2.so.0
 lib/libsqueeze-0.2.so.0.0.2
@@ -30,22 +29,6 @@ share/locale/tr/LC_MESSAGES/squeeze.mo
 share/locale/uk/LC_MESSAGES/squeeze.mo
 share/pixmaps/squeeze/archive-add.png
 share/pixmaps/squeeze/archive-extract.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchive.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchiveCommand.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/archiving.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/home.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.sgml
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/ix01.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/left.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-LSQArchiveSupport.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-libsqueeze.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp2
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/right.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/style.css
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/up.png
 share/icons/hicolor/16x16/apps/squeeze.png
 share/icons/hicolor/48x48/apps/squeeze.png
 share/icons/hicolor/scalable/apps/squeeze.svg
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 88dd82280e15..a57d8963dfde 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-archive-plugin
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -13,8 +13,8 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Archive plugin for the Thunar File Manager
 
 GNU_CONFIGURE=	yes
-USE_XFCE=	configenv libexo thunar
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USE_XFCE=	thunar
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 INSTALLS_ICONS=	yes
 USE_GNOME=	intltool