pkg/41344: devel/libvolume_id doesn't build on current NetBSD

[dieter.NetBSD%pandora.be@localhost]

>Number:         41344
>Category:       pkg
>Synopsis:       devel/libvolume_id doesn't build on current NetBSD
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 03 21:20:00 +0000 2009
>Originator:     dieter roelants
>Release:        NetBSD 5.99.11
>Organization:
>Environment:
System: NetBSD simult.amelgem.be 5.99.11 NetBSD 5.99.11 (SIMULT) #28: Sat May  
2 13:03:13 CEST 2009 
dieter%simult.amelgem.be@localhost:/build/obj.amd64.current/sys/arch/amd64/compile/SIMULT
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        devel/libvolume_id fails to build after strnlen got added
        to string.h. The problem is that util.c in the libvolume_id
        source defines its own version of strnlen, except for new
        enough FreeBSD (and DragonFly, because  pkgsrc patches it).
>How-To-Repeat:
        cd devel/libvolume_id && make
>Fix:
        The following patch fixes the build for 5.99.11 from May
        1st onwards, but will unfortunately break it for earlier
        5.99.11 builds. A feature check would be better than a
        version check, but I don't know if that's possible here,
        without a configure script...
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libvolume_id/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    24 Apr 2009 01:07:18 -0000      1.5
+++ distinfo    3 May 2009 20:42:35 -0000
@@ -5,6 +5,6 @@
 Size (libvolume_id-0.81.1.tar.bz2) = 23399 bytes
 SHA1 (patch-aa) = f1bc3a47df3d98bba4b08e96f957e11f56155c18
 SHA1 (patch-ab) = f9f80eeeb67b8f8babf777bf59226249b03576b8
-SHA1 (patch-ac) = 2e59ad5035cfb93911411805c694e98bfaceba35
+SHA1 (patch-ac) = d99ce65248e2520f107081b8474225ab1449d72e
 SHA1 (patch-ad) = c09ecb39f154c37e72dfb6bb6241ec33d77c0b60
 SHA1 (patch-ae) = 82d0bdd10818ed75eb1c555891c093eddbffaa7a
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libvolume_id/patches/patch-ac,v
retrieving revision 1.5
diff -u -r1.5 patch-ac
--- patches/patch-ac    24 Apr 2009 01:07:19 -0000      1.5
+++ patches/patch-ac    3 May 2009 20:42:35 -0000
@@ -10,7 +10,7 @@
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__APPLE__)
  #include <sys/param.h>
 -#if __FreeBSD_version < 800067
-+#if __FreeBSD_version < 800067 && __DragonFly_version < 200202
++#if __FreeBSD_version < 800067 && __DragonFly_version < 200202 && 
__NetBSD_Version__ < 599001100
  static size_t strnlen (const char *s, size_t maxlen)
  {
        size_t i;