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, 43 insertions, 14 deletions

diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 4e0f28941d7..218d6422bfa 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pcmanfm
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
 
@@ -12,27 +11,33 @@ COMMENT=	PCMan File Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libfm-gtk.so.4:${PORTSDIR}/x11/libfm
+LIB_DEPENDS=	libfm-gtk.so:${PORTSDIR}/x11/libfm
 
-USES=		fam gmake pkgconfig
+USE_XZ=		yes
+USES=		desktop-file-utils fam gmake pathfix pkgconfig
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	aclocal automake libtool
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	NLS
+PORTDOCS=	AUTHORS NEWS
+
+OPTIONS_DEFINE=	DEBUG DOCS NLS
 OPTIONS_SUB=	yes
 
+DEBUG_CONFIGURE_ENABLE=	debug
+
 NLS_USES=	gettext
 
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e '/pcmanfm.conf/ d' ${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e '/pcmanfm.conf/ d' ${WRKSRC}/data/Makefile.am
+
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|src po|src|' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.am
 .endif
 
 post-install:
@@ -40,4 +45,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/pcmanfm.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/pcmanfm/default/pcmanfm.conf.sample
 
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/x11-fm/pcmanfm/distinfo b/x11-fm/pcmanfm/distinfo
index f1880f45adc..9c69e2dd6e6 100644
--- a/x11-fm/pcmanfm/distinfo
+++ b/x11-fm/pcmanfm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pcmanfm-1.1.2.tar.gz) = 23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950
-SIZE (pcmanfm-1.1.2.tar.gz) = 434785
+SHA256 (pcmanfm-1.2.0.tar.xz) = 52d0eec6ee3dc3dce801c24db506c6a6556d030c8c9d9f90cdf9c9db8e9cbab2
+SIZE (pcmanfm-1.2.0.tar.xz) = 399548
diff --git a/x11-fm/pcmanfm/files/patch-src__Makefile.am b/x11-fm/pcmanfm/files/patch-src__Makefile.am
new file mode 100644
index 00000000000..0fabe6ab93e
--- /dev/null
+++ b/x11-fm/pcmanfm/files/patch-src__Makefile.am
@@ -0,0 +1,13 @@
+--- ./src/Makefile.am.orig	2014-01-06 23:55:25.000000000 +0000
++++ ./src/Makefile.am	2014-02-23 09:58:26.669238176 +0000
+@@ -49,3 +49,10 @@
+ 	$(XLIB_LIBS) \
+ 	$(FM_LIBS) \
+ 	$(NULL)
++
++# create plugins' directory anyway
++install-exec-hook:
++	$(MKDIR_P) $(DESTDIR)$(libdir)/pcmanfm
++
++uninstall-hook:
++	-rmdir $(DESTDIR)$(libdir)/pcmanfm
diff --git a/x11-fm/pcmanfm/pkg-descr b/x11-fm/pcmanfm/pkg-descr
index 9150d3e39ae..7d31d04bde1 100644
--- a/x11-fm/pcmanfm/pkg-descr
+++ b/x11-fm/pcmanfm/pkg-descr
@@ -17,4 +17,4 @@ o Provide icon view and detailed list view
 o Standard compliant (Follows FreeDesktop.org)
 o Clean and user-friendly interface (GTK+ 2)
 
-WWW: http://pcmanfm.sourceforge.net/
+WWW: http://wiki.lxde.org/en/PCManFM
diff --git a/x11-fm/pcmanfm/pkg-plist b/x11-fm/pcmanfm/pkg-plist
index f3aa2d4ed5b..e2de4ada95e 100644
--- a/x11-fm/pcmanfm/pkg-plist
+++ b/x11-fm/pcmanfm/pkg-plist
@@ -2,6 +2,7 @@ bin/pcmanfm
 @unexec if cmp -s %D/etc/xdg/pcmanfm/default/pcmanfm.conf %D/etc/xdg/pcmanfm/default/pcmanfm.conf.sample; then rm -f %D/etc/xdg/pcmanfm/default/pcmanfm.conf; fi
 etc/xdg/pcmanfm/default/pcmanfm.conf.sample
 @exec if [ ! -f %D/etc/xdg/pcmanfm/default/pcmanfm.conf ] ; then cp -p %D/%F %B/pcmanfm.conf; fi
+include/pcmanfm-modules.h
 man/man1/pcmanfm.1.gz
 share/applications/pcmanfm-desktop-pref.desktop
 share/applications/pcmanfm.desktop
@@ -27,6 +28,7 @@ share/applications/pcmanfm.desktop
 %%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/is/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pcmanfm.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/pcmanfm.mo
@@ -60,10 +62,16 @@ share/applications/pcmanfm.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanfm.mo
 %%DATADIR%%/ui/about.ui
 %%DATADIR%%/ui/autorun.ui
+%%DATADIR%%/ui/connect.ui
 %%DATADIR%%/ui/desktop-pref.ui
 %%DATADIR%%/ui/pref.ui
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/ui
+@dirrmtry %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tt_RU
+%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lg
+@dirrmtry lib/pcmanfm
 @dirrmtry etc/xdg/pcmanfm/default
 @dirrmtry etc/xdg/pcmanfm
 @dirrmtry etc/xdg