summaryrefslogtreecommitdiff
path: root/devel/libblkid
diff options
context:
space:
mode:
authordsainty <dsainty>2011-01-08 22:30:38 +0000
committerdsainty <dsainty>2011-01-08 22:30:38 +0000
commitdd4193d1a26e5b8d20d59719e23fef6fefb131e9 (patch)
tree142f9831dc4ef4519b3ff870fc37dc0dc152443d /devel/libblkid
parent9feaa01e417e5d392ebb038f126700d9066c16c4 (diff)
downloadpkgsrc-dd4193d1a26e5b8d20d59719e23fef6fefb131e9.tar.gz
Avoid installing some files not in PLIST, namely language and hwclock files.
Diffstat (limited to 'devel/libblkid')
-rw-r--r--devel/libblkid/distinfo4
-rw-r--r--devel/libblkid/patches/patch-ab13
2 files changed, 9 insertions, 8 deletions
diff --git a/devel/libblkid/distinfo b/devel/libblkid/distinfo
index 61a8c3e0858..799629d30f8 100644
--- a/devel/libblkid/distinfo
+++ b/devel/libblkid/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/01/08 20:43:38 markd Exp $
+$NetBSD: distinfo,v 1.2 2011/01/08 22:30:38 dsainty Exp $
SHA1 (util-linux-ng-2.18.tar.bz2) = 154db0512caae0b6e90eee4b7312d4caf3d6b978
RMD160 (util-linux-ng-2.18.tar.bz2) = 4781871a8f86195b886e81d364d41a57d67869e3
Size (util-linux-ng-2.18.tar.bz2) = 7669676 bytes
SHA1 (patch-aa) = 83f8038278928899def6db0f28e3f13b78effbc4
-SHA1 (patch-ab) = bb5caeb2308fd0009d5fce20f7cea96dcdf609c7
+SHA1 (patch-ab) = 3cdd8d9c40b0b25fce088f0537f2d2443bcfb311
SHA1 (patch-ac) = 48483270d348c466da6f7bcf822e461377830474
SHA1 (patch-ad) = 36def63e59aff1c045d1821380b3d0191628d897
SHA1 (patch-ae) = df77e8c6da425609309505fd447b66ade05426a3
diff --git a/devel/libblkid/patches/patch-ab b/devel/libblkid/patches/patch-ab
index 74472cc9788..9835fb91257 100644
--- a/devel/libblkid/patches/patch-ab
+++ b/devel/libblkid/patches/patch-ab
@@ -1,17 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
+$NetBSD: patch-ab,v 1.2 2011/01/08 22:30:39 dsainty Exp $
-Dont try to build things we don't care about
+Don't try to build things we don't care about, including hwclock - pulled in
+unconditionally if building on Linux via am__append_1.
--- Makefile.in.orig 2010-06-30 12:53:07.000000000 +0000
+++ Makefile.in
-@@ -311,8 +311,8 @@ ul_libmount_la = $(top_builddir)/shlibs/
+@@ -311,9 +311,7 @@ ul_libmount_la = $(top_builddir)/shlibs/
# mount.h is generated by ./configure script and stored in build directory
ul_libmount_incdir = $(ul_libmount_builddir)
-SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
- misc-utils po schedutils sys-utils text-utils tests \
-+SUBDIRS = include shlibs \
-+ po \
- $(am__append_1) $(am__append_2) $(am__append_3)
+- $(am__append_1) $(am__append_2) $(am__append_3)
++SUBDIRS = include shlibs
RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
+