12 files changed, 76 insertions, 41 deletions

diff --git a/graphics/lximage-qt/Makefile b/graphics/lximage-qt/Makefile
index 7082d1aaddb6..3f48503710b1 100644
--- a/graphics/lximage-qt/Makefile
+++ b/graphics/lximage-qt/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 	libmenu-cache.so:x11/menu-cache \
-	libfm.so:x11/libfm
+	libfm.so:x11/libfm@gtk2
 
 USES=	cmake compiler:c++11-lib desktop-file-utils gettext-runtime \
 	localbase:ldflags lxqt pkgconfig qt:5 tar:xz
diff --git a/sysutils/lxqt-qtplugin/Makefile b/sysutils/lxqt-qtplugin/Makefile
index 4c46ef255eca..d58cdef6182b 100644
--- a/sysutils/lxqt-qtplugin/Makefile
+++ b/sysutils/lxqt-qtplugin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LXQt system integration plugin for Qt
 LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
-		libfm.so:x11/libfm \
+		libfm.so:x11/libfm@gtk2 \
 		libmenu-cache.so:x11/menu-cache \
 		libexif.so:graphics/libexif
 
diff --git a/x11-fm/pcmanfm-qt/Makefile b/x11-fm/pcmanfm-qt/Makefile
index 3bf883f46e1f..7fa273cef92a 100644
--- a/x11-fm/pcmanfm-qt/Makefile
+++ b/x11-fm/pcmanfm-qt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LXQt file manager
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
-		libfm.so:x11/libfm \
+		libfm.so:x11/libfm@gtk2 \
 		libexif.so:graphics/libexif
 
 USES=		cmake compiler:c++11-lib desktop-file-utils \
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 46691c0f4c78..31a554e014d0 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pcmanfm
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
 
@@ -11,25 +11,42 @@ COMMENT=	PCMan File Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfm-gtk.so:x11/libfm \
-		libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		desktop-file-utils gettext gmake libtool localbase pkgconfig \
-		tar:xz
-GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 gtk20 cairo pango gdkpixbuf2 intltool intlhack
+FLAVORS=	gtk2 gtk3
+FLAVOR?=	${FLAVORS:[1]}
+
+gtk3_PKGNAMESUFFIX=	-gtk3
+
+gtk2_LIB_DEPENDS=	libfm-gtk.so:x11/libfm@gtk2
+gtk3_LIB_DEPENDS=	libfm-gtk3.so:x11/libfm@gtk3
+
+gtk2_CONFLICTS_INSTALL=	pcmanfm-gtk3
+gtk3_CONFLICTS_INSTALL=	pcmanfm
+
+USES=		desktop-file-utils gmake gnome gettext libtool localbase \
+		pkgconfig tar:xz
+USE_GNOME=	cairo gdkpixbuf2 intltool
 USE_XORG=	x11
+GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=--with-gtk=2
+.if ${FLAVOR:Mgtk2}
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS=	--with-gtk=2
+.elif ${FLAVOR:Mgtk3}
+USE_GNOME+=	gtk30
+CONFIGURE_ARGS=	--with-gtk=3
+.endif
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
+
+NLS_USES=	gettext-tools:build
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES_OFF=	gettext-tools
 
 post-extract:
-	${MV} ${WRKSRC}/data/pcmanfm.conf \
+	@${MV} ${WRKSRC}/data/pcmanfm.conf \
 		${WRKSRC}/data/pcmanfm.conf.sample
 
 post-patch:
diff --git a/x11-fm/pcmanfm/distinfo b/x11-fm/pcmanfm/distinfo
index c28de98ecbef..a9c77f390a60 100644
--- a/x11-fm/pcmanfm/distinfo
+++ b/x11-fm/pcmanfm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482343112
-SHA256 (pcmanfm-1.2.5.tar.xz) = 0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67
-SIZE (pcmanfm-1.2.5.tar.xz) = 417808
+TIMESTAMP = 1545853766
+SHA256 (pcmanfm-1.3.1.tar.xz) = 6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855
+SIZE (pcmanfm-1.3.1.tar.xz) = 423380
diff --git a/x11/libfm-extra/pkg-plist b/x11/libfm-extra/pkg-plist
index beb61c48498f..867729f45676 100644
--- a/x11/libfm-extra/pkg-plist
+++ b/x11/libfm-extra/pkg-plist
@@ -3,5 +3,5 @@ include/libfm/fm-version.h
 include/libfm/fm-xml-file.h
 lib/libfm-extra.so
 lib/libfm-extra.so.4
-lib/libfm-extra.so.4.0.5
+lib/libfm-extra.so.4.1.2
 libdata/pkgconfig/libfm-extra.pc
diff --git a/x11/libfm-qt/Makefile b/x11/libfm-qt/Makefile
index 1d4b726c1462..426cb5724f56 100644
--- a/x11/libfm-qt/Makefile
+++ b/x11/libfm-qt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qt port of libfm
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libfm.so:x11/libfm \
+LIB_DEPENDS=	libfm.so:x11/libfm@gtk2 \
 	libmenu-cache.so:x11/menu-cache \
 	libexif.so:graphics/libexif
 
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 82686a81846c..9ef4842f6e6e 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libfm
-PORTVERSION=	1.2.5
+DISTVERSION=	1.3.1
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
 
@@ -19,35 +19,53 @@ LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfm-extra.so:x11/libfm-extra
+
+FLAVORS=	gtk2 gtk3
+FLAVOR?=	${FLAVORS:[1]}
+
+gtk3_PKGNAMESUFFIX=	-gtk3
+
+gtk2_CONFLICTS_INSTALL=	libfm-gtk3
+gtk3_CONFLICTS_INSTALL=	libfm
 .endif
 
 SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra
 
-USES=		gettext-tools gmake libtool localbase pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 intltool
+USES=		gettext-tools gmake gnome libtool localbase \
+		pkgconfig tar:xz
+USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static
-INSTALL_TARGET=	install-strip
 
 .if ! defined(EXTRA_ONLY)
+.  if ${FLAVOR:Mgtk2}
 USES+=		desktop-file-utils shared-mime-info
 USE_GNOME+=	gtk20 cairo gdkpixbuf2
-CONFIGURE_ARGS+=--with-gtk=2
+CONFIGURE_ARGS+=	--with-gtk=2
+PLIST_SUB=	GTKVERSION=gtk
+.  elif ${FLAVOR:Mgtk3}
+USES+=		desktop-file-utils shared-mime-info
+USE_GNOME+=	gtk30 cairo gdkpixbuf2
+CONFIGURE_ARGS+=	--with-gtk=3
+PLIST_SUB=	GTKVERSION=gtk3
+.  endif
 .else
-USE_GNOME+=	intltool intlhack
-CONFIGURE_ARGS+=--with-extra-only
+USE_GNOME+=	glib20
+CONFIGURE_ARGS+=	--with-extra-only
 .endif
 
+INSTALL_TARGET=	install-strip
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext-runtime
+NLS_USES=	gettext-runtime:build
 NLS_CONFIGURE_ENABLE=	nls
 
 post-extract:
-.if !defined(EXTRA_ONLY)
-	${MV} ${WRKSRC}/data/libfm.conf \
+.if ! defined(EXTRA_ONLY)
+	@${MV} ${WRKSRC}/data/libfm.conf \
 		${WRKSRC}/data/libfm.conf.sample
 .endif
 
@@ -56,10 +74,9 @@ post-patch:
 		${WRKSRC}/configure
 
 	${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \
-		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \
-		${WRKSRC}/src/Makefile.in
+		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in
 
-.if !defined(EXTRA_ONLY)
+.if ! defined(EXTRA_ONLY)
 	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
 		${WRKSRC}/Makefile.in
 
diff --git a/x11/libfm/distinfo b/x11/libfm/distinfo
index 50ed1b124a67..27ec42563195 100644
--- a/x11/libfm/distinfo
+++ b/x11/libfm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481474043
-SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a
-SIZE (libfm-1.2.5.tar.xz) = 912740
+TIMESTAMP = 1545853830
+SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
+SIZE (libfm-1.3.1.tar.xz) = 940632
diff --git a/x11/libfm/pkg-plist b/x11/libfm/pkg-plist
index bb3447203ca9..1fad10ceb85d 100644
--- a/x11/libfm/pkg-plist
+++ b/x11/libfm/pkg-plist
@@ -1,6 +1,7 @@
 bin/libfm-pref-apps
 bin/lxshortcut
 @sample etc/xdg/libfm/libfm.conf.sample
+include/libfm/fm-action.h
 include/libfm/fm-actions.h
 include/libfm/fm-app-chooser-combo-box.h
 include/libfm/fm-app-chooser-dlg.h
@@ -67,19 +68,19 @@ include/libfm/fm-thumbnail.h
 include/libfm/fm-thumbnailer.h
 include/libfm/fm-utils.h
 include/libfm/fm.h
-lib/libfm-gtk.so
-lib/libfm-gtk.so.4
-lib/libfm-gtk.so.4.0.5
+lib/libfm-%%GTKVERSION%%.so
+lib/libfm-%%GTKVERSION%%.so.4
+lib/libfm-%%GTKVERSION%%.so.4.1.2
 lib/libfm.so
 lib/libfm.so.4
-lib/libfm.so.4.0.5
+lib/libfm.so.4.1.2
 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-%%GTKVERSION%%.pc
 libdata/pkgconfig/libfm.pc
 man/man1/libfm-pref-apps.1.gz
 man/man1/lxshortcut.1.gz
diff --git a/x11/lxhotkey/Makefile b/x11/lxhotkey/Makefile
index dcfa21a403ca..60d4488d9f99 100644
--- a/x11/lxhotkey/Makefile
+++ b/x11/lxhotkey/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfm-extra.so:x11/libfm-extra \
-	libfm.so:x11/libfm \
+	libfm.so:x11/libfm@gtk2 \
 	libfontconfig.so:x11-fonts/fontconfig \
 	libfreetype.so:print/freetype2 \
 	libunistring.so:devel/libunistring
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index c2c51f11fc74..c796317a2ccc 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 		libkeybinder.so:x11/keybinder \
-		libfm-gtk.so:x11/libfm \
+		libfm-gtk.so:x11/libfm@gtk2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data