summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authoryouri <youri@pkgsrc.org>2016-05-22 22:33:14 +0000
committeryouri <youri@pkgsrc.org>2016-05-22 22:33:14 +0000
commit547d5d9a74243f975dfdb7b7b63aad8209d8d3d5 (patch)
tree8e754f6a057cec195860304284442319062688ea /sysutils
parent3abad4d0d94ca3efff2976c2cfdc846fac0f55e3 (diff)
downloadpkgsrc-547d5d9a74243f975dfdb7b7b63aad8209d8d3d5.tar.gz
Include fm-version.h here rather than libfm-extra.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/libfm/PLIST4
-rw-r--r--sysutils/libfm/distinfo4
-rw-r--r--sysutils/libfm/patches/patch-src_Makefile.in16
3 files changed, 10 insertions, 14 deletions
diff --git a/sysutils/libfm/PLIST b/sysutils/libfm/PLIST
index c9e818cba74..eee8d7c3588 100644
--- a/sysutils/libfm/PLIST
+++ b/sysutils/libfm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/22 22:10:03 youri Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/05/22 22:33:14 youri Exp $
bin/libfm-pref-apps
bin/lxshortcut
include/libfm-1.0/fm-actions.h
@@ -66,6 +66,7 @@ include/libfm-1.0/fm-thumbnail-loader.h
include/libfm-1.0/fm-thumbnail.h
include/libfm-1.0/fm-thumbnailer.h
include/libfm-1.0/fm-utils.h
+include/libfm-1.0/fm-version.h
include/libfm-1.0/fm.h
include/libfm/fm-actions.h
include/libfm/fm-app-chooser-combo-box.h
@@ -132,6 +133,7 @@ include/libfm/fm-thumbnail-loader.h
include/libfm/fm-thumbnail.h
include/libfm/fm-thumbnailer.h
include/libfm/fm-utils.h
+include/libfm/fm-version.h
include/libfm/fm.h
lib/libfm-gtk.la
lib/libfm.la
diff --git a/sysutils/libfm/distinfo b/sysutils/libfm/distinfo
index 982d3d08a27..17708cbcc85 100644
--- a/sysutils/libfm/distinfo
+++ b/sysutils/libfm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2016/05/22 22:10:03 youri Exp $
+$NetBSD: distinfo,v 1.2 2016/05/22 22:33:14 youri Exp $
SHA1 (libfm-1.2.4.tar.xz) = 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d
RMD160 (libfm-1.2.4.tar.xz) = 7c8cb9da27b3f36607f00eb9069ef753bb77eab5
@@ -6,6 +6,6 @@ SHA512 (libfm-1.2.4.tar.xz) = c609e822959f9fa83eaee6552906b6fd22d210f08029448162
Size (libfm-1.2.4.tar.xz) = 912164 bytes
SHA1 (patch-Makefile.in) = 74a134b3e0ad868ea18ac09c142f869219396a8a
SHA1 (patch-data_Makefile.in) = 810c5b93190f37d58609fbcd594b26fca4490311
-SHA1 (patch-src_Makefile.in) = fbe630f3ba1dfb3c26979d8c86518e5bf102abc0
+SHA1 (patch-src_Makefile.in) = b3967f2259354873439b78e2b4539169a3148706
SHA1 (patch-src_actions_Makefile.in) = e814f5252c231aa1c76cf2c1783f02b1a0b636ec
SHA1 (patch-src_modules_Makefile.in) = 0429f7f7c12cd1655452166e20365f3b0b1bcb81
diff --git a/sysutils/libfm/patches/patch-src_Makefile.in b/sysutils/libfm/patches/patch-src_Makefile.in
index 39dc306dc60..3360495d486 100644
--- a/sysutils/libfm/patches/patch-src_Makefile.in
+++ b/sysutils/libfm/patches/patch-src_Makefile.in
@@ -1,23 +1,17 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2016/05/22 22:10:03 youri Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2016/05/22 22:33:14 youri Exp $
Disable extra.
--- src/Makefile.in.orig 2016-02-20 22:14:15.000000000 +0000
+++ src/Makefile.in
-@@ -893,14 +893,14 @@ libfm_gtk_SOURCES = \
- @EXTRALIB_ONLY_FALSE@ gtk/fm-thumbnail.h \
+@@ -894,13 +894,11 @@ libfm_gtk_SOURCES = \
@EXTRALIB_ONLY_FALSE@ $(NULL)
--LIBFM_EXTRA_INCLUDES = \
+ LIBFM_EXTRA_INCLUDES = \
- fm-extra.h \
-- fm-version.h \
+ fm-version.h \
- extra/fm-xml-file.h \
-- $(NULL)
-+#LIBFM_EXTRA_INCLUDES = \
-+# fm-extra.h \
-+# fm-version.h \
-+# extra/fm-xml-file.h \
-+# $(NULL)
+ $(NULL)
EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
-@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@