Wed Oct 29 20:50:16 2008 UTC ()
PR/39596: Jwens Rehsack: Update to file-4.26 (4.21 is gone) and add built-in
version detection.


(christos)
diff -r1.16 -r1.17 pkgsrc/sysutils/file/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/file/PLIST
diff -r1.6 -r1.7 pkgsrc/sysutils/file/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/sysutils/file/builtin.mk
diff -r1.8 -r1.9 pkgsrc/sysutils/file/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/file/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/file/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/file/Makefile 2008/06/12 02:14:46 1.16
+++ pkgsrc/sysutils/file/Makefile 2008/10/29 20:50:16 1.17
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.16 2008/06/12 02:14:46 joerg Exp $ 1# $NetBSD: Makefile,v 1.17 2008/10/29 20:50:16 christos Exp $
2 2
3DISTNAME= file-4.21 3DISTNAME= file-4.26
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ftp://ftp.gw.com/mirrors/pub/unix/file/ 5MASTER_SITES= ftp://ftp.gw.com/mirrors/pub/unix/file/
6MASTER_SITES+= ftp://ftp.astron.com/pub/file/ 6MASTER_SITES+= ftp://ftp.astron.com/pub/file/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9#HOMEPAGE= 9#HOMEPAGE=
10COMMENT= Tool for determining file type 10COMMENT= Tool for determining file type
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15CONFIGURE_ARGS+= --enable-fsect-man5 15CONFIGURE_ARGS+= --enable-fsect-man5
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/file/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/file/PLIST 2004/09/22 08:09:53 1.2
+++ pkgsrc/sysutils/file/PLIST 2008/10/29 20:50:16 1.3
@@ -1,12 +1,9 @@ @@ -1,12 +1,9 @@
1@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/10/29 20:50:16 christos Exp $
2bin/file 2bin/file
3include/magic.h 3include/magic.h
4lib/libmagic.la 4lib/libmagic.la
5man/man1/file.1 5man/man1/file.1
6man/man3/libmagic.3 6man/man3/libmagic.3
7man/man5/magic.5 7man/man5/magic.5
8share/file/magic 
9share/file/magic.mgc 8share/file/magic.mgc
10share/file/magic.mime 
11share/file/magic.mime.mgc 
12@dirrm share/file 9@dirrm share/file
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/file/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/file/buildlink3.mk 2006/07/08 23:11:08 1.6
+++ pkgsrc/sysutils/file/buildlink3.mk 2008/10/29 20:50:16 1.7
@@ -1,21 +1,26 @@ @@ -1,21 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:08 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2008/10/29 20:50:16 christos Exp $
2# 2#
3 3
4BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 4BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
5FILE_BUILDLINK3_MK:= ${FILE_BUILDLINK3_MK}+ 5FILE_BUILDLINK3_MK:= ${FILE_BUILDLINK3_MK}+
6 6
7.if !empty(BUILDLINK_DEPTH:M+) 7.if !empty(BUILDLINK_DEPTH:M+)
8BUILDLINK_DEPENDS+= file 8BUILDLINK_DEPENDS+= file
9.endif 9.endif
10 10
11BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfile} 11BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfile}
12BUILDLINK_PACKAGES+= file 12BUILDLINK_PACKAGES+= file
13BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file 13BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file
14 14
15.if !empty(FILE_BUILDLINK3_MK:M+) 15.if !empty(FILE_BUILDLINK3_MK:M+)
16BUILDLINK_API_DEPENDS.file+= file>=4.09 16
17BUILDLINK_ABI_DEPENDS.file+= file>=4.09nb1 17. include "../../mk/bsd.fast.prefs.mk"
 18
 19BUILDLINK_API_DEPENDS.file+= file>=4.17
 20BUILDLINK_ABI_DEPENDS.file+= file>=4.17
18BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file 21BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file
19.endif # FILE_BUILDLINK3_MK 22.endif # FILE_BUILDLINK3_MK
 23pkgbase := file
 24.include "../../mk/pkg-build-options.mk"
20 25
21BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 26BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/file/builtin.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/file/builtin.mk 2006/04/06 06:22:45 1.4
+++ pkgsrc/sysutils/file/builtin.mk 2008/10/29 20:50:16 1.5
@@ -1,35 +1,40 @@ @@ -1,35 +1,40 @@
1# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:45 reed Exp $ 1# $NetBSD: builtin.mk,v 1.5 2008/10/29 20:50:16 christos Exp $
2 2
3BUILTIN_PKG:= file 3BUILTIN_PKG:= file
4 4
5BUILTIN_FIND_FILES_VAR:= H_FILE 5BUILTIN_FIND_FILES_VAR:= H_FILE
6BUILTIN_FIND_FILES.H_FILE= /usr/include/magic.h 6BUILTIN_FIND_FILES.H_FILE= /usr/include/magic.h
7BUILTIN_FIND_GREP.H_FILE= magic_file 7BUILTIN_FIND_GREP.H_FILE= magic_file
8 8
9.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
10 10
11### 11###
12### Determine if there is a built-in implementation of the package and 12### Determine if there is a built-in implementation of the package and
13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
14### 14###
15.if !defined(IS_BUILTIN.file) 15.if !defined(IS_BUILTIN.file)
16IS_BUILTIN.file= no 16IS_BUILTIN.file= no
17. if empty(H_FILE:M__nonexistent__) && empty(H_FILE:M${LOCALBASE}/*) 17. if empty(H_FILE:M__nonexistent__) && empty(H_FILE:M${LOCALBASE}/*)
18IS_BUILTIN.file= yes 18IS_BUILTIN.file= yes
19. endif 19. endif
20.endif 20.endif
21MAKEVARS+= IS_BUILTIN.file 21MAKEVARS+= IS_BUILTIN.file
22 22
 23.if !defined(BUILTIN_PKG.file) && !empty(IS_BUILTIN.file:M[yY][eE][sS])
 24BUILTIN_VERSION.file!= file --version 2>&1 | ${GREP} 'file-' | ${SED} 's/file-//'
 25BUILTIN_PKG.file= file-${BUILTIN_VERSION.file}
 26.endif
 27
23### 28###
24### Determine whether we should use the built-in implementation if it 29### Determine whether we should use the built-in implementation if it
25### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 30### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
26### 31###
27.if !defined(USE_BUILTIN.file) 32.if !defined(USE_BUILTIN.file)
28. if ${PREFER.file} == "pkgsrc" 33. if ${PREFER.file} == "pkgsrc"
29USE_BUILTIN.file= no 34USE_BUILTIN.file= no
30. else 35. else
31USE_BUILTIN.file= ${IS_BUILTIN.file} 36USE_BUILTIN.file= ${IS_BUILTIN.file}
32. if defined(BUILTIN_PKG.file) && \ 37. if defined(BUILTIN_PKG.file) && \
33 !empty(IS_BUILTIN.file:M[yY][eE][sS]) 38 !empty(IS_BUILTIN.file:M[yY][eE][sS])
34USE_BUILTIN.file= yes 39USE_BUILTIN.file= yes
35. for _dep_ in ${BUILDLINK_API_DEPENDS.file} 40. for _dep_ in ${BUILDLINK_API_DEPENDS.file}
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/file/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/file/distinfo 2007/06/14 16:29:42 1.8
+++ pkgsrc/sysutils/file/distinfo 2008/10/29 20:50:16 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2007/06/14 16:29:42 adrianp Exp $ 1$NetBSD: distinfo,v 1.9 2008/10/29 20:50:16 christos Exp $
2 2
3SHA1 (file-4.21.tar.gz) = 4a919572fed1896212c2d7f41f841845efc1287a 3SHA1 (file-4.26.tar.gz) = 412cdac5cd778d867e2d91a01b09858be1998ec3
4RMD160 (file-4.21.tar.gz) = c8cfee27ba7a033bae355e458921eac39913b1e0 4RMD160 (file-4.26.tar.gz) = e8b84e01d1f43faedfe676afc92c2cba4a01ecdf
5Size (file-4.21.tar.gz) = 549938 bytes 5Size (file-4.26.tar.gz) = 584803 bytes
6SHA1 (patch-aa) = 96376c128a1d131c73f7d1bc790030c250f0f1ee 6SHA1 (patch-aa) = 1d3d41162ee3b02c62f610b9e043d0e535419304
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/file/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/file/patches/patch-aa 2006/10/07 19:46:06 1.3
+++ pkgsrc/sysutils/file/patches/patch-aa 2008/10/29 20:50:16 1.4
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2006/10/07 19:46:06 reed Exp $ 1$NetBSD: patch-aa,v 1.4 2008/10/29 20:50:16 christos Exp $
2 2
3--- src/Makefile.in.orig 2006-10-08 03:41:58.000000000 -0700 3--- src/Makefile.in.orig 2008-09-03 16:03:38.601850000 +0200
4+++ src/Makefile.in 2006-10-08 03:42:49.000000000 -0700 4+++ src/Makefile.in 2008-09-03 16:04:07.409017000 +0200
5@@ -192,11 +192,11 @@ 5@@ -195,10 +195,10 @@
6 sharedstatedir = @sharedstatedir@ 
7 sysconfdir = @sysconfdir@ 
8 target_alias = @target_alias@ 6 target_alias = @target_alias@
 7 top_builddir = @top_builddir@
 8 top_srcdir = @top_srcdir@
9-MAGIC = $(pkgdatadir)/magic 9-MAGIC = $(pkgdatadir)/magic
10+MAGIC = @sysconfdir@/magic 10+MAGIC = @sysconfdir@/magic
11 lib_LTLIBRARIES = libmagic.la 11 lib_LTLIBRARIES = libmagic.la
12 include_HEADERS = magic.h 12 include_HEADERS = magic.h
13 EXTRA_DIST = test.c 
14-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' 13-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
15+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"' 14+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
 15 AM_CFLAGS = @WARNINGS@
16 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \ 16 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
17 compress.c is_tar.c readelf.c print.c fsmagic.c \ 17 compress.c is_tar.c readelf.c print.c fsmagic.c \
18 funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c