PR/39596: Jwens Rehsack: Update to file-4.26 (4.21 is gone) and add built-in

version detection.

6 files changed, 29 insertions, 23 deletions

diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 9f757257fd1..84d3ef64196 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:46 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/10/29 20:50:16 christos 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/
diff --git a/sysutils/file/PLIST b/sysutils/file/PLIST
index f7a88081be9..e120180a3a9 100644
--- a/sysutils/file/PLIST
+++ b/sysutils/file/PLIST
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/10/29 20:50:16 christos Exp $
 bin/file
 include/magic.h
 lib/libmagic.la
 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
diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk
index a2b9bc8087f..a5d9c722d4e 100644
--- a/sysutils/file/buildlink3.mk
+++ b/sysutils/file/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2008/10/29 20:50:16 christos Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -13,9 +13,14 @@ BUILDLINK_PACKAGES+=	file
 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/+$//}
diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk
index 05376c51790..9a6053eb743 100644
--- a/sysutils/file/builtin.mk
+++ b/sysutils/file/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
+# $NetBSD: builtin.mk,v 1.5 2008/10/29 20:50:16 christos Exp $
 
 BUILTIN_PKG:=	file
 
@@ -20,6 +20,11 @@ IS_BUILTIN.file=	yes
 .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").
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 3a114f675a3..91539a522cd 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/06/14 16:29:42 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2008/10/29 20:50:16 christos 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) = 1d3d41162ee3b02c62f610b9e043d0e535419304
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
index c4effcc1ea1..a9afe581aa6 100644
--- a/sysutils/file/patches/patch-aa
+++ b/sysutils/file/patches/patch-aa
@@ -1,18 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2006/10/07 19:46:06 reed Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/29 20:50:16 christos 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