From 41ad77810a4733ee13c8361f7f167e0a9b36f7b0 Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Fri, 28 Jan 2011 15:22:56 -1000 Subject: [PATCH] Update build for file-5.05 import. --- Makefile_upgrade.inc | 4 ++++ lib/libmagic/Makefile | 3 +-- lib/libmagic/config.h | 30 ++++++++++++++++++++++++------ usr.bin/file/Makefile | 1 - 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index d3de12b594..88d330dbed 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1552,6 +1552,10 @@ TO_REMOVE+=/boot/kernel/ahc_eisa.ko TO_REMOVE+=/boot/kernel/ahc_isa.ko TO_REMOVE+=/usr/include/netproto/ns TO_REMOVE+=/usr/include/netns +TO_REMOVE+=/usr/share/man/cat3/magic_errno.3.gz +TO_REMOVE+=/usr/share/man/man3/magic_errno.3.gz +TO_REMOVE+=/usr/share/man/cat3/magic_file.3.gz +TO_REMOVE+=/usr/share/man/man3/magic_file.3.gz # XXX Remove when pfsync(4) has been fixed TO_REMOVE+=/usr/share/man/cat4/pfsync.4.gz diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index d8e71364f1..e339983b15 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -23,8 +23,7 @@ MAN= libmagic.3 MLINKS+= libmagic.3 magic_open.3 MLINKS+= libmagic.3 magic_close.3 MLINKS+= libmagic.3 magic_error.3 -MLINKS+= libmagic.3 magic_errno.3 -MLINKS+= libmagic.3 magic_file.3 +MLINKS+= libmagic.3 magic_descriptor.3 MLINKS+= libmagic.3 magic_buffer.3 MLINKS+= libmagic.3 magic_setflags.3 MLINKS+= libmagic.3 magic_check.3 diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index f12cb81645..b424e71c7a 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -13,6 +13,14 @@ /* HAVE_DAYLIGHT */ #define HAVE_DAYLIGHT 1 +/* Define to 1 if you have the declaration of `daylight', and to 0 if you + don't. */ +#define HAVE_DECL_DAYLIGHT 1 + +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#define HAVE_DECL_TZNAME 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -22,6 +30,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #define HAVE_FSEEKO 1 @@ -40,6 +51,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define to 1 if you have the `gnurx' library (-lgnurx). */ +/* #undef HAVE_LIBGNURX */ + /* Define to 1 if you have the `z' library (-lz). */ #define HAVE_LIBZ 1 @@ -174,6 +188,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + /* Define to 1 if `major', `minor', and `makedev' are declared in . */ /* #undef MAJOR_IN_MKDEV */ @@ -189,19 +207,19 @@ #define PACKAGE "file" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +#define PACKAGE_BUGREPORT "christos@astron.com" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "file 5.05" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "file" /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +#define PACKAGE_VERSION "5.05" /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 @@ -213,7 +231,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "5.04" +#define VERSION "5.05" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index 6ab6bdabd4..ab6c6ac64f 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -11,7 +11,6 @@ MAGIC= /usr/share/misc/magic PROG= file MAN= file.1 magic.5 -WARNS?= 0 CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\" CFLAGS+= -I${LIBMAGICDIR} -- 2.41.0