4 files changed, 25 insertions, 66 deletions

diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 78dc61e4b85e..706f13022991 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	pcmanfm
-PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTVERSION=	0.9.7
 CATEGORIES=	x11-fm
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/PCManFM%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/PCManFM2%20%2B%20Libfm%20%28experimental%29/PCManFM/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	PCMan File Manager
 
-LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
+		fm-gtk.0:${PORTSDIR}/x11/libfm
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
@@ -25,25 +24,11 @@ USE_FAM=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=--disable-desktop-integration \
-		--disable-hal
 
 OPTIONS=	NLS "Native Language Support (devel/gettext)" on
-#		HAL "Enable auto-mounthing with HAL (sysutils/hal and devel/dbus)" on
-# Disable HAL for now, it doesn't seem to work very well in this version
 
 .include <bsd.port.pre.mk>
 
-#.if !defined(WITHOUT_HAL)
-#LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal \
-#		dbus-1.3:${PORTSDIR}/devel/dbus
-#CONFIGURE_ARGS+=--enable-hal
-#PLIST_SUB+=	HAL=""
-#.else
-#CONFIGURE_ARGS+=--disable-hal
-#PLIST_SUB+=	HAL="@comment"
-#.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git a/x11-fm/pcmanfm/distinfo b/x11-fm/pcmanfm/distinfo
index 136381106639..17cf4a8602a1 100644
--- a/x11-fm/pcmanfm/distinfo
+++ b/x11-fm/pcmanfm/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcmanfm-0.5.2.tar.bz2) = 750f89cbe7496e5f4c09e4c5a95dec6e
-SHA256 (pcmanfm-0.5.2.tar.bz2) = 20e2c8712bc13316b39f40b5c1b95b89ce3e89b69308d2b5704d89c18ae1a150
-SIZE (pcmanfm-0.5.2.tar.bz2) = 729039
+MD5 (pcmanfm-0.9.7.tar.gz) = f433a61484da10ed3382c1799169abd6
+SHA256 (pcmanfm-0.9.7.tar.gz) = 38eeb2525b830c09efb229df0c8820c74c7312ac6c8acf2fcdebc35005508411
+SIZE (pcmanfm-0.9.7.tar.gz) = 469027
diff --git a/x11-fm/pcmanfm/files/patch-po__ca.po b/x11-fm/pcmanfm/files/patch-po__ca.po
deleted file mode 100644
index e1db7402c771..000000000000
--- a/x11-fm/pcmanfm/files/patch-po__ca.po
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./po/ca.po.orig	2009-12-29 10:15:52.585153873 +0300
-+++ ./po/ca.po	2009-12-29 10:16:15.114741005 +0300
-@@ -301,7 +301,7 @@
- "Des de fa una setmana\n"
- "Des de fa un mes\n"
- "Des de fa un any\n"
--"Dins el rang de dates seleccionat\n"
-+"Dins el rang de dates seleccionat"
- 
- #: ../data/ui/find-files.glade.h:15
- msgid "Audio Files (mp3, ogg,...)"
diff --git a/x11-fm/pcmanfm/pkg-plist b/x11-fm/pcmanfm/pkg-plist
index af72b09408ac..4710943cb00a 100644
--- a/x11-fm/pcmanfm/pkg-plist
+++ b/x11-fm/pcmanfm/pkg-plist
@@ -1,34 +1,23 @@
 bin/pcmanfm
-%%NLS%%share/locale/af/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/pcmanfm.mo
+share/applications/pcmanfm.desktop
 %%NLS%%share/locale/bg/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/bn_IN/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/da/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/el/LC_MESSAGES/pcmanfm.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/et/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/pcmanfm.mo
+%%NLS%%share/locale/fo/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/he/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/id/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/km/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ml/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/pcmanfm.mo
@@ -36,33 +25,29 @@ bin/pcmanfm
 %%NLS%%share/locale/sk/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/pcmanfm.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pcmanfm.mo
+%%NLS%%share/locale/th/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ps/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/pcmanfm.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/pcmanfm.mo
-share/pixmaps/pcmanfm.png
-share/applications/pcmanfm.desktop
-share/applications/pcmanfm-find.desktop
-share/applications/pcmanfm-folder-handler.desktop
-share/mime/packages/libmimetype.xml
-%%DATADIR%%/mount.rules
-%%DATADIR%%/ui/prefdlg.ui
-%%DATADIR%%/ui/appchooserdlg.ui
-%%DATADIR%%/ui/file_properties.ui
-%%DATADIR%%/ui/about-dlg.ui
-%%DATADIR%%/ui/find-files.ui
-%%DATADIR%%/ui/godlg.ui
+%%DATADIR%%/ui/pref.ui
+%%DATADIR%%/ui/autorun.ui
+%%DATADIR%%/ui/about.ui
+%%DATADIR%%/ui/desktop-pref.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/fo/LC_MESSAGES
+@dirrmtry share/locale/fo
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/th/LC_MESSAGES
+@dirrmtry share/locale/th
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
+@dirrmtry include/libfm/libfm
+@dirrmtry include/libfm