Index: head/x11/libfm/Makefile =================================================================== --- head/x11/libfm/Makefile (revision 428371) +++ head/x11/libfm/Makefile (revision 428372) @@ -1,89 +1,85 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= libfm -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 CATEGORIES= x11 MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= olivierd@FreeBSD.org 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 + libexif.so:graphics/libexif \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libfm-extra.so:x11/libfm-extra .endif SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra -USES= gettext-tools gmake libtool pathfix pkgconfig tar:xz +USES= gettext-tools gmake libtool localbase pathfix pkgconfig tar:xz USE_GNOME= glib20 intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .if ! defined(EXTRA_ONLY) USES+= desktop-file-utils shared-mime-info -USE_GNOME+= gtk20 +USE_GNOME+= gtk20 cairo gdkpixbuf2 CONFIGURE_ARGS+=--with-gtk=2 .else USE_GNOME+= intltool intlhack CONFIGURE_ARGS+=--with-extra-only .endif -MICRO_VERSION= 0.4 -ABI_VERSION= 4 -PLIST_SUB+= MICRO_VERSION=${MICRO_VERSION} \ - ABI_VERSION=${ABI_VERSION} - -PORTDOCS= AUTHORS NEWS README - -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls +post-extract: +.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 -.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 -post-install: - ${MV} ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf.sample + ${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} - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .include Index: head/x11/libfm/distinfo =================================================================== --- head/x11/libfm/distinfo (revision 428371) +++ head/x11/libfm/distinfo (revision 428372) @@ -1,2 +1,3 @@ -SHA256 (libfm-1.2.4.tar.xz) = 7804f6f28cb3d1bc8ffb3151ab7ff0c063b27c5f9b06c682eb903e01cf25502f -SIZE (libfm-1.2.4.tar.xz) = 912164 +TIMESTAMP = 1481474043 +SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a +SIZE (libfm-1.2.5.tar.xz) = 912740 Index: head/x11/libfm/pkg-plist =================================================================== --- head/x11/libfm/pkg-plist (revision 428371) +++ head/x11/libfm/pkg-plist (revision 428372) @@ -1,159 +1,159 @@ bin/libfm-pref-apps bin/lxshortcut @sample etc/xdg/libfm/libfm.conf.sample 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.%%ABI_VERSION%% -lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm-gtk.so.4 +lib/libfm-gtk.so.4.0.5 lib/libfm.so -lib/libfm.so.%%ABI_VERSION%% -lib/libfm.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm.so.4 +lib/libfm.so.4.0.5 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.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/Makefile =================================================================== --- head/x11/libfm-extra/Makefile (revision 428371) +++ head/x11/libfm-extra/Makefile (revision 428372) @@ -1,25 +1,25 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= libfm PKGNAMESUFFIX= -extra -MAINTAINER= ports@FreeBSD.org +MAINTAINER= olivierd@FreeBSD.org COMMENT= LibFM-Extra library LICENSE= LGPL21 MASTERDIR= ${.CURDIR}/../${PORTNAME} DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist USE_LDCONFIG= yes EXTRA_ONLY= yes -OPTIONS_EXCLUDE=DOCS NLS +OPTIONS_EXCLUDE= NLS .include "${MASTERDIR}/Makefile" Index: head/x11/libfm-extra/pkg-plist =================================================================== --- head/x11/libfm-extra/pkg-plist (revision 428371) +++ head/x11/libfm-extra/pkg-plist (revision 428372) @@ -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.%%ABI_VERSION%% -lib/libfm-extra.so.%%ABI_VERSION%%.%%MICRO_VERSION%% +lib/libfm-extra.so.4 +lib/libfm-extra.so.4.0.5 libdata/pkgconfig/libfm-extra.pc