2 files changed, 18 insertions, 89 deletions
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 9e7eb0a762cf..73e4d17ab41d 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-vfs
 PORTVERSION=	1.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/archive/${PORTNAME}/${PORTVERSION:R}
@@ -22,66 +22,30 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 gdkpixbuf2 intltool intlhack
-USE_XFCE=	configenv libutil libexo
+USE_XFCE=	libexo
 USE_XORG=	x11
 USES=		gmake pathfix perl5 pkgconfig libtool desktop-file-utils \
-		tar:bzip2
+		gettext-tools xfce tar:bzip2
 
-CONFIGURE_ARGS=	--disable-debug
+CONFIGURE_ARGS=	--disable-debug --without-html-dir
 
-OPTIONS_DEFINE=	NLS HAL DBUS STARTUP GCONF DOCS
+OPTIONS_DEFINE=	NLS HAL DBUS STARTUP GCONF
 OPTIONS_DEFAULT=	NLS HAL DBUS STARTUP
 STARTUP_DESC=	Startup notification
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+=--with-volume-manager=hal
-.else
-CONFIGURE_ARGS+=--with-volume-manager=freebsd
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
-.else
-CONFIGURE_ARGS+=--disable-dbus
-.endif
-
-.if ${PORT_OPTIONS:MSTARTUP}
-LIB_DEPENDS+=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
-.else
-CONFIGURE_ARGS+=--disable-startup-notification
-.endif
-
-# GNOME thumbnailers
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-CONFIGURE_ARGS+=--enable-gnome-thumbnailers
-.else
-CONFIGURE_ARGS+=--disable-gnome-thumbnailers
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_CONFIGURE_WITH=	volume-manager=hal
+HAL_CONFIGURE_OFF=	--with-volume-manager=freebsd
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_CONFIGURE_ENABLE=	dbus
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_CONFIGURE_ENABLE=	startup-notification
+GCONF_USE=	gnome=gconf2
+GCONF_CONFIGURE_ENABLE=	gnome-thumbnailers
+OPTIONS_SUB=	yes
 
 post-patch:
-		@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-fm/thunar-vfs/pkg-plist b/x11-fm/thunar-vfs/pkg-plist
index 9d2a2eb0fdfc..96af06dfece3 100644
--- a/x11-fm/thunar-vfs/pkg-plist
+++ b/x11-fm/thunar-vfs/pkg-plist
@@ -26,41 +26,6 @@ lib/thunar-vfs-1/thunar-vfs-update-thumbnailers-cache-1
 libdata/pkgconfig/thunar-vfs-1.pc
 %%DOCSDIR%%/README.volumes
 %%DOCSDIR%%/ThumbnailersCacheFormat.txt
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/fundamentals.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/home.png
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/index.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/index.sgml
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/introduction.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/ix01.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/jobs.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/left.png
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/mime-types.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/right.png
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/style.css
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/up.png
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html
-%%APIDOCS%%share/gtk-doc/html/thunar-vfs/volume-handling.html
 %%NLS%%share/locale/ar/LC_MESSAGES/thunar-vfs.mo
 %%NLS%%share/locale/be/LC_MESSAGES/thunar-vfs.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/thunar-vfs.mo