Index: head/graphics/lximage-qt/Makefile =================================================================== --- head/graphics/lximage-qt/Makefile (revision 489578) +++ head/graphics/lximage-qt/Makefile (revision 489579) @@ -1,28 +1,28 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= lximage-qt PORTVERSION= 0.7.0 PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= LXQT MAINTAINER= jsm@FreeBSD.org COMMENT= Image viewer and screenshot tool 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 USE_GNOME= glib20 USE_QT= buildtools_build qmake_build core dbus gui linguisttools \ network printsupport svg widgets x11extras USE_LXQT= buildtools libfmqt USE_XORG= ice sm x11 xcb xext xfixes INSTALLS_ICONS= yes .include Index: head/sysutils/lxqt-qtplugin/Makefile =================================================================== --- head/sysutils/lxqt-qtplugin/Makefile (revision 489578) +++ head/sysutils/lxqt-qtplugin/Makefile (revision 489579) @@ -1,31 +1,31 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= lxqt-qtplugin PORTVERSION= 0.13.0 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= LXQT MAINTAINER= jsm@FreeBSD.org 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 USES= cmake compiler:c++11-lib kde:5 lxqt pkgconfig tar:xz qt:5 gettext-runtime USE_XORG=xcb USE_GNOME=glib20 USE_QT= buildtools_build qmake_build core dbus gui svg widgets \ x11extras xml USE_KDE= windowsystem USE_LXQT= buildtools qtxdg libfmqt USE_LDCONFIG= yes PLIST_FILES= ${QT_PLUGINDIR}/platformthemes/libqtlxqt.so .include Index: head/x11/libfm/Makefile =================================================================== --- head/x11/libfm/Makefile (revision 489578) +++ head/x11/libfm/Makefile (revision 489579) @@ -1,85 +1,102 @@ # Created by: Kris Moore # $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/ MAINTAINER= portmaster@BSDforge.com COMMENT?= Core library of PCManFM file manager LICENSE= LGPL21 .if ! defined(EXTRA_ONLY) BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ valac:lang/vala LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ libexif.so:graphics/libexif \ 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 post-patch: ${REINPLACE_CMD} -e 's|^[[:blank:]]\{5,\}USE_NLS=yes|#&|' \ ${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 ${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s|^|@EXTRALIB_ONLY_TRUE@|; \ /FALSE@lib_LTLIBRARIES/s| libfm-extra.la||; \ s|libfm-extra.la \\|-lfm-extra \\|' \ ${WRKSRC}/src/Makefile.in ${REINPLACE_CMD} -e 's|-@FMLIBVER@||' ${WRKSRC}/src/actions/Makefile.in ${REINPLACE_CMD} -e '/^vfs_menu_la_DEPENDENCIES/{s| \\||;n;d;}; \ /^vfs_menu_la_LIBADD/s|$$(top.*|-lfm-extra|' \ ${WRKSRC}/src/modules/Makefile.in ${REINPLACE_CMD} -e 's|libfm.conf|libfm.conf.sample|' \ ${WRKSRC}/data/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \ ${STAGEDIR}${PREFIX}/include/${PORTNAME} .endif .include Index: head/x11/libfm/distinfo =================================================================== --- head/x11/libfm/distinfo (revision 489578) +++ head/x11/libfm/distinfo (revision 489579) @@ -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 Index: head/x11/libfm/pkg-plist =================================================================== --- head/x11/libfm/pkg-plist (revision 489578) +++ head/x11/libfm/pkg-plist (revision 489579) @@ -1,159 +1,160 @@ 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 include/libfm/fm-app-info.h include/libfm/fm-app-menu-view.h include/libfm/fm-archiver.h include/libfm/fm-bookmarks.h include/libfm/fm-cell-renderer-pixbuf.h include/libfm/fm-cell-renderer-text.h include/libfm/fm-clipboard.h include/libfm/fm-config.h include/libfm/fm-deep-count-job.h include/libfm/fm-dir-list-job.h include/libfm/fm-dir-tree-model.h include/libfm/fm-dir-tree-view.h include/libfm/fm-dnd-auto-scroll.h include/libfm/fm-dnd-dest.h include/libfm/fm-dnd-src.h include/libfm/fm-dummy-monitor.h include/libfm/fm-file-info-job.h include/libfm/fm-file-info.h include/libfm/fm-file-launcher.h include/libfm/fm-file-menu.h include/libfm/fm-file-ops-job-change-attr.h include/libfm/fm-file-ops-job-delete.h include/libfm/fm-file-ops-job-xfer.h include/libfm/fm-file-ops-job.h include/libfm/fm-file-properties.h include/libfm/fm-file.h include/libfm/fm-folder-config.h include/libfm/fm-folder-model.h include/libfm/fm-folder-view.h include/libfm/fm-folder.h include/libfm/fm-gtk-file-launcher.h include/libfm/fm-gtk-marshal.h include/libfm/fm-gtk-utils.h include/libfm/fm-gtk.h include/libfm/fm-icon-pixbuf.h include/libfm/fm-icon.h include/libfm/fm-job.h include/libfm/fm-list.h include/libfm/fm-marshal.h include/libfm/fm-menu-tool-item.h include/libfm/fm-mime-type.h include/libfm/fm-module.h include/libfm/fm-monitor.h include/libfm/fm-nav-history.h include/libfm/fm-path-bar.h include/libfm/fm-path-entry.h include/libfm/fm-path.h include/libfm/fm-places-model.h include/libfm/fm-places-view.h include/libfm/fm-progress-dlg.h include/libfm/fm-seal.h include/libfm/fm-side-pane.h include/libfm/fm-simple-job.h include/libfm/fm-sortable.h include/libfm/fm-standard-view.h include/libfm/fm-tab-label.h include/libfm/fm-templates.h include/libfm/fm-terminal.h include/libfm/fm-thumbnail-loader.h 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 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 %%DATADIR%%/ui/preferred-apps.ui %%DATADIR%%/ui/progress.ui %%NLS%%share/locale/af/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ar/LC_MESSAGES/libfm.mo %%NLS%%share/locale/be/LC_MESSAGES/libfm.mo %%NLS%%share/locale/bg/LC_MESSAGES/libfm.mo %%NLS%%share/locale/bn/LC_MESSAGES/libfm.mo %%NLS%%share/locale/bn_IN/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ca/LC_MESSAGES/libfm.mo %%NLS%%share/locale/cs/LC_MESSAGES/libfm.mo %%NLS%%share/locale/da/LC_MESSAGES/libfm.mo %%NLS%%share/locale/de/LC_MESSAGES/libfm.mo %%NLS%%share/locale/el/LC_MESSAGES/libfm.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/libfm.mo %%NLS%%share/locale/es/LC_MESSAGES/libfm.mo %%NLS%%share/locale/et/LC_MESSAGES/libfm.mo %%NLS%%share/locale/eu/LC_MESSAGES/libfm.mo %%NLS%%share/locale/fa/LC_MESSAGES/libfm.mo %%NLS%%share/locale/fi/LC_MESSAGES/libfm.mo %%NLS%%share/locale/fo/LC_MESSAGES/libfm.mo %%NLS%%share/locale/fr/LC_MESSAGES/libfm.mo %%NLS%%share/locale/gl/LC_MESSAGES/libfm.mo %%NLS%%share/locale/he/LC_MESSAGES/libfm.mo %%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 %%NLS%%share/locale/ko/LC_MESSAGES/libfm.mo %%NLS%%share/locale/lg/LC_MESSAGES/libfm.mo %%NLS%%share/locale/lt/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ml/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ms/LC_MESSAGES/libfm.mo %%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 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ro/LC_MESSAGES/libfm.mo %%NLS%%share/locale/ru/LC_MESSAGES/libfm.mo %%NLS%%share/locale/sk/LC_MESSAGES/libfm.mo %%NLS%%share/locale/sl/LC_MESSAGES/libfm.mo %%NLS%%share/locale/sr/LC_MESSAGES/libfm.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/libfm.mo %%NLS%%share/locale/sv/LC_MESSAGES/libfm.mo %%NLS%%share/locale/te/LC_MESSAGES/libfm.mo %%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 %%NLS%%share/locale/vi/LC_MESSAGES/libfm.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libfm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libfm.mo share/mime/packages/libfm.xml Index: head/x11/libfm-extra/pkg-plist =================================================================== --- head/x11/libfm-extra/pkg-plist (revision 489578) +++ head/x11/libfm-extra/pkg-plist (revision 489579) @@ -1,7 +1,7 @@ include/libfm/fm-extra.h 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 Index: head/x11/libfm-qt/Makefile =================================================================== --- head/x11/libfm-qt/Makefile (revision 489578) +++ head/x11/libfm-qt/Makefile (revision 489579) @@ -1,30 +1,30 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= libfm-qt PORTVERSION= 0.13.0 PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= LXQT MAINTAINER= mbeis@xs4all.nl 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 USES= cmake compiler:c++11-lib gettext-runtime lxqt pkgconfig \ qt:5 shared-mime-info tar:xz USE_QT= buildtools_build qmake_build core gui linguisttools widgets \ x11extras USE_GNOME= glib20 USE_XORG= xcb USE_LXQT= buildtools post-install: ${RM} -Rf ${STAGEDIR}${PREFIX}/include/${PORTNAME}/tests/ .include Index: head/x11/lxhotkey/Makefile =================================================================== --- head/x11/lxhotkey/Makefile (revision 489578) +++ head/x11/lxhotkey/Makefile (revision 489579) @@ -1,31 +1,31 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= lxhotkey PORTVERSION= 0.1.0 CATEGORIES= x11 MASTER_SITES= SF/lxde/LXHotkey/ MAINTAINER= ports@FreeBSD.org COMMENT= Keyboard shortcuts settings 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 USES= gettext-tools gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2 USE_XORG= x11 CONFIGURE_ARGS= --with-gtk=2 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lxhotkey/*.so .include Index: head/x11/lxpanel/Makefile =================================================================== --- head/x11/lxpanel/Makefile (revision 489578) +++ head/x11/lxpanel/Makefile (revision 489579) @@ -1,56 +1,56 @@ # Created by: Lin, Cheng-Tao # $FreeBSD$ PORTNAME= lxpanel PORTVERSION= 0.9.3 CATEGORIES= x11 MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION:R}.x/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight X11 desktop panel LICENSE= GPLv2+ MIT LICENSE_COMB= multi 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 USE_GNOME= glib20 gtk20 cairo gdkpixbuf2 libwnck intltool USE_XORG= x11 USES= gmake libtool localbase pathfix pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugins="${LXPANEL_PLUGINS}" INSTALL_TARGET= install-strip # Panel plugins LXPANEL_PLUGINS= "-netstat,-netstatus,deskno,-batt,kbled,xkb,-thermal,cpu,cpufreq,monitors,-indicator" OPTIONS_SINGLE= SOUND OPTIONS_SINGLE_SOUND= ALSA OSS OPTIONS_DEFINE= NLS WEATHER OPTIONS_DEFAULT= OSS WEATHER OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa ALSA_VARS= lxpanel_plugins+=",-volume,volumealsa" OSS_VARS= lxpanel_plugins+=",volume,-volumealsa" NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-tools WEATHER_USE= gnome=libxml2 WEATHER_VARS= lxpanel_plugins+=",weather" WEATHER_VARS_OFF= lxpanel_plugins+=",-weather" WEATHER_DESC= Weather plugin post-patch-NLS-off: @${REINPLACE_CMD} -e 's|po man|man|' \ ${WRKSRC}/Makefile.in .include Index: head/x11-fm/pcmanfm/Makefile =================================================================== --- head/x11-fm/pcmanfm/Makefile (revision 489578) +++ head/x11-fm/pcmanfm/Makefile (revision 489579) @@ -1,39 +1,56 @@ # Created by: Martin Tournoij # $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/ MAINTAINER= portmaster@BSDforge.com 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: ${REINPLACE_CMD} -e 's|pcmanfm.conf|pcmanfm.conf.sample|' \ ${WRKSRC}/data/Makefile.in .include Index: head/x11-fm/pcmanfm/distinfo =================================================================== --- head/x11-fm/pcmanfm/distinfo (revision 489578) +++ head/x11-fm/pcmanfm/distinfo (revision 489579) @@ -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 Index: head/x11-fm/pcmanfm-qt/Makefile =================================================================== --- head/x11-fm/pcmanfm-qt/Makefile (revision 489578) +++ head/x11-fm/pcmanfm-qt/Makefile (revision 489579) @@ -1,28 +1,28 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= pcmanfm-qt PORTVERSION= 0.13.0 PORTREVISION= 2 CATEGORIES= x11-fm MASTER_SITES= LXQT MAINTAINER= mbeis@xs4all.nl 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 \ gettext-runtime localbase:ldflags lxqt pkgconfig kde:5 qt:5 tar:xz USE_QT= buildtools_build qmake_build core dbus gui linguisttools \ widgets x11extras USE_KDE= oxygen-icons5 USE_LXQT= buildtools libfmqt USE_GNOME= glib20 USE_XORG= xcb .include