diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2007-05-24 16:14:38 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2007-05-24 16:14:38 +0000 |
| commit | a90b38c0b17d1b25c8cc10fb772458810c52601e (patch) | |
| tree | a079e7c86aaa209f9114b0d2415fbf298121501e | |
| parent | bb5e14423775764f050fc672b7f2c1f455f2e4d1 (diff) | |
Notes
| -rw-r--r-- | contrib/file/FREEBSD-upgrade | 10 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 11 | ||||
| -rw-r--r-- | usr.bin/file/config.h | 11 |
3 files changed, 25 insertions, 7 deletions
diff --git a/contrib/file/FREEBSD-upgrade b/contrib/file/FREEBSD-upgrade index 668b01400565..2f9df95050a5 100644 --- a/contrib/file/FREEBSD-upgrade +++ b/contrib/file/FREEBSD-upgrade @@ -13,12 +13,12 @@ Imported by: mv -i doc/* . rm -rf doc rm -rf python - rm lt* - rm missing depcomp - rm config.{guess,sub} + rm -f lt* + rm -f missing depcomp + rm -f config.{guess,sub} - cvs import -m "Virgin import of Christos Zoulas's FILE 4.17." \ - src/contrib/file ZOULAS file_4_17 + cvs import -m "Virgin import of Christos Zoulas's FILE 4.19." \ + src/contrib/file ZOULAS file_4_19 Never make local changes to ZOULAS `file'. Christos is very willing to diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index e9e42005fbe5..9dd8a279c29b 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -73,6 +73,9 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strndup' function. */ +/* #undef HAVE_STRNDUP */ + /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 @@ -89,6 +92,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 @@ -125,6 +131,9 @@ /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1 +/* Define to 1 if you have the <wctype.h> header file. */ +#define HAVE_WCTYPE_H 1 + /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 @@ -173,7 +182,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "4.17" +#define VERSION "4.19" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/usr.bin/file/config.h b/usr.bin/file/config.h index e9e42005fbe5..9dd8a279c29b 100644 --- a/usr.bin/file/config.h +++ b/usr.bin/file/config.h @@ -73,6 +73,9 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `strndup' function. */ +/* #undef HAVE_STRNDUP */ + /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 @@ -89,6 +92,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 @@ -125,6 +131,9 @@ /* Define to 1 if you have the <wchar.h> header file. */ #define HAVE_WCHAR_H 1 +/* Define to 1 if you have the <wctype.h> header file. */ +#define HAVE_WCTYPE_H 1 + /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 @@ -173,7 +182,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "4.17" +#define VERSION "4.19" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ |