- Update to 1.0

5 files changed, 39 insertions, 19 deletions

diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 81aba7b86dfb..277d63a3cdfe 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libfm
-PORTVERSION=	0.1.17
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
 
@@ -26,6 +25,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
 
+MAN1=		libfm-pref-apps.1
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -39,6 +40,9 @@ PLIST_SUB+=	NLS="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-Wno-unused-but-set-variable||' \
+		${WRKSRC}/src/actions/Makefile.am ${WRKSRC}/src/actions/Makefile.in
 
 pre-install:
 	cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh
diff --git a/x11/libfm/distinfo b/x11/libfm/distinfo
index 9a54bdf801ce..b79cacbdb884 100644
--- a/x11/libfm/distinfo
+++ b/x11/libfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfm-0.1.17.tar.gz) = 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b
-SIZE (libfm-0.1.17.tar.gz) = 874556
+SHA256 (libfm-1.0.tar.gz) = 317ea0b92136bf1791d91261125f8e4b461c4c93a468babf7bdb919d62f7e502
+SIZE (libfm-1.0.tar.gz) = 1051268
diff --git a/x11/libfm/files/patch-src__tools__libfm-pref-apps.c b/x11/libfm/files/patch-src__tools__libfm-pref-apps.c
deleted file mode 100644
index 92c5cc50e4af..000000000000
--- a/x11/libfm/files/patch-src__tools__libfm-pref-apps.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/tools/libfm-pref-apps.c.orig	2012-03-18 14:21:22.000000000 +1030
-+++ ./src/tools/libfm-pref-apps.c	2012-03-18 14:22:13.000000000 +1030
-@@ -38,7 +38,7 @@
- static GList* mail_clients = NULL;
- 
- /* examine desktop files under Internet and Office submenus to find out browsers and mail clients */
--static init_apps()
-+static void init_apps()
- {
-     MenuCache* mc = menu_cache_lookup_sync("applications.menu");
-     MenuCacheDir* dir;
diff --git a/x11/libfm/files/patch-src_job_fm-file-ops-job.c b/x11/libfm/files/patch-src_job_fm-file-ops-job.c
new file mode 100644
index 000000000000..afb6e4f17656
--- /dev/null
+++ b/x11/libfm/files/patch-src_job_fm-file-ops-job.c
@@ -0,0 +1,11 @@
+--- src/job/fm-file-ops-job.c.orig	2012-09-05 14:01:38.265086278 -0400
++++ src/job/fm-file-ops-job.c	2012-09-05 14:01:52.454076353 -0400
+@@ -537,7 +537,7 @@
+     }
+ 
+     job->total = fm_path_list_get_length(job->srcs);
+-    g_debug("total files to link: %lu", (ulong)job->total);
++    g_debug("total files to link: %lu", (unsigned long)job->total);
+ 
+     fm_file_ops_job_emit_prepared(job);
+ 
diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist
index 245449574559..fc9cbdb8c0f3 100644
--- a/x11/libfm/pkg-plist
+++ b/x11/libfm/pkg-plist
@@ -1,6 +1,7 @@
 bin/libfm-pref-apps
 etc/xdg/libfm/libfm.conf
 etc/xdg/libfm/pref-apps.conf
+include/libfm/libfm/fm-actions.h
 include/libfm/libfm/fm-app-chooser-combo-box.h
 include/libfm/libfm/fm-app-chooser-dlg.h
 include/libfm/libfm/fm-app-menu-view.h
@@ -53,16 +54,17 @@ include/libfm/libfm/fm-side-pane.h
 include/libfm/libfm/fm-simple-job.h
 include/libfm/libfm/fm-tab-label.h
 include/libfm/libfm/fm-thumbnail.h
+include/libfm/libfm/fm-thumbnailer.h
 include/libfm/libfm/fm-utils.h
 include/libfm/libfm/fm.h
 lib/libfm-gtk.a
 lib/libfm-gtk.la
 lib/libfm-gtk.so
-lib/libfm-gtk.so.1
+lib/libfm-gtk.so.3
 lib/libfm.a
 lib/libfm.la
 lib/libfm.so
-lib/libfm.so.1
+lib/libfm.so.3
 libdata/pkgconfig/libfm-gtk.pc
 libdata/pkgconfig/libfm.pc
 share/applications/libfm-pref-apps.desktop
@@ -73,6 +75,8 @@ share/gtk-doc/html/libfm/FmConfig.html
 share/gtk-doc/html/libfm/FmDeepCountJob.html
 share/gtk-doc/html/libfm/FmDirListJob.html
 share/gtk-doc/html/libfm/FmDirTreeModel.html
+share/gtk-doc/html/libfm/FmDirTreeView.html
+share/gtk-doc/html/libfm/FmDndDest.html
 share/gtk-doc/html/libfm/FmDndSrc.html
 share/gtk-doc/html/libfm/FmDummyMonitor.html
 share/gtk-doc/html/libfm/FmFileInfoJob.html
@@ -82,25 +86,30 @@ share/gtk-doc/html/libfm/FmFolderModel.html
 share/gtk-doc/html/libfm/FmFolderView.html
 share/gtk-doc/html/libfm/FmJob.html
 share/gtk-doc/html/libfm/FmNavHistory.html
+share/gtk-doc/html/libfm/FmPathBar.html
 share/gtk-doc/html/libfm/FmPathEntry.html
+share/gtk-doc/html/libfm/FmPlacesModel.html
 share/gtk-doc/html/libfm/FmPlacesView.html
-share/gtk-doc/html/libfm/FmSimpleJob.html
+share/gtk-doc/html/libfm/FmSidePane.html
 share/gtk-doc/html/libfm/FmTabLabel.html
+share/gtk-doc/html/libfm/annotation-glossary.html
 share/gtk-doc/html/libfm/api-index-full.html
 share/gtk-doc/html/libfm/home.png
 share/gtk-doc/html/libfm/index.html
 share/gtk-doc/html/libfm/index.sgml
 share/gtk-doc/html/libfm/left.png
-share/gtk-doc/html/libfm/libfm-FmDndDest.html
 share/gtk-doc/html/libfm/libfm-fm-app-chooser-combo-box.html
 share/gtk-doc/html/libfm/libfm-fm-app-chooser-dlg.html
+share/gtk-doc/html/libfm/libfm-fm-app-info.html
 share/gtk-doc/html/libfm/libfm-fm-app-menu-view.html
 share/gtk-doc/html/libfm/libfm-fm-archiver.html
 share/gtk-doc/html/libfm/libfm-fm-clipboard.html
+share/gtk-doc/html/libfm/libfm-fm-dnd-auto-scroll.html
 share/gtk-doc/html/libfm/libfm-fm-file-info.html
 share/gtk-doc/html/libfm/libfm-fm-file-launcher.html
 share/gtk-doc/html/libfm/libfm-fm-file-menu.html
 share/gtk-doc/html/libfm/libfm-fm-file-properties.html
+share/gtk-doc/html/libfm/libfm-fm-gtk-file-launcher.html
 share/gtk-doc/html/libfm/libfm-fm-gtk-utils.html
 share/gtk-doc/html/libfm/libfm-fm-gtk.html
 share/gtk-doc/html/libfm/libfm-fm-icon-pixbuf.html
@@ -111,10 +120,15 @@ share/gtk-doc/html/libfm/libfm-fm-monitor.html
 share/gtk-doc/html/libfm/libfm-fm-path.html
 share/gtk-doc/html/libfm/libfm-fm-progress-dlg.html
 share/gtk-doc/html/libfm/libfm-fm-thumbnail.html
+share/gtk-doc/html/libfm/libfm-fm-thumbnailer.html
 share/gtk-doc/html/libfm/libfm-fm-utils.html
 share/gtk-doc/html/libfm/libfm-fm.html
 share/gtk-doc/html/libfm/libfm.devhelp2
 share/gtk-doc/html/libfm/libfm.html
+share/gtk-doc/html/libfm/libfm-core.html
+share/gtk-doc/html/libfm/libfm-jobs.html
+share/gtk-doc/html/libfm/libfm-FmSimpleJob.html
+share/gtk-doc/html/libfm/libfm-gtk.html
 share/gtk-doc/html/libfm/object-tree.html
 share/gtk-doc/html/libfm/right.png
 share/gtk-doc/html/libfm/style.css
@@ -154,6 +168,7 @@ share/mime/packages/libfm.xml
 %%NLS%%share/locale/id/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/libfm.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/lg/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/libfm.mo
@@ -177,6 +192,7 @@ share/mime/packages/libfm.xml
 %%NLS%%share/locale/th/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/tt_RU/LC_MESSAGES/libfm.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/libfm.mo