svn commit: r383743 - in head/x11: . libfm libfm-extra libfm-extra/files libfm/files
Olivier Duchateau
olivierd at FreeBSD.org
Fri Apr 10 17:08:05 UTC 2015
Author: olivierd
Date: Fri Apr 10 17:08:00 2015
New Revision: 383743
URL: https://svnweb.freebsd.org/changeset/ports/383743
Log:
- Update to 1.2.3
- Adjust LICENSE and dependencies
- Fix USES= gettext-* when NLS option is not set
- Remove STATIC option
Add x11-libfm-extra to avoid circular dependency (required for
x11/menu-cache >= 1.0.0 and x11/libfm >= 1.2.3)
PR: 198773 (based on)
Submitted by: myself
Approved by: maintainer (timeout 3 weeks)
Added:
head/x11/libfm-extra/
- copied from r383742, head/x11/libfm/
head/x11/libfm-extra/files/
head/x11/libfm-extra/files/patch-src_Makefile.in (contents, props changed)
head/x11/libfm/files/
head/x11/libfm/files/patch-configure (contents, props changed)
head/x11/libfm/files/patch-src_Makefile.in (contents, props changed)
head/x11/libfm/files/patch-src_actions_Makefile.in (contents, props changed)
head/x11/libfm/files/patch-src_modules_Makefile.in (contents, props changed)
Modified:
head/x11/Makefile
head/x11/libfm-extra/Makefile
head/x11/libfm-extra/distinfo
head/x11/libfm-extra/pkg-plist
head/x11/libfm/Makefile
head/x11/libfm/distinfo
head/x11/libfm/pkg-plist
Modified: head/x11/Makefile
==============================================================================
--- head/x11/Makefile Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/Makefile Fri Apr 10 17:08:00 2015 (r383743)
@@ -161,6 +161,7 @@
SUBDIR += libdnd
SUBDIR += libexo
SUBDIR += libfm
+ SUBDIR += libfm-extra
SUBDIR += libgnome
SUBDIR += libgnome-reference
SUBDIR += libgnomekbd
Modified: head/x11/libfm-extra/Makefile
==============================================================================
--- head/x11/libfm/Makefile Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm-extra/Makefile Fri Apr 10 17:08:00 2015 (r383743)
@@ -1,51 +1,29 @@
# Created by: Kris Moore <kmoore at FreeBSD.org>
# $FreeBSD$
-PORTNAME= libfm
-PORTVERSION= 1.2.2.1
+PORTNAME= libfm-extra
+PORTVERSION= 1.2.3
CATEGORIES= x11
-MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
+MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
+DISTNAME= libfm-${PORTVERSION}
MAINTAINER= horia at racoviceanu.com
-COMMENT= LibFM backend library to PCManFM
+COMMENT= Core library of PCManFM file manager
-LICENSE= GPLv2
+LICENSE= LGPL21
-BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
- valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
- libexif.so:${PORTSDIR}/graphics/libexif
-
-USES= desktop-file-utils fam gmake libtool pathfix pkgconfig \
- shared-mime-info tar:xz
-USE_GNOME= gtk20
+USES= gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= glib20 intltool intlhack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc
-CPPFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-PORTDOCS= AUTHORS NEWS README
+WRKSRC= ${WRKDIR}/libfm-${PORTVERSION}
-OPTIONS_DEFINE= DOCS NLS STATIC
-OPTIONS_SUB= yes
+EXTRA_PATCHES+= ${.CURDIR}/../libfm/files/patch-configure
-NLS_USES= gettext
-NLS_CONFIGURE_ENABLE= nls
-STATIC_CONFIGURE_ENABLE= static
-
-PLIST_SUB+= MAJORVER=1.0
-PLIST_SUB+= VER=4
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
- ${WRKSRC}/src/Makefile.in
-
-post-install:
- ${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
- ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --with-extra-only \
+ --disable-static \
+ --disable-nls
.include <bsd.port.mk>
Modified: head/x11/libfm-extra/distinfo
==============================================================================
--- head/x11/libfm/distinfo Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm-extra/distinfo Fri Apr 10 17:08:00 2015 (r383743)
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.2.2.1.tar.xz) = dbb0a3f7fd9615cccf4ad8ed1a07591535712d00eede03e5bd564090b33a4329
-SIZE (libfm-1.2.2.1.tar.xz) = 894092
+SHA256 (libfm-1.2.3.tar.xz) = c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9
+SIZE (libfm-1.2.3.tar.xz) = 898256
Added: head/x11/libfm-extra/files/patch-src_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/libfm-extra/files/patch-src_Makefile.in Fri Apr 10 17:08:00 2015 (r383743)
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig 2014-10-14 16:46:21 UTC
++++ src/Makefile.in
+@@ -497,7 +497,7 @@ am__relativize = \
+ reldir="$$dir2"
+
+ # we use common include directory for all headers
+-pkgincludedir = $(includedir)/@PACKAGE at -@FMLIBVER@
++pkgincludedir = $(includedir)/@PACKAGE@
+ ACLOCAL = @ACLOCAL@
+ ACTIONS_SUBDIR = @ACTIONS_SUBDIR@
+ ALL_LINGUAS = @ALL_LINGUAS@
+@@ -3079,7 +3079,6 @@ install-data-local:
+ rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+ fi
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+- @LN_S@ @PACKAGE at -@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
+
+ uninstall-local:
+ @if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
Modified: head/x11/libfm-extra/pkg-plist
==============================================================================
--- head/x11/libfm/pkg-plist Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm-extra/pkg-plist Fri Apr 10 17:08:00 2015 (r383743)
@@ -1,170 +1,7 @@
-bin/libfm-pref-apps
-bin/lxshortcut
- at sample etc/xdg/libfm/libfm.conf.sample
-include/libfm
-include/libfm-%%MAJORVER%%/fm-actions.h
-include/libfm-%%MAJORVER%%/fm-app-chooser-combo-box.h
-include/libfm-%%MAJORVER%%/fm-app-chooser-dlg.h
-include/libfm-%%MAJORVER%%/fm-app-info.h
-include/libfm-%%MAJORVER%%/fm-app-menu-view.h
-include/libfm-%%MAJORVER%%/fm-archiver.h
-include/libfm-%%MAJORVER%%/fm-bookmarks.h
-include/libfm-%%MAJORVER%%/fm-cell-renderer-pixbuf.h
-include/libfm-%%MAJORVER%%/fm-cell-renderer-text.h
-include/libfm-%%MAJORVER%%/fm-clipboard.h
-include/libfm-%%MAJORVER%%/fm-config.h
-include/libfm-%%MAJORVER%%/fm-deep-count-job.h
-include/libfm-%%MAJORVER%%/fm-dir-list-job.h
-include/libfm-%%MAJORVER%%/fm-dir-tree-model.h
-include/libfm-%%MAJORVER%%/fm-dir-tree-view.h
-include/libfm-%%MAJORVER%%/fm-dnd-auto-scroll.h
-include/libfm-%%MAJORVER%%/fm-dnd-dest.h
-include/libfm-%%MAJORVER%%/fm-dnd-src.h
-include/libfm-%%MAJORVER%%/fm-dummy-monitor.h
-include/libfm-%%MAJORVER%%/fm-extra.h
-include/libfm-%%MAJORVER%%/fm-file-info-job.h
-include/libfm-%%MAJORVER%%/fm-file-info.h
-include/libfm-%%MAJORVER%%/fm-file-launcher.h
-include/libfm-%%MAJORVER%%/fm-file-menu.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-change-attr.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-delete.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-xfer.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job.h
-include/libfm-%%MAJORVER%%/fm-file-properties.h
-include/libfm-%%MAJORVER%%/fm-file.h
-include/libfm-%%MAJORVER%%/fm-folder-config.h
-include/libfm-%%MAJORVER%%/fm-folder-model.h
-include/libfm-%%MAJORVER%%/fm-folder-view.h
-include/libfm-%%MAJORVER%%/fm-folder.h
-include/libfm-%%MAJORVER%%/fm-gtk-file-launcher.h
-include/libfm-%%MAJORVER%%/fm-gtk-marshal.h
-include/libfm-%%MAJORVER%%/fm-gtk-utils.h
-include/libfm-%%MAJORVER%%/fm-gtk.h
-include/libfm-%%MAJORVER%%/fm-icon-pixbuf.h
-include/libfm-%%MAJORVER%%/fm-icon.h
-include/libfm-%%MAJORVER%%/fm-job.h
-include/libfm-%%MAJORVER%%/fm-list.h
-include/libfm-%%MAJORVER%%/fm-marshal.h
-include/libfm-%%MAJORVER%%/fm-menu-tool-item.h
-include/libfm-%%MAJORVER%%/fm-mime-type.h
-include/libfm-%%MAJORVER%%/fm-module.h
-include/libfm-%%MAJORVER%%/fm-monitor.h
-include/libfm-%%MAJORVER%%/fm-nav-history.h
-include/libfm-%%MAJORVER%%/fm-path-bar.h
-include/libfm-%%MAJORVER%%/fm-path-entry.h
-include/libfm-%%MAJORVER%%/fm-path.h
-include/libfm-%%MAJORVER%%/fm-places-model.h
-include/libfm-%%MAJORVER%%/fm-places-view.h
-include/libfm-%%MAJORVER%%/fm-progress-dlg.h
-include/libfm-%%MAJORVER%%/fm-seal.h
-include/libfm-%%MAJORVER%%/fm-side-pane.h
-include/libfm-%%MAJORVER%%/fm-simple-job.h
-include/libfm-%%MAJORVER%%/fm-sortable.h
-include/libfm-%%MAJORVER%%/fm-standard-view.h
-include/libfm-%%MAJORVER%%/fm-tab-label.h
-include/libfm-%%MAJORVER%%/fm-templates.h
-include/libfm-%%MAJORVER%%/fm-terminal.h
-include/libfm-%%MAJORVER%%/fm-thumbnail-loader.h
-include/libfm-%%MAJORVER%%/fm-thumbnail.h
-include/libfm-%%MAJORVER%%/fm-thumbnailer.h
-include/libfm-%%MAJORVER%%/fm-utils.h
-include/libfm-%%MAJORVER%%/fm-version.h
-include/libfm-%%MAJORVER%%/fm-xml-file.h
-include/libfm-%%MAJORVER%%/fm.h
-%%STATIC%%lib/libfm-extra.a
+include/libfm/fm-extra.h
+include/libfm/fm-version.h
+include/libfm/fm-xml-file.h
lib/libfm-extra.so
-lib/libfm-extra.so.%%VER%%
-lib/libfm-extra.so.%%VER%%.0.2
-%%STATIC%%lib/libfm-gtk.a
-lib/libfm-gtk.so
-lib/libfm-gtk.so.%%VER%%
-lib/libfm-gtk.so.%%VER%%.0.2
-%%STATIC%%lib/libfm.a
-lib/libfm.so
-lib/libfm.so.%%VER%%
-lib/libfm.so.%%VER%%.0.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
+lib/libfm-extra.so.4
+lib/libfm-extra.so.4.0.3
libdata/pkgconfig/libfm-extra.pc
-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 at 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
Modified: head/x11/libfm/Makefile
==============================================================================
--- head/x11/libfm/Makefile Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm/Makefile Fri Apr 10 17:08:00 2015 (r383743)
@@ -2,45 +2,41 @@
# $FreeBSD$
PORTNAME= libfm
-PORTVERSION= 1.2.2.1
+PORTVERSION= 1.2.3
CATEGORIES= x11
-MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
+MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
MAINTAINER= horia at racoviceanu.com
-COMMENT= LibFM backend library to PCManFM
+COMMENT= Core library of PCManFM file manager
-LICENSE= GPLv2
+LICENSE= LGPL21
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
valac:${PORTSDIR}/lang/vala
LIB_DEPENDS= libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
libexif.so:${PORTSDIR}/graphics/libexif
-USES= desktop-file-utils fam gmake libtool pathfix pkgconfig \
- shared-mime-info tar:xz
-USE_GNOME= gtk20
+USES= desktop-file-utils gmake libtool pathfix pkgconfig \
+ shared-mime-info gettext-tools tar:xz
+USE_GNOME= glib20 gtk20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc
+CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static \
+ --with-gtk=2
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
PORTDOCS= AUTHORS NEWS README
-OPTIONS_DEFINE= DOCS NLS STATIC
+OPTIONS_DEFINE= DOCS NLS
+NLS_USES= gettext-runtime
+NLS_CONFIGURE_ENABLE= nls
OPTIONS_SUB= yes
-NLS_USES= gettext
-NLS_CONFIGURE_ENABLE= nls
-STATIC_CONFIGURE_ENABLE= static
-
-PLIST_SUB+= MAJORVER=1.0
-PLIST_SUB+= VER=4
-
post-patch:
- @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
- ${WRKSRC}/src/Makefile.in
+ ${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
+ ${WRKSRC}/Makefile.in
post-install:
${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
Modified: head/x11/libfm/distinfo
==============================================================================
--- head/x11/libfm/distinfo Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm/distinfo Fri Apr 10 17:08:00 2015 (r383743)
@@ -1,2 +1,2 @@
-SHA256 (libfm-1.2.2.1.tar.xz) = dbb0a3f7fd9615cccf4ad8ed1a07591535712d00eede03e5bd564090b33a4329
-SIZE (libfm-1.2.2.1.tar.xz) = 894092
+SHA256 (libfm-1.2.3.tar.xz) = c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9
+SIZE (libfm-1.2.3.tar.xz) = 898256
Added: head/x11/libfm/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/libfm/files/patch-configure Fri Apr 10 17:08:00 2015 (r383743)
@@ -0,0 +1,11 @@
+--- configure.orig 2014-10-14 16:46:23 UTC
++++ configure
+@@ -14933,7 +14933,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
+
+ fi
+ fi
+- USE_NLS=yes
++# USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
Added: head/x11/libfm/files/patch-src_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/libfm/files/patch-src_Makefile.in Fri Apr 10 17:08:00 2015 (r383743)
@@ -0,0 +1,49 @@
+--- src/Makefile.in.orig 2014-10-14 16:46:21 UTC
++++ src/Makefile.in
+@@ -497,7 +497,7 @@ am__relativize = \
+ reldir="$$dir2"
+
+ # we use common include directory for all headers
+-pkgincludedir = $(includedir)/@PACKAGE at -@FMLIBVER@
++pkgincludedir = $(includedir)/@PACKAGE@
+ ACLOCAL = @ACLOCAL@
+ ACTIONS_SUBDIR = @ACTIONS_SUBDIR@
+ ALL_LINGUAS = @ALL_LINGUAS@
+@@ -892,14 +892,14 @@ libfm_gtk_SOURCES = \
+ @EXTRALIB_ONLY_FALSE@ gtk/fm-thumbnail.h \
+ @EXTRALIB_ONLY_FALSE@ $(NULL)
+
+-LIBFM_EXTRA_INCLUDES = \
+- fm-extra.h \
+- fm-version.h \
+- extra/fm-xml-file.h \
+- $(NULL)
++ at EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \
++ at EXTRALIB_ONLY_TRUE@ fm-extra.h \
++ at EXTRALIB_ONLY_TRUE@ fm-version.h \
++ at EXTRALIB_ONLY_TRUE@ extra/fm-xml-file.h \
++ at EXTRALIB_ONLY_TRUE@ $(NULL)
+
+ EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
+- at EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@
++ at EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@
+ @EXTRALIB_ONLY_TRUE at lib_LTLIBRARIES = libfm-extra.la
+ libfm_la_SOURCES = \
+ $(libfm_SOURCES) \
+@@ -1042,7 +1042,7 @@ lxshortcut_LDADD = \
+ @ENABLE_DEMO_TRUE@ $(GTK_LIBS) \
+ @ENABLE_DEMO_TRUE@ $(INTLLIBS) \
+ @ENABLE_DEMO_TRUE@ libfm.la \
+- at ENABLE_DEMO_TRUE@ libfm-extra.la \
++ at ENABLE_DEMO_TRUE@ -lfm-extra \
+ @ENABLE_DEMO_TRUE@ @LIBFM_GTK_LTLIBRARIES@ \
+ @ENABLE_DEMO_TRUE@ $(NULL)
+
+@@ -3079,7 +3079,6 @@ install-data-local:
+ rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
+ fi
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+- @LN_S@ @PACKAGE at -@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
+
+ uninstall-local:
+ @if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
Added: head/x11/libfm/files/patch-src_actions_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/libfm/files/patch-src_actions_Makefile.in Fri Apr 10 17:08:00 2015 (r383743)
@@ -0,0 +1,11 @@
+--- src/actions/Makefile.in.orig 2014-10-14 16:46:21 UTC
++++ src/actions/Makefile.in
+@@ -424,7 +424,7 @@ AM_VALAFLAGS = \
+ --header fm-actions.h \
+ $(NULL)
+
+-libfmactionsincludedir = $(includedir)/@PACKAGE at -@FMLIBVER@
++libfmactionsincludedir = $(includedir)/@PACKAGE@
+ libfmactionsinclude_HEADERS = \
+ fm-actions.h \
+ $(NULL)
Added: head/x11/libfm/files/patch-src_modules_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/libfm/files/patch-src_modules_Makefile.in Fri Apr 10 17:08:00 2015 (r383743)
@@ -0,0 +1,21 @@
+--- src/modules/Makefile.in.orig 2014-10-14 16:46:21 UTC
++++ src/modules/Makefile.in
+@@ -172,8 +172,7 @@ gtk_menu_trash_la_LINK = $(LIBTOOL) $(AM
+ $(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
+ @ENABLE_GTK_TRUE at am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir)
+-vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(top_builddir)/src/libfm-extra.la
++vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ vfs_menu_la_SOURCES = vfs-menu.c
+ vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo
+ vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -447,7 +446,7 @@ PLUGINS_INSTALLED = $(pkglib_LTLIBRARIES
+
+ # module-specific parameters
+ vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra
+-vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la
++vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra
+ gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
+ gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS)
+ gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
Modified: head/x11/libfm/pkg-plist
==============================================================================
--- head/x11/libfm/pkg-plist Fri Apr 10 16:43:29 2015 (r383742)
+++ head/x11/libfm/pkg-plist Fri Apr 10 17:08:00 2015 (r383743)
@@ -1,101 +1,92 @@
bin/libfm-pref-apps
bin/lxshortcut
@sample etc/xdg/libfm/libfm.conf.sample
-include/libfm
-include/libfm-%%MAJORVER%%/fm-actions.h
-include/libfm-%%MAJORVER%%/fm-app-chooser-combo-box.h
-include/libfm-%%MAJORVER%%/fm-app-chooser-dlg.h
-include/libfm-%%MAJORVER%%/fm-app-info.h
-include/libfm-%%MAJORVER%%/fm-app-menu-view.h
-include/libfm-%%MAJORVER%%/fm-archiver.h
-include/libfm-%%MAJORVER%%/fm-bookmarks.h
-include/libfm-%%MAJORVER%%/fm-cell-renderer-pixbuf.h
-include/libfm-%%MAJORVER%%/fm-cell-renderer-text.h
-include/libfm-%%MAJORVER%%/fm-clipboard.h
-include/libfm-%%MAJORVER%%/fm-config.h
-include/libfm-%%MAJORVER%%/fm-deep-count-job.h
-include/libfm-%%MAJORVER%%/fm-dir-list-job.h
-include/libfm-%%MAJORVER%%/fm-dir-tree-model.h
-include/libfm-%%MAJORVER%%/fm-dir-tree-view.h
-include/libfm-%%MAJORVER%%/fm-dnd-auto-scroll.h
-include/libfm-%%MAJORVER%%/fm-dnd-dest.h
-include/libfm-%%MAJORVER%%/fm-dnd-src.h
-include/libfm-%%MAJORVER%%/fm-dummy-monitor.h
-include/libfm-%%MAJORVER%%/fm-extra.h
-include/libfm-%%MAJORVER%%/fm-file-info-job.h
-include/libfm-%%MAJORVER%%/fm-file-info.h
-include/libfm-%%MAJORVER%%/fm-file-launcher.h
-include/libfm-%%MAJORVER%%/fm-file-menu.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-change-attr.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-delete.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job-xfer.h
-include/libfm-%%MAJORVER%%/fm-file-ops-job.h
-include/libfm-%%MAJORVER%%/fm-file-properties.h
-include/libfm-%%MAJORVER%%/fm-file.h
-include/libfm-%%MAJORVER%%/fm-folder-config.h
-include/libfm-%%MAJORVER%%/fm-folder-model.h
-include/libfm-%%MAJORVER%%/fm-folder-view.h
-include/libfm-%%MAJORVER%%/fm-folder.h
-include/libfm-%%MAJORVER%%/fm-gtk-file-launcher.h
-include/libfm-%%MAJORVER%%/fm-gtk-marshal.h
-include/libfm-%%MAJORVER%%/fm-gtk-utils.h
-include/libfm-%%MAJORVER%%/fm-gtk.h
-include/libfm-%%MAJORVER%%/fm-icon-pixbuf.h
-include/libfm-%%MAJORVER%%/fm-icon.h
-include/libfm-%%MAJORVER%%/fm-job.h
-include/libfm-%%MAJORVER%%/fm-list.h
-include/libfm-%%MAJORVER%%/fm-marshal.h
-include/libfm-%%MAJORVER%%/fm-menu-tool-item.h
-include/libfm-%%MAJORVER%%/fm-mime-type.h
-include/libfm-%%MAJORVER%%/fm-module.h
-include/libfm-%%MAJORVER%%/fm-monitor.h
-include/libfm-%%MAJORVER%%/fm-nav-history.h
-include/libfm-%%MAJORVER%%/fm-path-bar.h
-include/libfm-%%MAJORVER%%/fm-path-entry.h
-include/libfm-%%MAJORVER%%/fm-path.h
-include/libfm-%%MAJORVER%%/fm-places-model.h
-include/libfm-%%MAJORVER%%/fm-places-view.h
-include/libfm-%%MAJORVER%%/fm-progress-dlg.h
-include/libfm-%%MAJORVER%%/fm-seal.h
-include/libfm-%%MAJORVER%%/fm-side-pane.h
-include/libfm-%%MAJORVER%%/fm-simple-job.h
-include/libfm-%%MAJORVER%%/fm-sortable.h
-include/libfm-%%MAJORVER%%/fm-standard-view.h
-include/libfm-%%MAJORVER%%/fm-tab-label.h
-include/libfm-%%MAJORVER%%/fm-templates.h
-include/libfm-%%MAJORVER%%/fm-terminal.h
-include/libfm-%%MAJORVER%%/fm-thumbnail-loader.h
-include/libfm-%%MAJORVER%%/fm-thumbnail.h
-include/libfm-%%MAJORVER%%/fm-thumbnailer.h
-include/libfm-%%MAJORVER%%/fm-utils.h
-include/libfm-%%MAJORVER%%/fm-version.h
-include/libfm-%%MAJORVER%%/fm-xml-file.h
-include/libfm-%%MAJORVER%%/fm.h
-%%STATIC%%lib/libfm-extra.a
-lib/libfm-extra.so
-lib/libfm-extra.so.%%VER%%
-lib/libfm-extra.so.%%VER%%.0.2
-%%STATIC%%lib/libfm-gtk.a
+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.%%VER%%
-lib/libfm-gtk.so.%%VER%%.0.2
-%%STATIC%%lib/libfm.a
+lib/libfm-gtk.so.4
+lib/libfm-gtk.so.4.0.3
lib/libfm.so
-lib/libfm.so.%%VER%%
-lib/libfm.so.%%VER%%.0.2
+lib/libfm.so.4
+lib/libfm.so.4.0.3
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-extra.pc
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
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/archivers.list
%%DATADIR%%/images/folder.png
%%DATADIR%%/images/unknown.png
More information about the svn-ports-all
mailing list