From f1f622a0d3711d17923769945398ca76b91338ed Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Sun, 28 Aug 2005 12:25:05 +0000 Subject: [PATCH] Switch to texinfo 4.8, which is needed for a lot of new texi files. --- gnu/usr.bin/texinfo/Makefile.inc | 7 +- gnu/usr.bin/texinfo/config.h | 423 ++++++++++++++++++ gnu/usr.bin/texinfo/infokey/Makefile | 5 +- gnu/usr.bin/texinfo/install-info/Makefile | 6 +- .../install-info/patches/install-info.c.patch | 135 ++++++ gnu/usr.bin/texinfo/libtxi/Makefile | 4 +- gnu/usr.bin/texinfo/makeinfo/Makefile | 6 +- 7 files changed, 575 insertions(+), 11 deletions(-) create mode 100644 gnu/usr.bin/texinfo/config.h create mode 100644 gnu/usr.bin/texinfo/install-info/patches/install-info.c.patch diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index 88b36f4b27..f2cc57932b 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -1,7 +1,8 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.11 2000/01/17 10:59:13 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/Makefile.inc,v 1.3 2005/08/28 12:25:04 asmodai Exp $ -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo +TOPLVLDIR:= ${.CURDIR}/.. +TXIDIR= ${.CURDIR}/../../../../contrib/texinfo-4 .if exists(${.OBJDIR}/../libtxi) LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a @@ -10,6 +11,6 @@ LIBTXI= ${.CURDIR}/../libtxi/libtxi.a .endif CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \ - -I${TXIDIR} -I${TXIDIR}/lib + -I${TOPLVLDIR} -I${TXIDIR} -I${TXIDIR}/lib .include "../Makefile.inc" diff --git a/gnu/usr.bin/texinfo/config.h b/gnu/usr.bin/texinfo/config.h new file mode 100644 index 0000000000..ebcdb92b26 --- /dev/null +++ b/gnu/usr.bin/texinfo/config.h @@ -0,0 +1,423 @@ +/* $DragonFly: src/gnu/usr.bin/texinfo/config.h,v 1.1 2005/08/28 12:25:04 asmodai Exp $ */ + +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if `TIOCGWINSZ' requires . */ +/* #undef GWINSZ_IN_SYS_IOCTL */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FGETS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't. + */ +#define HAVE_DECL_MEMCHR 1 + +/* Define to 1 if you have the declaration of `strcoll', and to 0 if you + don't. */ +#define HAVE_DECL_STRCOLL 1 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR 1 + +/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you + don't. */ +#define HAVE_DECL__SNPRINTF 0 + +/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you + don't. */ +#define HAVE_DECL__SNWPRINTF 0 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fwprintf' function. */ +#define HAVE_FWPRINTF 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getegid' function. */ +#define HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 + +/* Define to 1 if you have the `getgid' function. */ +#define HAVE_GETGID 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #undef HAVE_GETTIMEOFDAY */ + +/* Define to 1 if you have the `getuid' function. */ +#define HAVE_GETUID 1 + +/* Define if you have the iconv() function. */ +#define HAVE_ICONV 1 + +/* Define if you have the 'intmax_t' type in or . */ +#define HAVE_INTMAX_T 1 + +/* Define if exists and doesn't clash with . */ +#define HAVE_INTTYPES_H 1 + +/* Define if exists, doesn't clash with , and + declares uintmax_t. */ +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IO_H */ + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the `bsd' library (-lbsd). */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define if you have the 'long double' type. */ +#define HAVE_LONG_DOUBLE 1 + +/* Define if you have the 'long long' type. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `munmap' function. */ +#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NCURSES_TERMCAP_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define if your printf() function supports format strings with positions. */ +#define HAVE_POSIX_PRINTF 1 + +/* Define to 1 if you have the `putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the `setvbuf' function. */ +#define HAVE_SETVBUF 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the `sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the `sigsetmask' function. */ +#define HAVE_SIGSETMASK 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define if exists, doesn't clash with , and declares + uintmax_t. */ +#define HAVE_STDINT_H_WITH_UINTMAX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ +/* #undef HAVE_STPCPY */ + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcoll' function and it is properly defined. + */ +#define HAVE_STRCOLL 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PTEM_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STREAM_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TTOLD_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMCAP_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_TERMIO_H */ + +/* Define to 1 if you have the `tsearch' function. */ +#define HAVE_TSEARCH 1 + +/* Define if you have the 'uintmax_t' type in or . */ +#define HAVE_UINTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the 'unsigned long long' type. */ +#define HAVE_UNSIGNED_LONG_LONG 1 + +/* Define to 1 if you have the `vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define if you have the 'wchar_t' type. */ +#define HAVE_WCHAR_T 1 + +/* Define to 1 if you have the `wcslen' function. */ +#define HAVE_WCSLEN 1 + +/* Define if you have the 'wint_t' type. */ +#define HAVE_WINT_T 1 + +/* Define to 1 if you have the `__argz_count' function. */ +/* #undef HAVE___ARGZ_COUNT */ + +/* Define to 1 if you have the `__argz_next' function. */ +/* #undef HAVE___ARGZ_NEXT */ + +/* Define to 1 if you have the `__argz_stringify' function. */ +/* #undef HAVE___ARGZ_STRINGIFY */ + +/* Define to 1 if you have the `__fsetlocking' function. */ +/* #undef HAVE___FSETLOCKING */ + +/* Define to 1 if you have the `__secure_getenv' function. */ +/* #undef HAVE___SECURE_GETENV */ + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST + +/* Define if integer division by zero raises signal SIGFPE. */ +#define INTDIV0_RAISES_SIGFPE 1 + +/* Name of package */ +#define PACKAGE "texinfo" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "GNU Texinfo" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "GNU Texinfo 4.8" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "texinfo" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "4.8" + +/* Define if exists and defines unusable PRI* macros. */ +/* #undef PRI_MACROS_BROKEN */ + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define as the maximum value of type 'size_t', if the system doesn't define + it. */ +/* #undef SIZE_MAX */ + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if your declares `struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Version number of package */ +#define VERSION "4.8" + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_mkstemp if the replacement function should be used. */ +/* #undef mkstemp */ + +/* Define to `long' if does not define. */ +/* #undef off_t */ + +/* Define as the type of the result of subtracting two pointers, if the system + doesn't define it. */ +/* #undef ptrdiff_t */ + +/* Define to empty if the C compiler doesn't support this keyword. */ +/* #undef signed */ + +/* Define to `unsigned' if does not define. */ +/* #undef size_t */ + +/* Define to unsigned long or unsigned long long if and + don't define. */ +/* #undef uintmax_t */ diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile index 7c3398e9d3..b28caf3ccf 100644 --- a/gnu/usr.bin/texinfo/infokey/Makefile +++ b/gnu/usr.bin/texinfo/infokey/Makefile @@ -1,10 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/infokey/Makefile,v 1.1.2.1 2002/03/30 17:09:25 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/infokey/Makefile,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/infokey/Makefile,v 1.3 2005/08/28 12:25:04 asmodai Exp $ PROG= infokey -SRCS= infokey.c key.c NOMAN= noman +SRCS= infokey.c key.c + DPADD= ${LIBTXI} LDADD= ${LIBTXI} diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index e226da703f..b40d32ed5f 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -1,7 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.11.2.1 2002/08/07 16:53:36 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/install-info/Makefile,v 1.3 2005/08/28 12:25:04 asmodai Exp $ + +PATCHES!= echo ${.CURDIR}/patches/*.patch +CONTRIBDIR= ${TXIDIR}/util PROG= install-info +SRCS+= ${PATCHES} DPADD= ${LIBTXI} LDADD= ${LIBTXI} diff --git a/gnu/usr.bin/texinfo/install-info/patches/install-info.c.patch b/gnu/usr.bin/texinfo/install-info/patches/install-info.c.patch new file mode 100644 index 0000000000..5e9245e850 --- /dev/null +++ b/gnu/usr.bin/texinfo/install-info/patches/install-info.c.patch @@ -0,0 +1,135 @@ +$DragonFly: src/gnu/usr.bin/texinfo/install-info/patches/install-info.c.patch,v 1.1 2005/08/28 12:25:05 asmodai Exp $ + +--- install-info.c 2005-08-28 12:43:06.000000000 +0200 ++++ install-info.c 2005-05-23 12:50:48.000000000 +0200 +@@ -1,3 +1,4 @@ ++/* $FreeBSD: src/contrib/texinfo/util/install-info.c,v 1.16 2005/05/23 10:50:48 ru Exp $ */ + /* install-info -- create Info directory entry(ies) for an Info file. + $Id: install-info.c,v 1.12 2004/04/11 17:56:47 karl Exp $ + +@@ -22,6 +23,7 @@ + #include + + static char *progname = "install-info"; ++static char *default_section = NULL; + + struct spec_entry; + struct spec_section; +@@ -120,6 +122,8 @@ + struct option longopts[] = + { + { "delete", no_argument, NULL, 'r' }, ++ { "defentry", required_argument, NULL, 'E' }, ++ { "defsection", required_argument, NULL, 'S' }, + { "dir-file", required_argument, NULL, 'd' }, + { "entry", required_argument, NULL, 'e' }, + { "help", no_argument, NULL, 'h' }, +@@ -439,6 +443,10 @@ + Options:\n\ + --delete delete existing entries for INFO-FILE from DIR-FILE;\n\ + don't insert any new entries.\n\ ++ --defentry=TEXT like --entry, but only use TEXT if an entry\n\ ++ is not present in INFO-FILE.\n\ ++ --defsection=TEXT like --section, but only use TEXT if a section\n\ ++ is not present in INFO-FILE.\n\ + --dir-file=NAME specify file name of Info directory file.\n\ + This is equivalent to using the DIR-FILE argument.\n\ + --entry=TEXT insert TEXT as an Info directory entry.\n\ +@@ -900,7 +908,8 @@ + specified. Default to section "Miscellaneous". */ + *sections = (struct spec_section *) + xmalloc (sizeof (struct spec_section)); +- (*sections)->name = "Miscellaneous"; ++ (*sections)->name = ++ default_section ? default_section : "Miscellaneous"; + (*sections)->next = 0; + (*sections)->missing = 1; + head = *sections; +@@ -1142,6 +1151,8 @@ + struct spec_section *input_sections = NULL; + struct spec_entry *entries_to_add = NULL; + int n_entries_to_add = 0; ++ struct spec_entry *default_entries_to_add = NULL; ++ int n_default_entries_to_add = 0; + + /* Record the old text of the dir file, as plain characters, + as lines, and as nodes. */ +@@ -1205,6 +1216,7 @@ + dirfile = concat (optarg, "", "/dir"); + break; + ++ case 'E': + case 'e': + { + struct spec_entry *next +@@ -1219,9 +1231,18 @@ + next->text_len = olen; + next->entry_sections = NULL; + next->entry_sections_tail = NULL; +- next->next = entries_to_add; +- entries_to_add = next; +- n_entries_to_add++; ++ if (opt == 'e') ++ { ++ next->next = entries_to_add; ++ entries_to_add = next; ++ n_entries_to_add++; ++ } ++ else ++ { ++ next->next = default_entries_to_add; ++ default_entries_to_add = next; ++ n_default_entries_to_add++; ++ } + } + break; + +@@ -1259,6 +1280,10 @@ + } + break; + ++ case 'S': ++ default_section = optarg; ++ break; ++ + case 'V': + printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION); + puts (""); +@@ -1301,6 +1326,11 @@ + &input_sections, &entries_to_add); + if (i > n_entries_to_add) + n_entries_to_add = i; ++ else if (n_entries_to_add == 0) ++ { ++ entries_to_add = default_entries_to_add; ++ n_entries_to_add = n_default_entries_to_add; ++ } + + if (!delete_flag) + { +@@ -1332,7 +1362,8 @@ + { + input_sections = (struct spec_section *) + xmalloc (sizeof (struct spec_section)); +- input_sections->name = "Miscellaneous"; ++ input_sections->name = ++ default_section ? default_section : "Miscellaneous"; + input_sections->next = NULL; + input_sections->missing = 1; + } +@@ -1423,9 +1454,14 @@ + dir_lines[i].start, + dir_lines[i].size) + && !dir_lines[i].delete) +- fatal (_("menu item `%s' already exists, for file `%s'"), ++ { ++ if (quiet_flag) ++ dir_lines[i].delete = 1; ++ else ++ fatal (_("menu item `%s' already exists, for file `%s'"), + extract_menu_item_name (entry->text), + extract_menu_file_name (dir_lines[i].start)); ++ } + if (dir_lines[i].start[0] == '*' + && menu_line_lessp (entry->text, entry->text_len, + dir_lines[i].start, diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index 3d0e54b0f7..0116366748 100644 --- a/gnu/usr.bin/texinfo/libtxi/Makefile +++ b/gnu/usr.bin/texinfo/libtxi/Makefile @@ -1,10 +1,10 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.7.2.1 2002/07/19 18:46:24 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/libtxi/Makefile,v 1.3 2005/08/28 12:25:05 asmodai Exp $ LIB= txi INTERNALLIB= true -SRCS= getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c +SRCS= substring.c xexit.c xmalloc.c xstrdup.c .include diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index 6a5f35abc6..c848137972 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,10 +1,10 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.13.2.2 2002/08/07 16:53:37 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/makeinfo/Makefile,v 1.3 2005/08/28 12:25:05 asmodai Exp $ PROG= makeinfo -SRCS= cmds.c docbook.c defun.c files.c footnote.c html.c \ +SRCS= cmds.c defun.c files.c float.c footnote.c html.c \ index.c insertion.c lang.c macro.c makeinfo.c multi.c \ - node.c sectioning.c toc.c xml.c + node.c sectioning.c toc.c xml.c xref.c DPADD= ${LIBTXI} LDADD= ${LIBTXI} -- 2.41.0