x11/libfm

- Update to 1.2.0
- Add dependency for textproc/p5-XML-Parser
- ADD USE_XZ=yes
- Add USES desktop-file-utils shared-mime-info
- Add USE_AUTOTOOLS=aclocal automake
- Strip executables and/or libraries
- Add DOCS and Option
- Add MAJORVER, VER and PLIST_SUB
- Change REINPLACE, remove obsolete and libfm-gtk3.pc [1]
- Remove obsolete pre-install
- Added executable and desktop for lxshortcut [1]
- Update WWW

x11-fm/pcmanfm

- Update to 1.2.0
- Remove dependency for x11/startup-notification [1]
- ADD USE_XZ=yes
- Add USES desktop-file-utils pathfix
- Add DEBUG and DOCS Options, add DOCS
- Add patch [1]
- Update WWW

deskutils/lxshortcut

- Add conflict with libfm-1.2.0
- Mark DEPRECATED, set EXPIRATION_DATE

x11/lxde-meta

- Bump PORTREVISION
- Remove dependency for deskutils/lxshortcut

Reported by:<-->Upstream (IRC) [1]

5 files changed, 123 insertions, 87 deletions

diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 258c4dd0933e..d8392cc67941 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfm
-PORTVERSION=	1.1.2.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
 
@@ -12,47 +11,57 @@ COMMENT=	The libFM backend library to PCManFM
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
 		libexif.so:${PORTSDIR}/graphics/libexif
 
-USES=		fam gmake pkgconfig
-USE_GNOME=	gnomehack gtk20
-USE_AUTOTOOLS=	libtool
+USE_XZ=		yes
+USES=		desktop-file-utils fam gmake pkgconfig shared-mime-info
+USE_GNOME=	gtk20
+USE_AUTOTOOLS=	aclocal automake libtool
 CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
+MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	NLS
+PORTDOCS=	AUTHORS NEWS README
+
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
+PLIST_SUB+=	MAJORVER=1.0
+PLIST_SUB+=	VER=4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|-Wno-unused-but-set-variable||' \
-		${WRKSRC}/src/actions/Makefile.am ${WRKSRC}/src/actions/Makefile.in
-	@${REINPLACE_CMD} -e '/libfm.conf/,/pref-apps.conf/ d' ${WRKSRC}/data/Makefile.in
+		${WRKSRC}/src/actions/Makefile.am \
+		${WRKSRC}/src/actions/Makefile.in
+	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|; \
+		s|libfm-gtk3.pc||' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/libfm.conf/ d' ${WRKSRC}/data/Makefile.am
 
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|src po|src|' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.am
 .endif
 
-pre-install:
-	@(cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh)
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/libfm
 	${INSTALL_DATA} ${WRKSRC}/data/libfm.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf \
-		${STAGEDIR}${PREFIX}/etc/xdg/libfm/pref-apps.conf.sample
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/libfm/distinfo b/x11/libfm/distinfo
index b62bf484bd57..151a34931e6f 100644
--- a/x11/libfm/distinfo
+++ b/x11/libfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.1.2.2.tar.gz) = 158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682
-SIZE (libfm-1.1.2.2.tar.gz) = 1055591
+SHA256 (libfm-1.2.0.tar.xz) = f0513484e43dcc576097508b7d666f7eb72530963e5a21692034a7ea6a6efc22
+SIZE (libfm-1.2.0.tar.xz) = 890064
diff --git a/x11/libfm/pkg-descr b/x11/libfm/pkg-descr
index a9b1eb36a0b8..925f8d9c8658 100644
--- a/x11/libfm/pkg-descr
+++ b/x11/libfm/pkg-descr
@@ -1,3 +1,3 @@
 Library which provides the core functionality to PCManFM.
 
-WWW: http://pcmanfm.sourceforge.net/
+WWW: http://wiki.lxde.org/en/Libfm
diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist
index 9c4dff474107..6706a8e4a959 100644
--- a/x11/libfm/pkg-plist
+++ b/x11/libfm/pkg-plist
@@ -1,86 +1,109 @@
 bin/libfm-pref-apps
+bin/lxshortcut
 @unexec if cmp -s %D/etc/xdg/libfm/libfm.conf %D/etc/xdg/libfm/libfm.conf.sample; then rm -f %D/etc/xdg/libfm/libfm.conf; fi
 etc/xdg/libfm/libfm.conf.sample
 @exec if [ ! -f %D/etc/xdg/libfm/libfm.conf ] ; then cp -p %D/%F %B/libfm.conf; fi
-@unexec if cmp -s %D/etc/xdg/libfm/pref-apps.conf %D/etc/xdg/libfm/pref-apps.conf.sample; then rm -f %D/etc/xdg/libfm/pref-apps.conf; fi
-etc/xdg/libfm/pref-apps.conf.sample
-@exec if [ ! -f %D/etc/xdg/libfm/pref-apps.conf ] ; then cp -p %D/%F %B/pref-apps.conf; fi
 include/libfm
-include/libfm-1.0/fm-actions.h
-include/libfm-1.0/fm-app-chooser-combo-box.h
-include/libfm-1.0/fm-app-chooser-dlg.h
-include/libfm-1.0/fm-app-info.h
-include/libfm-1.0/fm-app-menu-view.h
-include/libfm-1.0/fm-archiver.h
-include/libfm-1.0/fm-bookmarks.h
-include/libfm-1.0/fm-cell-renderer-pixbuf.h
-include/libfm-1.0/fm-cell-renderer-text.h
-include/libfm-1.0/fm-clipboard.h
-include/libfm-1.0/fm-config.h
-include/libfm-1.0/fm-deep-count-job.h
-include/libfm-1.0/fm-dir-list-job.h
-include/libfm-1.0/fm-dir-tree-model.h
-include/libfm-1.0/fm-dir-tree-view.h
-include/libfm-1.0/fm-dnd-auto-scroll.h
-include/libfm-1.0/fm-dnd-dest.h
-include/libfm-1.0/fm-dnd-src.h
-include/libfm-1.0/fm-dummy-monitor.h
-include/libfm-1.0/fm-file-info-job.h
-include/libfm-1.0/fm-file-info.h
-include/libfm-1.0/fm-file-launcher.h
-include/libfm-1.0/fm-file-menu.h
-include/libfm-1.0/fm-file-ops-job-change-attr.h
-include/libfm-1.0/fm-file-ops-job-delete.h
-include/libfm-1.0/fm-file-ops-job-xfer.h
-include/libfm-1.0/fm-file-ops-job.h
-include/libfm-1.0/fm-file-properties.h
-include/libfm-1.0/fm-file.h
-include/libfm-1.0/fm-folder-model.h
-include/libfm-1.0/fm-folder-view.h
-include/libfm-1.0/fm-folder.h
-include/libfm-1.0/fm-gtk-file-launcher.h
-include/libfm-1.0/fm-gtk-marshal.h
-include/libfm-1.0/fm-gtk-utils.h
-include/libfm-1.0/fm-gtk.h
-include/libfm-1.0/fm-icon-pixbuf.h
-include/libfm-1.0/fm-icon.h
-include/libfm-1.0/fm-job.h
-include/libfm-1.0/fm-list.h
-include/libfm-1.0/fm-marshal.h
-include/libfm-1.0/fm-mime-type.h
-include/libfm-1.0/fm-monitor.h
-include/libfm-1.0/fm-nav-history.h
-include/libfm-1.0/fm-path-bar.h
-include/libfm-1.0/fm-path-entry.h
-include/libfm-1.0/fm-path.h
-include/libfm-1.0/fm-places-model.h
-include/libfm-1.0/fm-places-view.h
-include/libfm-1.0/fm-progress-dlg.h
-include/libfm-1.0/fm-side-pane.h
-include/libfm-1.0/fm-simple-job.h
-include/libfm-1.0/fm-sortable.h
-include/libfm-1.0/fm-standard-view.h
-include/libfm-1.0/fm-tab-label.h
-include/libfm-1.0/fm-thumbnail.h
-include/libfm-1.0/fm-thumbnailer.h
-include/libfm-1.0/fm-utils.h
-include/libfm-1.0/fm.h
+include/libfm-%%MAJORVER%%/fm-actions.h
+include/libfm-%%MAJORVER%%/fm-app-chooser-combo-box.h
+include/libfm-%%MAJORVER%%/fm-app-chooser-dlg.h
+include/libfm-%%MAJORVER%%/fm-app-info.h
+include/libfm-%%MAJORVER%%/fm-app-menu-view.h
+include/libfm-%%MAJORVER%%/fm-archiver.h
+include/libfm-%%MAJORVER%%/fm-bookmarks.h
+include/libfm-%%MAJORVER%%/fm-cell-renderer-pixbuf.h
+include/libfm-%%MAJORVER%%/fm-cell-renderer-text.h
+include/libfm-%%MAJORVER%%/fm-clipboard.h
+include/libfm-%%MAJORVER%%/fm-config.h
+include/libfm-%%MAJORVER%%/fm-deep-count-job.h
+include/libfm-%%MAJORVER%%/fm-dir-list-job.h
+include/libfm-%%MAJORVER%%/fm-dir-tree-model.h
+include/libfm-%%MAJORVER%%/fm-dir-tree-view.h
+include/libfm-%%MAJORVER%%/fm-dnd-auto-scroll.h
+include/libfm-%%MAJORVER%%/fm-dnd-dest.h
+include/libfm-%%MAJORVER%%/fm-dnd-src.h
+include/libfm-%%MAJORVER%%/fm-dummy-monitor.h
+include/libfm-%%MAJORVER%%/fm-extra.h
+include/libfm-%%MAJORVER%%/fm-file-info-job.h
+include/libfm-%%MAJORVER%%/fm-file-info.h
+include/libfm-%%MAJORVER%%/fm-file-launcher.h
+include/libfm-%%MAJORVER%%/fm-file-menu.h
+include/libfm-%%MAJORVER%%/fm-file-ops-job-change-attr.h
+include/libfm-%%MAJORVER%%/fm-file-ops-job-delete.h
+include/libfm-%%MAJORVER%%/fm-file-ops-job-xfer.h
+include/libfm-%%MAJORVER%%/fm-file-ops-job.h
+include/libfm-%%MAJORVER%%/fm-file-properties.h
+include/libfm-%%MAJORVER%%/fm-file.h
+include/libfm-%%MAJORVER%%/fm-folder-config.h
+include/libfm-%%MAJORVER%%/fm-folder-model.h
+include/libfm-%%MAJORVER%%/fm-folder-view.h
+include/libfm-%%MAJORVER%%/fm-folder.h
+include/libfm-%%MAJORVER%%/fm-gtk-file-launcher.h
+include/libfm-%%MAJORVER%%/fm-gtk-marshal.h
+include/libfm-%%MAJORVER%%/fm-gtk-utils.h
+include/libfm-%%MAJORVER%%/fm-gtk.h
+include/libfm-%%MAJORVER%%/fm-icon-pixbuf.h
+include/libfm-%%MAJORVER%%/fm-icon.h
+include/libfm-%%MAJORVER%%/fm-job.h
+include/libfm-%%MAJORVER%%/fm-list.h
+include/libfm-%%MAJORVER%%/fm-marshal.h
+include/libfm-%%MAJORVER%%/fm-menu-tool-item.h
+include/libfm-%%MAJORVER%%/fm-mime-type.h
+include/libfm-%%MAJORVER%%/fm-module.h
+include/libfm-%%MAJORVER%%/fm-monitor.h
+include/libfm-%%MAJORVER%%/fm-nav-history.h
+include/libfm-%%MAJORVER%%/fm-path-bar.h
+include/libfm-%%MAJORVER%%/fm-path-entry.h
+include/libfm-%%MAJORVER%%/fm-path.h
+include/libfm-%%MAJORVER%%/fm-places-model.h
+include/libfm-%%MAJORVER%%/fm-places-view.h
+include/libfm-%%MAJORVER%%/fm-progress-dlg.h
+include/libfm-%%MAJORVER%%/fm-seal.h
+include/libfm-%%MAJORVER%%/fm-side-pane.h
+include/libfm-%%MAJORVER%%/fm-simple-job.h
+include/libfm-%%MAJORVER%%/fm-sortable.h
+include/libfm-%%MAJORVER%%/fm-standard-view.h
+include/libfm-%%MAJORVER%%/fm-tab-label.h
+include/libfm-%%MAJORVER%%/fm-templates.h
+include/libfm-%%MAJORVER%%/fm-terminal.h
+include/libfm-%%MAJORVER%%/fm-thumbnail-loader.h
+include/libfm-%%MAJORVER%%/fm-thumbnail.h
+include/libfm-%%MAJORVER%%/fm-thumbnailer.h
+include/libfm-%%MAJORVER%%/fm-utils.h
+include/libfm-%%MAJORVER%%/fm-version.h
+include/libfm-%%MAJORVER%%/fm-xml-file.h
+include/libfm-%%MAJORVER%%/fm.h
+lib/libfm-extra.a
+lib/libfm-extra.la
+lib/libfm-extra.so
+lib/libfm-extra.so.%%VER%%
 lib/libfm-gtk.a
 lib/libfm-gtk.la
 lib/libfm-gtk.so
-lib/libfm-gtk.so.4
+lib/libfm-gtk.so.%%VER%%
 lib/libfm.a
 lib/libfm.la
 lib/libfm.so
-lib/libfm.so.4
+lib/libfm.so.%%VER%%
+lib/libfm/modules/gtk-fileprop-x-desktop.so
+lib/libfm/modules/gtk-fileprop-x-shortcut.so
+lib/libfm/modules/gtk-menu-actions.so
+lib/libfm/modules/gtk-menu-trash.so
+lib/libfm/modules/vfs-menu.so
+lib/libfm/modules/vfs-search.so
 libdata/pkgconfig/libfm-gtk.pc
-libdata/pkgconfig/libfm-gtk3.pc
 libdata/pkgconfig/libfm.pc
 man/man1/libfm-pref-apps.1.gz
+man/man1/lxshortcut.1.gz
 share/applications/libfm-pref-apps.desktop
+share/applications/lxshortcut.desktop
 %%DATADIR%%/archivers.list
+%%DATADIR%%/images/folder.png
+%%DATADIR%%/images/unknown.png
+%%DATADIR%%/terminals.list
 %%DATADIR%%/ui/app-chooser.ui
 %%DATADIR%%/ui/ask-rename.ui
+%%DATADIR%%/ui/choose-icon.ui
 %%DATADIR%%/ui/exec-file.ui
 %%DATADIR%%/ui/file-prop.ui
 %%DATADIR%%/ui/filesearch.ui
@@ -110,6 +133,7 @@ share/applications/libfm-pref-apps.desktop
 %%NLS%%share/locale/hr/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libfm.mo
+%%NLS%%share/locale/is/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
@@ -121,6 +145,7 @@ share/applications/libfm-pref-apps.desktop
 %%NLS%%share/locale/nb/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/libfm.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/ps/LC_MESSAGES/libfm.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libfm.mo
@@ -153,7 +178,10 @@ share/mime/packages/libfm.xml
 %%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lg
 @dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
-@dirrm include/libfm-1.0
+@dirrm lib/libfm/modules
+@dirrm lib/libfm
+@dirrm include/libfm-%%MAJORVER%%
 @dirrmtry etc/xdg/libfm
 @dirrmtry etc/xdg
diff --git a/x11/lxde-meta/Makefile b/x11/lxde-meta/Makefile
index affefecfdb32..ed9ad23f0a61 100644
--- a/x11/lxde-meta/Makefile
+++ b/x11/lxde-meta/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lxde-meta
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	#none
 DISTFILES=	#none
@@ -18,7 +18,6 @@ RUN_DEPENDS=	openbox:${PORTSDIR}/x11-wm/openbox \
 		lxinput:${PORTSDIR}/sysutils/lxinput \
 		lxtask:${PORTSDIR}/sysutils/lxtask \
 		lxterminal:${PORTSDIR}/sysutils/lxterminal \
-		lxshortcut:${PORTSDIR}/deskutils/lxshortcut \
 		pcmanfm:${PORTSDIR}/x11-fm/pcmanfm \
 		gpicview:${PORTSDIR}/graphics/gpicview \
 		lxde-icon-theme>=0:${PORTSDIR}/x11-themes/lxde-icon-theme \