pkg/39596: [UPDATE] sysutils/file 4.21 -> 4.26 + add builtin version detection

[rehsack%web.de@localhost]

>Number:         39596
>Category:       pkg
>Synopsis:       [UPDATE] sysutils/file 4.21 -> 4.26 + add builtin version 
>detection
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 21 17:50:00 +0000 2008
>Originator:     Jens Rehsack
>Release:        -
>Organization:
Bayer Business Services
>Environment:
RHEL 4, AIX 5.3 TL 8
>Description:
This updates sysutils/file to 4.26 (file-4.21.tar.gz is no longer available on 
master site ^^), add detection for builtin version and increase ABI/API version 
to 4.17 because devel/p5-File-LibMagic documents this as the first version 
which handles exeptions for ENOENT correctly.
>How-To-Repeat:
sysutils/file uses builtin even if builtin version is to low.
>Fix:
Index: sysutils/file/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/Makefile,v
retrieving revision 1.16
diff -u -u -r1.16 Makefile
--- sysutils/file/Makefile      12 Jun 2008 02:14:46 -0000      1.16
+++ sysutils/file/Makefile      21 Sep 2008 17:38:26 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.16 2008/06/12 02:14:46 joerg Exp $
 
-DISTNAME=              file-4.21
+DISTNAME=              file-4.26
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.gw.com/mirrors/pub/unix/file/
 MASTER_SITES+=         ftp://ftp.astron.com/pub/file/
Index: sysutils/file/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/PLIST,v
retrieving revision 1.2
diff -u -u -r1.2 PLIST
--- sysutils/file/PLIST 22 Sep 2004 08:09:53 -0000      1.2
+++ sysutils/file/PLIST 21 Sep 2008 17:38:26 -0000
@@ -5,8 +5,5 @@
 man/man1/file.1
 man/man3/libmagic.3
 man/man5/magic.5
-share/file/magic
 share/file/magic.mgc
-share/file/magic.mime
-share/file/magic.mime.mgc
 @dirrm share/file
Index: sysutils/file/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/buildlink3.mk,v
retrieving revision 1.6
diff -u -u -r1.6 buildlink3.mk
--- sysutils/file/buildlink3.mk 8 Jul 2006 23:11:08 -0000       1.6
+++ sysutils/file/buildlink3.mk 21 Sep 2008 17:38:26 -0000
@@ -13,9 +13,14 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file
 
 .if !empty(FILE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.file+=   file>=4.09
-BUILDLINK_ABI_DEPENDS.file+=   file>=4.09nb1
+
+.  include "../../mk/bsd.fast.prefs.mk"
+
+BUILDLINK_API_DEPENDS.file+=   file>=4.17
+BUILDLINK_ABI_DEPENDS.file+=   file>=4.17
 BUILDLINK_PKGSRCDIR.file?=     ../../sysutils/file
 .endif # FILE_BUILDLINK3_MK
+pkgbase := file
+.include "../../mk/pkg-build-options.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
Index: sysutils/file/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/builtin.mk,v
retrieving revision 1.4
diff -u -u -r1.4 builtin.mk
--- sysutils/file/builtin.mk    6 Apr 2006 06:22:45 -0000       1.4
+++ sysutils/file/builtin.mk    21 Sep 2008 17:38:26 -0000
@@ -20,6 +20,11 @@
 .endif
 MAKEVARS+=     IS_BUILTIN.file
 
+.if !defined(BUILTIN_PKG.file) && !empty(IS_BUILTIN.file:M[yY][eE][sS])
+BUILTIN_VERSION.file!= file --version 2>&1 | ${GREP} 'file-' | ${SED} 
's/file-//'
+BUILTIN_PKG.file=      file-${BUILTIN_VERSION.file}
+.endif
+
 ###
 ### Determine whether we should use the built-in implementation if it
 ### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
Index: sysutils/file/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- sysutils/file/distinfo      14 Jun 2007 16:29:42 -0000      1.8
+++ sysutils/file/distinfo      21 Sep 2008 17:38:26 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.8 2007/06/14 16:29:42 adrianp Exp $
 
-SHA1 (file-4.21.tar.gz) = 4a919572fed1896212c2d7f41f841845efc1287a
-RMD160 (file-4.21.tar.gz) = c8cfee27ba7a033bae355e458921eac39913b1e0
-Size (file-4.21.tar.gz) = 549938 bytes
-SHA1 (patch-aa) = 96376c128a1d131c73f7d1bc790030c250f0f1ee
+SHA1 (file-4.26.tar.gz) = 412cdac5cd778d867e2d91a01b09858be1998ec3
+RMD160 (file-4.26.tar.gz) = e8b84e01d1f43faedfe676afc92c2cba4a01ecdf
+Size (file-4.26.tar.gz) = 584803 bytes
+SHA1 (patch-aa) = 4934c976fb7fb0a14f78a63dbc9d702c6798a040
Index: sysutils/file/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/patches/patch-aa,v
retrieving revision 1.3
diff -u -u -r1.3 patch-aa
--- sysutils/file/patches/patch-aa      7 Oct 2006 19:46:06 -0000       1.3
+++ sysutils/file/patches/patch-aa      21 Sep 2008 17:38:26 -0000
@@ -1,18 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2006/10/07 19:46:06 reed Exp $
-
---- src/Makefile.in.orig       2006-10-08 03:41:58.000000000 -0700
-+++ src/Makefile.in    2006-10-08 03:42:49.000000000 -0700
-@@ -192,11 +192,11 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- src/Makefile.in.orig       2008-09-03 16:03:38.601850000 +0200
++++ src/Makefile.in    2008-09-03 16:04:07.409017000 +0200
+@@ -195,10 +195,10 @@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = @sysconfdir@/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
- EXTRA_DIST = test.c
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
+ AM_CFLAGS = @WARNINGS@
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
        compress.c is_tar.c readelf.c print.c fsmagic.c \
-       funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c