Subject: pkg/34337: [update] sysutils/file
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Martin Wilke <miwi@FreeBSD.org>
List: pkgsrc-bugs
Date: 08/29/2006 14:55:07
>Number: 34337
>Category: pkg
>Synopsis: [update] sysutils/file
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Tue Aug 29 14:55:06 +0000 2006
>Originator: Martin Wilke
>Release: NetBSD 4.0_BETA i386
>Organization:
>Environment:
System: NetBSD 4.0_BETA (MIWIBOX) #0: Tue Aug 29 10:29:38 CEST 2006
miwi@mwilke.ath.cx:/usr/obj/sys/arch/i386/compile/MIWIBOX
>Description:
- Update to 4.17
>How-To-Repeat:
>Fix:
--- file.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 4 Mar 2006 21:30:41 -0000 1.11
+++ Makefile 29 Aug 2006 06:55:14 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:41 jlam Exp $
-DISTNAME= file-4.13
+DISTNAME= file-4.17
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.gw.com/mirrors/pub/unix/file/
MASTER_SITES+= ftp://ftp.astron.com/pub/file/
Index: buildlink3.mk
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- buildlink3.mk 8 Jul 2006 23:11:08 -0000 1.6
+++ buildlink3.mk 29 Aug 2006 07:06:21 -0000
@@ -13,8 +13,8 @@
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
+BUILDLINK_API_DEPENDS.file+= file>=4.17
+BUILDLINK_ABI_DEPENDS.file+= file>=4.17nb1
BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file
.endif # FILE_BUILDLINK3_MK
Index: distinfo
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 24 Feb 2005 13:40:52 -0000 1.4
+++ distinfo 29 Aug 2006 07:02:39 -0000
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.4 2005/02/24 13:40:52 agc Exp $
-SHA1 (file-4.13.tar.gz) = a643b6e4c00cb7673a4dfd055d972dda0f5e0f53
-RMD160 (file-4.13.tar.gz) = 6ad85982bda00f6d1f037ab85698f4cbcb76970a
-Size (file-4.13.tar.gz) = 420851 bytes
-SHA1 (patch-aa) = 057af6589512876c0c2ad085785d0b7888001714
+SHA1 (file-4.17.tar.gz) = e03710a3fcb95db6d0ee9cfcdf88c19a5e525ee4
+RMD160 (file-4.17.tar.gz) = c5fd11659552f8ac3031badc7c94bb3c83a8e916
+Size (file-4.17.tar.gz) = 556270 bytes
+SHA1 (patch-aa) = 13c553797900deeceeda847187845365d8450093
Index: patches/patch-aa
===================================================================
RCS file: /home/pcvs/pkgsrc/sysutils/file/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patches/patch-aa 18 Feb 2005 19:39:27 -0000 1.2
+++ patches/patch-aa 29 Aug 2006 07:00:53 -0000
@@ -1,21 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2005/02/18 19:39:27 reed Exp $
-
---- src/Makefile.in.orig 2005-01-07 11:17:26.000000000 -0800
-+++ src/Makefile.in
-@@ -84,14 +84,14 @@ am__include = @am__include@
- am__quote = @am__quote@
- fsect = @fsect@
- install_sh = @install_sh@
+--- src/Makefile.in.orig 2006-03-02 23:09:48.000000000 +0100
++++ src/Makefile.in 2006-08-29 08:59:39.000000000 +0200
+@@ -192,11 +192,11 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
-MAGIC = $(pkgdatadir)/magic
+MAGIC = @sysconfdir@/magic
lib_LTLIBRARIES = libmagic.la
include_HEADERS = magic.h
EXTRA_DIST = test.c
-
- bin_PROGRAMS = file
-
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
-
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
--- file.diff ends here ---