Index: x11-fm/pcmanfm/Makefile =================================================================== --- x11-fm/pcmanfm/Makefile +++ x11-fm/pcmanfm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pcmanfm -PORTVERSION= 1.2.5 +PORTVERSION= 1.3.0 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ @@ -11,25 +11,42 @@ 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: Index: x11-fm/pcmanfm/distinfo =================================================================== --- x11-fm/pcmanfm/distinfo +++ 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 = 1531956880 +SHA256 (pcmanfm-1.3.0.tar.xz) = 5a693e9bf3f3294f0ee7264c1c1a600a88ee27d1572e7dd5c4b0e84aa7778ffb +SIZE (pcmanfm-1.3.0.tar.xz) = 422836 Index: x11/libfm-extra/pkg-plist =================================================================== --- x11/libfm-extra/pkg-plist +++ x11/libfm-extra/pkg-plist @@ -3,5 +3,5 @@ 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.1 libdata/pkgconfig/libfm-extra.pc Index: x11/libfm/Makefile =================================================================== --- x11/libfm/Makefile +++ x11/libfm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libfm -PORTVERSION= 1.2.5 +DISTVERSION= 1.3.0.2 CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ @@ -19,35 +19,53 @@ 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 + +gtk3_PLIST= gtk3.pkg-plist .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 +. elif ${FLAVOR:Mgtk3} +USES+= desktop-file-utils shared-mime-info +USE_GNOME+= gtk30 cairo gdkpixbuf2 +CONFIGURE_ARGS+= --with-gtk=3 +. endif .else -USE_GNOME+= intltool intlhack -CONFIGURE_ARGS+=--with-extra-only +USE_GNOME+= glib20 +CONFIGURE_ARGS+= --with-extra-only .endif OPTIONS_DEFINE= NLS OPTIONS_SUB= yes -NLS_USES= gettext-runtime +NLS_USES= gettext-runtime:build NLS_CONFIGURE_ENABLE= nls +INSTALL_TARGET= install-strip + 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 @@ ${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 @@ -83,3 +100,4 @@ .endif .include + Index: x11/libfm/distinfo =================================================================== --- x11/libfm/distinfo +++ 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 = 1531957278 +SHA256 (libfm-1.3.0.2.tar.xz) = 18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72 +SIZE (libfm-1.3.0.2.tar.xz) = 939376 Index: x11/libfm/gtk3.pkg-plist =================================================================== --- /dev/null +++ x11/libfm/gtk3.pkg-plist @@ -0,0 +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-gtk3.so +lib/libfm-gtk3.so.4 +lib/libfm-gtk3.so.4.1.1 +lib/libfm.so +lib/libfm.so.4 +lib/libfm.so.4.1.1 +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-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 +%%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: x11/libfm/pkg-plist =================================================================== --- x11/libfm/pkg-plist +++ 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 @@ -69,10 +70,10 @@ include/libfm/fm.h lib/libfm-gtk.so lib/libfm-gtk.so.4 -lib/libfm-gtk.so.4.0.5 +lib/libfm-gtk.so.4.1.1 lib/libfm.so lib/libfm.so.4 -lib/libfm.so.4.0.5 +lib/libfm.so.4.1.1 lib/libfm/modules/gtk-fileprop-x-desktop.so lib/libfm/modules/gtk-fileprop-x-shortcut.so lib/libfm/modules/gtk-menu-actions.so