FreeBSD Bugzilla – Attachment 201341 Details for
Bug 234814
x11/libfm: fix x11-fm/pcmanfm segfault on start.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Everything is building now.
blah.patch (text/plain), 35.45 KB, created by
Alexandre C. GuimarĂ£es
on 2019-01-22 19:59:58 UTC
(
hide
)
Description:
Everything is building now.
Filename:
MIME Type:
Creator:
Alexandre C. GuimarĂ£es
Created:
2019-01-22 19:59:58 UTC
Size:
35.45 KB
patch
obsolete
>Index: x11/Makefile >=================================================================== >--- x11/Makefile (revision 490805) >+++ x11/Makefile (working copy) >@@ -166,6 +166,7 @@ > SUBDIR += libfakekey > SUBDIR += libfm > SUBDIR += libfm-extra >+ SUBDIR += libfm-gtk > SUBDIR += libfm-qt > SUBDIR += libfmqt-l10n > SUBDIR += libgnome >Index: graphics/lximage-qt/Makefile >=================================================================== >--- graphics/lximage-qt/Makefile (revision 490805) >+++ graphics/lximage-qt/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= lximage-qt > PORTVERSION= 0.7.0 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= graphics > MASTER_SITES= LXQT > >@@ -14,7 +14,7 @@ > > LIB_DEPENDS= libexif.so:graphics/libexif \ > libmenu-cache.so:x11/menu-cache \ >- libfm.so:x11/libfm@gtk2 >+ libfm.so:x11/libfm > > USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \ > localbase:ldflags lxqt pkgconfig qt:5 tar:xz >Index: sysutils/lxqt-qtplugin/Makefile >=================================================================== >--- sysutils/lxqt-qtplugin/Makefile (revision 490805) >+++ sysutils/lxqt-qtplugin/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= lxqt-qtplugin > PORTVERSION= 0.13.0 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= sysutils > MASTER_SITES= LXQT > >@@ -13,7 +13,7 @@ > LICENSE= LGPL21+ > > LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \ >- libfm.so:x11/libfm@gtk2 \ >+ libfm.so:x11/libfm \ > libmenu-cache.so:x11/menu-cache \ > libexif.so:graphics/libexif > >Index: x11/libfm/Makefile >=================================================================== >--- x11/libfm/Makefile (revision 490805) >+++ x11/libfm/Makefile (working copy) >@@ -7,64 +7,63 @@ > MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ > > MAINTAINER= portmaster@BSDforge.com >-COMMENT?= Core library of PCManFM file manager >+COMMENT?= LibFM library > > LICENSE= LGPL21 > >-.if ! defined(EXTRA_ONLY) >+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 >+ >+# Slave ports >+_LIBFM_SLAVES= extra core gtk >+_SLAVE_PORT?= core >+ >+.if ${_SLAVE_PORT} == extra >+USE_GNOME+= glib20 >+CONFIGURE_ARGS+= --with-extra-only >+.elif ${_SLAVE_PORT} == core > 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]} >+USES+= shared-mime-info >+USE_GNOME+= glib20 pango >+CONFIGURE_ARGS+= --without-gtk >+.elif ${_SLAVE_PORT} == gtk >+LIB_DEPENDS= libfm.so:x11/libfm \ >+ libmenu-cache.so:x11/menu-cache \ >+ libfontconfig.so:x11-fonts/fontconfig \ >+ libfreetype.so:print/freetype2 > >-gtk3_PKGNAMESUFFIX= -gtk3 >- >-gtk2_CONFLICTS_INSTALL= libfm-gtk3 >-gtk3_CONFLICTS_INSTALL= libfm >-.endif >- >-SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra >- >-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 >- >-.if ! defined(EXTRA_ONLY) >-. if ${FLAVOR:Mgtk2} >-USES+= desktop-file-utils shared-mime-info >+. if ${FLAVOR:U} == gtk2 >+USES+= desktop-file-utils > USE_GNOME+= gtk20 cairo gdkpixbuf2 > CONFIGURE_ARGS+= --with-gtk=2 >-PLIST_SUB= GTKVERSION=gtk >-. elif ${FLAVOR:Mgtk3} >-USES+= desktop-file-utils shared-mime-info >+. elif ${FLAVOR:U} == gtk3 >+USES+= desktop-file-utils > USE_GNOME+= gtk30 cairo gdkpixbuf2 > CONFIGURE_ARGS+= --with-gtk=3 >-PLIST_SUB= GTKVERSION=gtk3 >-. endif >-.else >-USE_GNOME+= glib20 >-CONFIGURE_ARGS+= --with-extra-only >+. endif > .endif > > INSTALL_TARGET= install-strip > >+.if ${_SLAVE_PORT} == gtk > OPTIONS_DEFINE= NLS > OPTIONS_SUB= yes > > NLS_USES= gettext-runtime:build > NLS_CONFIGURE_ENABLE= nls >+.endif > > post-extract: >-.if ! defined(EXTRA_ONLY) >+.if ${_SLAVE_PORT} == core > @${MV} ${WRKSRC}/data/libfm.conf \ > ${WRKSRC}/data/libfm.conf.sample > .endif >@@ -76,25 +75,53 @@ > ${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \ > /@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in > >-.if ! defined(EXTRA_ONLY) >- ${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \ >- ${WRKSRC}/Makefile.in >+.if ${_SLAVE_PORT} == core >+ ${REINPLACE_CMD} -e 's|libfm.conf|libfm.conf.sample|' \ >+ ${WRKSRC}/data/Makefile.in > >+ ${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|; \ >+ s|= src po data|= src data|; \ >+ /@LIBFM_GTK_PC@/d' ${WRKSRC}/Makefile.in >+ > ${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s|^|@EXTRALIB_ONLY_TRUE@|; \ >+ /$$(LIBFM_EXTRA_INCLUDES)/d ; \ >+ /$$(LIBFM_GTK_INCLUDES)/d ; \ > /FALSE@lib_LTLIBRARIES/s| libfm-extra.la||; \ >- s|libfm-extra.la \\|-lfm-extra \\|' \ >+ s|libfm-extra.la \\|-lfm-extra \\|; \ >+ s| @LIBFM_GTK_LTLIBRARIES@||' \ > ${WRKSRC}/src/Makefile.in > >+ ${REINPLACE_CMD} -e 's|$$(top_builddir)/src/libfm-extra.la|-lfm-extra|' \ >+ ${WRKSRC}/src/modules/Makefile.in >+ > ${REINPLACE_CMD} -e 's|-@FMLIBVER@||' ${WRKSRC}/src/actions/Makefile.in >+.elif ${_SLAVE_PORT} == gtk >+ ${REINPLACE_CMD} -e 's|libfm.pc libfm-gtk.pc libfm-gtk3.pc \\|libfm-gtk.pc libfm-gtk3.pc|; \ >+ /libfm-extra.pc.in/d ; \ >+ s|libfm-extra.pc||g ; \ >+ /libfm.pc/d' ${WRKSRC}/Makefile.in > >- ${REINPLACE_CMD} -e '/^vfs_menu_la_DEPENDENCIES/{s| \\||;n;d;}; \ >- /^vfs_menu_la_LIBADD/s|$$(top.*|-lfm-extra|' \ >+ ${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s|^|@EXTRALIB_ONLY_TRUE@|; \ >+ /$$(LIBFM_INCLUDES)/d ; \ >+ /$$(LIBFM_EXTRA_INCLUDES)/d ; \ >+ /FALSE@lib_LTLIBRARIES/s| libfm-extra.la libfm.la||; \ >+ s|libfm-extra.la \\|-lfm-extra \\|; \ >+ s|libfm.la \\|-lfm \\|' \ >+ ${WRKSRC}/src/Makefile.in >+ >+ ${REINPLACE_CMD} -e 's|$$(top_builddir)/src/libfm.la|-lfm|; \ >+ /vfs-menu.la/d ; \ >+ /vfs-search.la/d' \ > ${WRKSRC}/src/modules/Makefile.in > >- ${REINPLACE_CMD} -e 's|libfm.conf|libfm.conf.sample|' \ >- ${WRKSRC}/data/Makefile.in >+ ${REINPLACE_CMD} -e 's|$$(top_builddir)/src/libfm.la|-lfm|g' \ >+ ${WRKSRC}/src/tests/Makefile.in > >+ ${REINPLACE_CMD} -e 's|-@FMLIBVER@||' ${WRKSRC}/src/actions/Makefile.in >+.endif >+ > post-install: >+.if ${_SLAVE_PORT} == core > ${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \ > ${STAGEDIR}${PREFIX}/include/${PORTNAME} > .endif >Index: x11/libfm/pkg-plist >=================================================================== >--- x11/libfm/pkg-plist (revision 490805) >+++ x11/libfm/pkg-plist (working copy) >@@ -1,160 +1,46 @@ >-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-%%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.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-%%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: x11/libfm-extra/Makefile >=================================================================== >--- x11/libfm-extra/Makefile (revision 490805) >+++ x11/libfm-extra/Makefile (working copy) >@@ -2,6 +2,7 @@ > # $FreeBSD$ > > PORTNAME= libfm >+PORTREVISION= 1 > PKGNAMESUFFIX= -extra > > MAINTAINER= ports@FreeBSD.org >@@ -18,7 +19,7 @@ > > USE_LDCONFIG= yes > >-EXTRA_ONLY= yes >+_SLAVE_PORT= extra > > OPTIONS_EXCLUDE= NLS > >Index: x11/libfm-gtk/Makefile >=================================================================== >--- x11/libfm-gtk/Makefile (revision 490723) >+++ x11/libfm-gtk/Makefile (working copy) >@@ -1,102 +1,34 @@ >-# Created by: Kris Moore <kmoore@FreeBSD.org> >+# Created by: Olivier Duchateau > # $FreeBSD$ > > PORTNAME= libfm >-DISTVERSION= 1.3.1 >-CATEGORIES= x11 >-MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ >+PKGNAMESUFFIX= -gtk > >-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 >+.if ${FLAVOR:U} == gtk2 >+COMMENT= LibFM library with GTK+ 2 support > >-gtk2_CONFLICTS_INSTALL= libfm-gtk3 >-gtk3_CONFLICTS_INSTALL= libfm >-.endif >+PLIST_SUB= GTKVERSION=gtk >+.elif ${FLAVOR:U} == gtk3 >+COMMENT= LibFM library with GTK+ 3 support > >-SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra >- >-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 >- >-.if ! defined(EXTRA_ONLY) >-. if ${FLAVOR:Mgtk2} >-USES+= desktop-file-utils shared-mime-info >-USE_GNOME+= gtk20 cairo gdkpixbuf2 >-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+= glib20 >-CONFIGURE_ARGS+= --with-extra-only > .endif > >-INSTALL_TARGET= install-strip >+gtk2_PKGNAMESUFFIX= -gtk2 >+gtk2_CONFLICTS_INSTALL= libfm-gtk3 >+gtk3_PKGNAMESUFFIX= -gtk3 >+gtk3_CONFLICTS_INSTALL= libfm-gtk2 > >-OPTIONS_DEFINE= NLS >-OPTIONS_SUB= yes >+_SLAVE_PORT= gtk > >-NLS_USES= gettext-runtime:build >-NLS_CONFIGURE_ENABLE= nls >+MASTERDIR= ${.CURDIR}/../../x11/libfm > >-post-extract: >-.if ! defined(EXTRA_ONLY) >- @${MV} ${WRKSRC}/data/libfm.conf \ >- ${WRKSRC}/data/libfm.conf.sample >-.endif >+DESCR= ${.CURDIR}/pkg-descr >+FILESDIR= ${.CURDIR}/files >+PATCHDIR= ${.CURDIR}/files >+PLIST= ${.CURDIR}/pkg-plist > >-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 >- >-.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 <bsd.port.mk> >+.include "${MASTERDIR}/Makefile" >Index: x11/libfm-gtk/files/patch-data_Makefile.in >=================================================================== >--- x11/libfm-gtk/files/patch-data_Makefile.in (nonexistent) >+++ x11/libfm-gtk/files/patch-data_Makefile.in (working copy) >@@ -0,0 +1,189 @@ >+--- data/Makefile.in.orig 2018-12-17 19:18:43 UTC >++++ data/Makefile.in >+@@ -158,12 +158,11 @@ am__uninstall_files_from_dir = { \ >+ } >+ man1dir = $(mandir)/man1 >+ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \ >+- "$(DESTDIR)$(libfmconfdir)" "$(DESTDIR)$(libfmdatafilesdir)" \ >+- "$(DESTDIR)$(libfmimagesdir)" "$(DESTDIR)$(mimedir)" >++ "$(DESTDIR)$(libfmimagesdir)" >+ NROFF = nroff >+ MANS = $(man_MANS) >+-DATA = $(desktop_DATA) $(libfmconf_DATA) $(libfmdatafiles_DATA) \ >+- $(libfmimages_DATA) $(mime_DATA) >++DATA = $(desktop_DATA) \ >++ $(libfmimages_DATA) >+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ >+ distclean-recursive maintainer-clean-recursive >+ am__recursive_targets = \ >+@@ -402,12 +401,6 @@ NULL = >+ SUBDIRS = ui >+ man_files = libfm-pref-apps.1 lxshortcut.1 >+ @ENABLE_GTK_TRUE@man_MANS = $(man_files) >+-mimedir = $(datadir)/mime/packages >+-mime_DATA = libfm.xml >+-libfmconfdir = $(sysconfdir)/xdg/libfm >+-libfmconf_DATA = \ >+- libfm.conf \ >+- $(NULL) >+ >+ desktop_in_files = \ >+ libfm-pref-apps.desktop.in \ >+@@ -417,11 +410,6 @@ desktop_in_files = \ >+ desktop_files = $(desktop_in_files:.desktop.in=.desktop) >+ @ENABLE_GTK_TRUE@desktopdir = $(datadir)/applications >+ @ENABLE_GTK_TRUE@desktop_DATA = $(desktop_files) >+-libfmdatafilesdir = $(datadir)/libfm >+-libfmdatafiles_DATA = \ >+- archivers.list \ >+- terminals.list \ >+- $(NULL) >+ >+ libfmimages_files = \ >+ images/unknown.png \ >+@@ -431,10 +419,7 @@ libfmimages_files = \ >+ @ENABLE_GTK_TRUE@libfmimagesdir = $(datadir)/libfm/images >+ @ENABLE_GTK_TRUE@libfmimages_DATA = $(libfmimages_files) >+ EXTRA_DIST = \ >+- $(libfmconf_DATA) \ >+ $(man_files) \ >+- $(mime_DATA) \ >+- $(libfmdatafiles_DATA) \ >+ $(desktop_in_files) \ >+ $(desktop_files) \ >+ $(libfmimages_files) \ >+@@ -546,48 +531,6 @@ uninstall-desktopDATA: >+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ >+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) >+-install-libfmconfDATA: $(libfmconf_DATA) >+- @$(NORMAL_INSTALL) >+- @list='$(libfmconf_DATA)'; test -n "$(libfmconfdir)" || list=; \ >+- if test -n "$$list"; then \ >+- echo " $(MKDIR_P) '$(DESTDIR)$(libfmconfdir)'"; \ >+- $(MKDIR_P) "$(DESTDIR)$(libfmconfdir)" || exit 1; \ >+- fi; \ >+- for p in $$list; do \ >+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ >+- echo "$$d$$p"; \ >+- done | $(am__base_list) | \ >+- while read files; do \ >+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libfmconfdir)'"; \ >+- $(INSTALL_DATA) $$files "$(DESTDIR)$(libfmconfdir)" || exit $$?; \ >+- done >+- >+-uninstall-libfmconfDATA: >+- @$(NORMAL_UNINSTALL) >+- @list='$(libfmconf_DATA)'; test -n "$(libfmconfdir)" || list=; \ >+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+- dir='$(DESTDIR)$(libfmconfdir)'; $(am__uninstall_files_from_dir) >+-install-libfmdatafilesDATA: $(libfmdatafiles_DATA) >+- @$(NORMAL_INSTALL) >+- @list='$(libfmdatafiles_DATA)'; test -n "$(libfmdatafilesdir)" || list=; \ >+- if test -n "$$list"; then \ >+- echo " $(MKDIR_P) '$(DESTDIR)$(libfmdatafilesdir)'"; \ >+- $(MKDIR_P) "$(DESTDIR)$(libfmdatafilesdir)" || exit 1; \ >+- fi; \ >+- for p in $$list; do \ >+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ >+- echo "$$d$$p"; \ >+- done | $(am__base_list) | \ >+- while read files; do \ >+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libfmdatafilesdir)'"; \ >+- $(INSTALL_DATA) $$files "$(DESTDIR)$(libfmdatafilesdir)" || exit $$?; \ >+- done >+- >+-uninstall-libfmdatafilesDATA: >+- @$(NORMAL_UNINSTALL) >+- @list='$(libfmdatafiles_DATA)'; test -n "$(libfmdatafilesdir)" || list=; \ >+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+- dir='$(DESTDIR)$(libfmdatafilesdir)'; $(am__uninstall_files_from_dir) >+ install-libfmimagesDATA: $(libfmimages_DATA) >+ @$(NORMAL_INSTALL) >+ @list='$(libfmimages_DATA)'; test -n "$(libfmimagesdir)" || list=; \ >+@@ -609,28 +552,7 @@ uninstall-libfmimagesDATA: >+ @list='$(libfmimages_DATA)'; test -n "$(libfmimagesdir)" || list=; \ >+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+ dir='$(DESTDIR)$(libfmimagesdir)'; $(am__uninstall_files_from_dir) >+-install-mimeDATA: $(mime_DATA) >+- @$(NORMAL_INSTALL) >+- @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ >+- if test -n "$$list"; then \ >+- echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \ >+- $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \ >+- fi; \ >+- for p in $$list; do \ >+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ >+- echo "$$d$$p"; \ >+- done | $(am__base_list) | \ >+- while read files; do \ >+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \ >+- $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \ >+- done >+ >+-uninstall-mimeDATA: >+- @$(NORMAL_UNINSTALL) >+- @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ >+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ >+- dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir) >+- >+ # This directory's subdirectories are mostly independent; you can cd >+ # into them and run 'make' without going through this Makefile. >+ # To change the values of 'make' variables: instead of editing Makefiles, >+@@ -790,7 +712,7 @@ check: check-recursive >+ all-am: Makefile $(MANS) $(DATA) >+ installdirs: installdirs-recursive >+ installdirs-am: >+- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(libfmconfdir)" "$(DESTDIR)$(libfmdatafilesdir)" "$(DESTDIR)$(libfmimagesdir)" "$(DESTDIR)$(mimedir)"; do \ >++ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(libfmimagesdir)"; do \ >+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ >+ done >+ install: install-recursive >+@@ -843,9 +765,8 @@ info: info-recursive >+ >+ info-am: >+ >+-install-data-am: install-desktopDATA install-libfmconfDATA \ >+- install-libfmdatafilesDATA install-libfmimagesDATA install-man \ >+- install-mimeDATA >++install-data-am: install-desktopDATA \ >++ install-libfmimagesDATA install-man >+ >+ install-dvi: install-dvi-recursive >+ >+@@ -889,9 +810,9 @@ ps: ps-recursive >+ >+ ps-am: >+ >+-uninstall-am: uninstall-desktopDATA uninstall-libfmconfDATA \ >+- uninstall-libfmdatafilesDATA uninstall-libfmimagesDATA \ >+- uninstall-man uninstall-mimeDATA >++uninstall-am: uninstall-desktopDATA \ >++ uninstall-libfmimagesDATA \ >++ uninstall-man >+ >+ uninstall-man: uninstall-man1 >+ >+@@ -904,16 +825,16 @@ uninstall-man: uninstall-man1 >+ install install-am install-data install-data-am \ >+ install-desktopDATA install-dvi install-dvi-am install-exec \ >+ install-exec-am install-html install-html-am install-info \ >+- install-info-am install-libfmconfDATA \ >+- install-libfmdatafilesDATA install-libfmimagesDATA install-man \ >+- install-man1 install-mimeDATA install-pdf install-pdf-am \ >++ install-info-am \ >++ install-libfmimagesDATA install-man \ >++ install-man1 install-pdf install-pdf-am \ >+ install-ps install-ps-am install-strip installcheck \ >+ installcheck-am installdirs installdirs-am maintainer-clean \ >+ maintainer-clean-generic mostlyclean mostlyclean-generic \ >+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ >+- uninstall-am uninstall-desktopDATA uninstall-libfmconfDATA \ >+- uninstall-libfmdatafilesDATA uninstall-libfmimagesDATA \ >+- uninstall-man uninstall-man1 uninstall-mimeDATA >++ uninstall-am uninstall-desktopDATA \ >++ uninstall-libfmimagesDATA \ >++ uninstall-man uninstall-man1 >+ >+ .PRECIOUS: Makefile >+ > >Property changes on: x11/libfm-gtk/files/patch-data_Makefile.in >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11/libfm-gtk/pkg-descr >=================================================================== >--- x11/libfm-gtk/pkg-descr (revision 490723) >+++ x11/libfm-gtk/pkg-descr (working copy) >@@ -1,3 +1,3 @@ >-Library which provides the core functionality to PCManFM. >+Gtk support of LibFM library. > > WWW: http://wiki.lxde.org/en/Libfm >Index: x11/libfm-gtk/pkg-plist >=================================================================== >--- x11/libfm-gtk/pkg-plist (revision 490723) >+++ x11/libfm-gtk/pkg-plist (working copy) >@@ -1,95 +1,46 @@ > 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-%%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.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-%%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 >@@ -98,63 +49,62 @@ > %%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 >+share/locale/af/LC_MESSAGES/libfm.mo >+share/locale/ar/LC_MESSAGES/libfm.mo >+share/locale/be/LC_MESSAGES/libfm.mo >+share/locale/bg/LC_MESSAGES/libfm.mo >+share/locale/bn/LC_MESSAGES/libfm.mo >+share/locale/bn_IN/LC_MESSAGES/libfm.mo >+share/locale/ca/LC_MESSAGES/libfm.mo >+share/locale/cs/LC_MESSAGES/libfm.mo >+share/locale/da/LC_MESSAGES/libfm.mo >+share/locale/de/LC_MESSAGES/libfm.mo >+share/locale/el/LC_MESSAGES/libfm.mo >+share/locale/en_GB/LC_MESSAGES/libfm.mo >+share/locale/es/LC_MESSAGES/libfm.mo >+share/locale/et/LC_MESSAGES/libfm.mo >+share/locale/eu/LC_MESSAGES/libfm.mo >+share/locale/fa/LC_MESSAGES/libfm.mo >+share/locale/fi/LC_MESSAGES/libfm.mo >+share/locale/fo/LC_MESSAGES/libfm.mo >+share/locale/fr/LC_MESSAGES/libfm.mo >+share/locale/gl/LC_MESSAGES/libfm.mo >+share/locale/he/LC_MESSAGES/libfm.mo >+share/locale/hr/LC_MESSAGES/libfm.mo >+share/locale/hu/LC_MESSAGES/libfm.mo >+share/locale/id/LC_MESSAGES/libfm.mo >+share/locale/is/LC_MESSAGES/libfm.mo >+share/locale/it/LC_MESSAGES/libfm.mo >+share/locale/ja/LC_MESSAGES/libfm.mo >+share/locale/kk/LC_MESSAGES/libfm.mo >+share/locale/ko/LC_MESSAGES/libfm.mo >+share/locale/lg/LC_MESSAGES/libfm.mo >+share/locale/lt/LC_MESSAGES/libfm.mo >+share/locale/ml/LC_MESSAGES/libfm.mo >+share/locale/ms/LC_MESSAGES/libfm.mo >+share/locale/nb/LC_MESSAGES/libfm.mo >+share/locale/nl/LC_MESSAGES/libfm.mo >+share/locale/nn/LC_MESSAGES/libfm.mo >+share/locale/pa/LC_MESSAGES/libfm.mo >+share/locale/pl/LC_MESSAGES/libfm.mo >+share/locale/ps/LC_MESSAGES/libfm.mo >+share/locale/pt/LC_MESSAGES/libfm.mo >+share/locale/pt_BR/LC_MESSAGES/libfm.mo >+share/locale/ro/LC_MESSAGES/libfm.mo >+share/locale/ru/LC_MESSAGES/libfm.mo >+share/locale/sk/LC_MESSAGES/libfm.mo >+share/locale/sl/LC_MESSAGES/libfm.mo >+share/locale/sr/LC_MESSAGES/libfm.mo >+share/locale/sr@latin/LC_MESSAGES/libfm.mo >+share/locale/sv/LC_MESSAGES/libfm.mo >+share/locale/te/LC_MESSAGES/libfm.mo >+share/locale/th/LC_MESSAGES/libfm.mo >+share/locale/tr/LC_MESSAGES/libfm.mo >+share/locale/tt_RU/LC_MESSAGES/libfm.mo >+share/locale/ug/LC_MESSAGES/libfm.mo >+share/locale/uk/LC_MESSAGES/libfm.mo >+share/locale/ur/LC_MESSAGES/libfm.mo >+share/locale/ur_PK/LC_MESSAGES/libfm.mo >+share/locale/vi/LC_MESSAGES/libfm.mo >+share/locale/zh_CN/LC_MESSAGES/libfm.mo >+share/locale/zh_TW/LC_MESSAGES/libfm.mo >Index: x11/libfm-qt/Makefile >=================================================================== >--- x11/libfm-qt/Makefile (revision 490805) >+++ x11/libfm-qt/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= libfm-qt > PORTVERSION= 0.13.0 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= x11 > MASTER_SITES= LXQT > >@@ -12,7 +12,7 @@ > > LICENSE= LGPL21+ > >-LIB_DEPENDS= libfm.so:x11/libfm@gtk2 \ >+LIB_DEPENDS= libfm.so:x11/libfm \ > libmenu-cache.so:x11/menu-cache \ > libexif.so:graphics/libexif > >Index: x11/lxhotkey/Makefile >=================================================================== >--- x11/lxhotkey/Makefile (revision 490805) >+++ x11/lxhotkey/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= lxhotkey > PORTVERSION= 0.1.0 >+PORTREVISION= 1 > CATEGORIES= x11 > MASTER_SITES= SF/lxde/LXHotkey/ > >@@ -13,7 +14,8 @@ > LICENSE_FILE= ${WRKSRC}/COPYING > > LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \ >- libfm.so:x11/libfm@gtk2 \ >+ libfm.so:x11/libfm \ >+ libfm-gtk.so:x11/libfm-gtk@gtk2 \ > libfontconfig.so:x11-fonts/fontconfig \ > libfreetype.so:print/freetype2 \ > libunistring.so:devel/libunistring >Index: x11/lxpanel/Makefile >=================================================================== >--- x11/lxpanel/Makefile (revision 490805) >+++ x11/lxpanel/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= lxpanel > PORTVERSION= 0.9.3 >+PORTREVISION= 1 > CATEGORIES= x11 > MASTER_SITES= SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION:R}.x/ > >@@ -15,7 +16,8 @@ > > LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ > libkeybinder.so:x11/keybinder \ >- libfm-gtk.so:x11/libfm@gtk2 \ >+ libfm.so:x11/libfm \ >+ libfm-gtk.so:x11/libfm-gtk@gtk2 \ > libfontconfig.so:x11-fonts/fontconfig \ > libfreetype.so:print/freetype2 > RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data >Index: x11-fm/pcmanfm/Makefile >=================================================================== >--- x11-fm/pcmanfm/Makefile (revision 490805) >+++ x11-fm/pcmanfm/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= pcmanfm > PORTVERSION= 1.3.1 >+PORTREVISION= 1 > CATEGORIES= x11-fm > MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ > >@@ -12,7 +13,8 @@ > LICENSE= GPLv2 > > LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ >- libfreetype.so:print/freetype2 >+ libfreetype.so:print/freetype2 \ >+ libfm.so:x11/libfm > > FLAVORS= gtk2 gtk3 > FLAVOR?= ${FLAVORS:[1]} >@@ -19,8 +21,8 @@ > > gtk3_PKGNAMESUFFIX= -gtk3 > >-gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm@gtk2 >-gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3 >+gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm-gtk@gtk2 >+gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm-gtk@gtk3 > > gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3 > gtk3_CONFLICTS_INSTALL= pcmanfm >Index: x11-fm/pcmanfm-qt/Makefile >=================================================================== >--- x11-fm/pcmanfm-qt/Makefile (revision 490805) >+++ x11-fm/pcmanfm-qt/Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= pcmanfm-qt > PORTVERSION= 0.13.0 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= x11-fm > MASTER_SITES= LXQT > >@@ -13,7 +13,7 @@ > LICENSE= GPLv2 > > LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ >- libfm.so:x11/libfm@gtk2 \ >+ libfm.so:x11/libfm \ > libexif.so:graphics/libexif > > USES= cmake compiler:c++11-lib desktop-file-utils \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 234814
:
200978
|
201081
|
201136
|
201138
|
201296
|
201299
|
201341
|
201364