Module Name: src Committed By: yamt Date: Thu May 22 11:36:30 UTC 2014
Modified Files: src/gnu/dist/bc/bc [yamt-pagecache]: scan.l src/gnu/dist/gcc4/gcc [yamt-pagecache]: gcc.c target-def.h src/gnu/dist/gcc4/gcc/config [yamt-pagecache]: netbsd-elf.h src/gnu/dist/gcc4/gcc/config/arm [yamt-pagecache]: arm.h src/gnu/dist/gcc4/gcc/config/vax [yamt-pagecache]: vax.c vax.h vax.md src/gnu/dist/gcc4/libobjc [yamt-pagecache]: archive.c sendmsg.c src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd [yamt-pagecache]: ctype_base.h ctype_noninline.h src/gnu/dist/gcc4/libstdc++-v3/include/ext [yamt-pagecache]: rope ropeimpl.h src/gnu/dist/gettext/gettext-tools/doc [yamt-pagecache]: Makefile.in src/gnu/dist/gkermit [yamt-pagecache]: gkermit.c gkermit.nr src/gnu/dist/groff/src/devices/grohtml [yamt-pagecache]: post-html.cpp src/gnu/dist/groff/src/roff/troff [yamt-pagecache]: node.cpp src/gnu/dist/groff/tmac [yamt-pagecache]: doc-common groff_mdoc.man src/gnu/dist/texinfo/info [yamt-pagecache]: session.c src/gnu/dist/texinfo/util [yamt-pagecache]: texi2dvi src/gnu/usr.bin/c89 [yamt-pagecache]: c89.1 src/gnu/usr.bin/c99 [yamt-pagecache]: c99.1 src/gnu/usr.bin/gettext/include [yamt-pagecache]: config.h src/gnu/usr.bin/gettext/libnlspr [yamt-pagecache]: Makefile src/gnu/usr.bin/gettext/libnlsut [yamt-pagecache]: Makefile src/gnu/usr.bin/gettext/msginit [yamt-pagecache]: Makefile src/gnu/usr.bin/groff/tmac [yamt-pagecache]: mdoc.local src/gnu/usr.bin/send-pr [yamt-pagecache]: categories src/gnu/usr.bin/texinfo/makeinfo [yamt-pagecache]: Makefile Removed Files: src/gnu/dist/gmake/doc [yamt-pagecache]: make.info make.info-1 make.info-10 make.info-11 make.info-2 make.info-3 make.info-4 make.info-5 make.info-6 make.info-7 make.info-8 make.info-9 Log Message: sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.56.1 src/gnu/dist/bc/bc/scan.l cvs rdiff -u -r1.5 -r1.5.4.1 src/gnu/dist/gcc4/gcc/gcc.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 src/gnu/dist/gcc4/gcc/target-def.h cvs rdiff -u -r1.2 -r1.2.42.1 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 src/gnu/dist/gcc4/gcc/config/arm/arm.h cvs rdiff -u -r1.15.34.1 -r1.15.34.2 src/gnu/dist/gcc4/gcc/config/vax/vax.c cvs rdiff -u -r1.5 -r1.5.34.1 src/gnu/dist/gcc4/gcc/config/vax/vax.h cvs rdiff -u -r1.14.6.2 -r1.14.6.3 src/gnu/dist/gcc4/gcc/config/vax/vax.md cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 src/gnu/dist/gcc4/libobjc/archive.c cvs rdiff -u -r1.2 -r1.2.42.1 src/gnu/dist/gcc4/libobjc/sendmsg.c cvs rdiff -u -r1.2 -r1.2.6.1 \ src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 \ src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 \ src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope cvs rdiff -u -r1.2 -r1.2.4.1 \ src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.42.1 \ src/gnu/dist/gettext/gettext-tools/doc/Makefile.in cvs rdiff -u -r1.3 -r1.3.4.1 src/gnu/dist/gkermit/gkermit.c cvs rdiff -u -r1.1.1.1 -r1.1.1.1.40.1 src/gnu/dist/gkermit/gkermit.nr cvs rdiff -u -r1.1.1.1 -r0 src/gnu/dist/gmake/doc/make.info \ src/gnu/dist/gmake/doc/make.info-1 src/gnu/dist/gmake/doc/make.info-10 \ src/gnu/dist/gmake/doc/make.info-11 src/gnu/dist/gmake/doc/make.info-2 \ src/gnu/dist/gmake/doc/make.info-3 src/gnu/dist/gmake/doc/make.info-4 \ src/gnu/dist/gmake/doc/make.info-5 src/gnu/dist/gmake/doc/make.info-6 \ src/gnu/dist/gmake/doc/make.info-7 src/gnu/dist/gmake/doc/make.info-8 \ src/gnu/dist/gmake/doc/make.info-9 cvs rdiff -u -r1.1.1.3 -r1.1.1.3.42.1 \ src/gnu/dist/groff/src/devices/grohtml/post-html.cpp cvs rdiff -u -r1.1.1.3.42.1 -r1.1.1.3.42.2 \ src/gnu/dist/groff/src/roff/troff/node.cpp cvs rdiff -u -r1.9 -r1.9.6.1 src/gnu/dist/groff/tmac/doc-common cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/gnu/dist/groff/tmac/groff_mdoc.man cvs rdiff -u -r1.5 -r1.5.2.1 src/gnu/dist/texinfo/info/session.c cvs rdiff -u -r1.9 -r1.9.2.1 src/gnu/dist/texinfo/util/texi2dvi cvs rdiff -u -r1.2 -r1.2.4.1 src/gnu/usr.bin/c89/c89.1 cvs rdiff -u -r1.3 -r1.3.6.1 src/gnu/usr.bin/c99/c99.1 cvs rdiff -u -r1.4 -r1.4.6.1 src/gnu/usr.bin/gettext/include/config.h cvs rdiff -u -r1.9 -r1.9.4.1 src/gnu/usr.bin/gettext/libnlspr/Makefile cvs rdiff -u -r1.9 -r1.9.6.1 src/gnu/usr.bin/gettext/libnlsut/Makefile cvs rdiff -u -r1.3 -r1.3.40.1 src/gnu/usr.bin/gettext/msginit/Makefile cvs rdiff -u -r1.65.2.2 -r1.65.2.3 src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.57 -r1.57.4.1 src/gnu/usr.bin/send-pr/categories cvs rdiff -u -r1.7 -r1.7.4.1 src/gnu/usr.bin/texinfo/makeinfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/gnu/dist/bc/bc/scan.l diff -u src/gnu/dist/bc/bc/scan.l:1.3 src/gnu/dist/bc/bc/scan.l:1.3.56.1 --- src/gnu/dist/bc/bc/scan.l:1.3 Mon Jan 8 04:03:30 2001 +++ src/gnu/dist/bc/bc/scan.l Thu May 22 11:36:28 2014 @@ -80,19 +80,18 @@ null_prompt (EditLine *el) */ static void -bcel_input (buf, result, max) - char *buf; - int *result; - int max; +bcel_input (char *buf, yy_size_t *result, int max) { if (!edit || yyin != stdin) { - while ( (*result = read( fileno(yyin), buf, max )) < 0 ) + ssize_t rv; + while ( (rv = read( fileno(yyin), buf, max )) < 0 ) if (errno != EINTR) { yyerror( "read() in flex scanner failed" ); exit (1); } + *result = rv; return; } Index: src/gnu/dist/gcc4/gcc/gcc.c diff -u src/gnu/dist/gcc4/gcc/gcc.c:1.5 src/gnu/dist/gcc4/gcc/gcc.c:1.5.4.1 --- src/gnu/dist/gcc4/gcc/gcc.c:1.5 Sun Apr 10 16:50:18 2011 +++ src/gnu/dist/gcc4/gcc/gcc.c Thu May 22 11:36:28 2014 @@ -2888,10 +2888,11 @@ execute (void) else #endif fatal ("\ -Internal error: %s (program %s)\n\ +Internal error: %s (program %s received signal %d)\n\ Please submit a full bug report.\n\ See %s for instructions.", strsignal (WTERMSIG (status)), commands[i].prog, + WTERMSIG (status), bug_report_url); signal_count++; ret_code = -1; Index: src/gnu/dist/gcc4/gcc/target-def.h diff -u src/gnu/dist/gcc4/gcc/target-def.h:1.1.1.1 src/gnu/dist/gcc4/gcc/target-def.h:1.1.1.1.42.1 --- src/gnu/dist/gcc4/gcc/target-def.h:1.1.1.1 Thu Apr 20 09:05:40 2006 +++ src/gnu/dist/gcc4/gcc/target-def.h Thu May 22 11:36:28 2014 @@ -473,6 +473,7 @@ Foundation, 51 Franklin Street, Fifth Fl } #ifndef TARGET_UNWIND_TABLES_DEFAULT +#error "Missing unwind_tables_default" #define TARGET_UNWIND_TABLES_DEFAULT false #endif Index: src/gnu/dist/gcc4/gcc/config/netbsd-elf.h diff -u src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2 src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2.42.1 --- src/gnu/dist/gcc4/gcc/config/netbsd-elf.h:1.2 Fri May 12 00:42:13 2006 +++ src/gnu/dist/gcc4/gcc/config/netbsd-elf.h Thu May 22 11:36:28 2014 @@ -81,7 +81,7 @@ Boston, MA 02110-1301, USA. */ Target-specific code must provide the %(netbsd_entry_point) spec. */ #define NETBSD_LINK_SPEC_ELF \ - "%{assert*} %{R*} %{rpath*} \ + "--eh-frame-hdr %{assert*} %{R*} %{rpath*} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ %{!shared: \ @@ -93,3 +93,6 @@ Boston, MA 02110-1301, USA. */ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \ %{static:-static}}" + +#undef TARGET_UNWIND_TABLES_DEFAULT +#define TARGET_UNWIND_TABLES_DEFAULT true Index: src/gnu/dist/gcc4/gcc/config/arm/arm.h diff -u src/gnu/dist/gcc4/gcc/config/arm/arm.h:1.1.1.1 src/gnu/dist/gcc4/gcc/config/arm/arm.h:1.1.1.1.42.1 --- src/gnu/dist/gcc4/gcc/config/arm/arm.h:1.1.1.1 Thu Apr 20 09:50:52 2006 +++ src/gnu/dist/gcc4/gcc/config/arm/arm.h Thu May 22 11:36:28 2014 @@ -77,7 +77,12 @@ extern char arm_arch_name[]; if (arm_arch_iwmmxt) \ builtin_define ("__IWMMXT__"); \ if (TARGET_AAPCS_BASED) \ - builtin_define ("__ARM_EABI__"); \ + { \ + builtin_define ("__ARM_EABI__"); \ + builtin_define ("__ARM_PCS"); \ + if (TARGET_HARD_FLOAT && TARGET_VFP) \ + builtin_define ("__ARM_PCS_VFP"); \ + } \ } while (0) /* The various ARM cores. */ Index: src/gnu/dist/gcc4/gcc/config/vax/vax.c diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.15.34.1 src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.15.34.2 --- src/gnu/dist/gcc4/gcc/config/vax/vax.c:1.15.34.1 Tue Apr 17 00:05:07 2012 +++ src/gnu/dist/gcc4/gcc/config/vax/vax.c Thu May 22 11:36:29 2014 @@ -124,16 +124,22 @@ vax_output_function_prologue (FILE * fil if (dwarf2out_do_frame ()) { const char *label = dwarf2out_cfi_label (); - int offset = 0; + int offset; - for (regno = FIRST_PSEUDO_REGISTER-1; regno >= 0; --regno) - if (regs_ever_live[regno] && !call_used_regs[regno]) - dwarf2out_reg_save (label, regno, offset -= 4); - - dwarf2out_reg_save (label, PC_REGNUM, offset -= 4); - dwarf2out_reg_save (label, FRAME_POINTER_REGNUM, offset -= 4); - dwarf2out_reg_save (label, ARG_POINTER_REGNUM, offset -= 4); - dwarf2out_def_cfa (label, FRAME_POINTER_REGNUM, -(offset - 4)); + offset = -20; + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) + if (regs_ever_live[regno] && !call_used_regs[regno]) + offset -= 4; + + dwarf2out_def_cfa (label, FRAME_POINTER_REGNUM, -offset); + dwarf2out_reg_save (label, PSW_REGNUM, offset += 4); + dwarf2out_reg_save (label, ARG_POINTER_REGNUM, offset += 4); + dwarf2out_reg_save (label, FRAME_POINTER_REGNUM, offset += 4); + dwarf2out_reg_save (label, PC_REGNUM, offset += 4); + + for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) + if (regs_ever_live[regno] && !call_used_regs[regno]) + dwarf2out_reg_save (label, regno, offset += 4); } size -= STARTING_FRAME_OFFSET; @@ -1075,7 +1081,7 @@ vax_output_int_move (rtx insn ATTRIBUTE_ { operands[1] = GEN_INT (lval); operands[2] = GEN_INT (n); - return "ashq %2,%1,%0"; + return "ashq %2,%D1,%0"; } #if HOST_BITS_PER_WIDE_INT == 32 } @@ -1087,7 +1093,7 @@ vax_output_int_move (rtx insn ATTRIBUTE_ { operands[1] = GEN_INT (hval >> n); operands[2] = GEN_INT (n + 32); - return "ashq %2,%1,%0"; + return "ashq %2,%D1,%0"; #endif } } Index: src/gnu/dist/gcc4/gcc/config/vax/vax.h diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.5 src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.5.34.1 --- src/gnu/dist/gcc4/gcc/config/vax/vax.h:1.5 Mon Apr 2 16:44:17 2007 +++ src/gnu/dist/gcc4/gcc/config/vax/vax.h Thu May 22 11:36:29 2014 @@ -166,6 +166,9 @@ Boston, MA 02110-1301, USA. */ /* Specify the registers used for certain standard purposes. The values of these macros are register numbers. */ +/* VAX PSW for DWARF-2 */ +#define PSW_REGNUM VAX_PSW_REGNUM + /* VAX pc is overloaded on a register. */ #define PC_REGNUM VAX_PC_REGNUM Index: src/gnu/dist/gcc4/gcc/config/vax/vax.md diff -u src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.14.6.2 src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.14.6.3 --- src/gnu/dist/gcc4/gcc/config/vax/vax.md:1.14.6.2 Tue Oct 30 18:58:28 2012 +++ src/gnu/dist/gcc4/gcc/config/vax/vax.md Thu May 22 11:36:29 2014 @@ -40,6 +40,7 @@ (VAX_FP_REGNUM 13) ; Register 13 contains the frame pointer (VAX_SP_REGNUM 14) ; Register 14 contains the stack pointer (VAX_PC_REGNUM 15) ; Register 15 contains the program counter + (VAX_PSW_REGNUM 16) ; Program Status Word ] ) @@ -724,14 +725,14 @@ (ashift:DI (match_operand:DI 1 "general_operand" "g") (match_operand:QI 2 "general_operand" "g")))] "" - "ashq %2,%1,%0") + "ashq %2,%D1,%0") (define_insn "" [(set (match_operand:DI 0 "nonimmediate_operand" "=g") (ashiftrt:DI (match_operand:DI 1 "general_operand" "g") (neg:QI (match_operand:QI 2 "general_operand" "g"))))] "" - "ashq %2,%1,%0") + "ashq %2,%D1,%0") ;; We used to have expand_shift handle logical right shifts by using extzv, ;; but this make it very difficult to do lshrdi3. Since the VAX is the Index: src/gnu/dist/gcc4/libobjc/archive.c diff -u src/gnu/dist/gcc4/libobjc/archive.c:1.1.1.1 src/gnu/dist/gcc4/libobjc/archive.c:1.1.1.1.42.1 --- src/gnu/dist/gcc4/libobjc/archive.c:1.1.1.1 Thu Apr 20 09:55:17 2006 +++ src/gnu/dist/gcc4/libobjc/archive.c Thu May 22 11:36:29 2014 @@ -351,7 +351,7 @@ objc_write_use_common (struct objc_typed } } -static inline int +inline int __objc_write_extension (struct objc_typed_stream *stream, unsigned char code) { if (code <= _B_VALUE) @@ -367,7 +367,7 @@ __objc_write_extension (struct objc_type } } -inline int +static inline int __objc_write_object (struct objc_typed_stream *stream, id object) { unsigned char buf = '\0'; @@ -433,7 +433,7 @@ objc_write_object (struct objc_typed_str } } -inline int +static inline int __objc_write_class (struct objc_typed_stream *stream, struct objc_class *class) { __objc_write_extension (stream, _BX_CLASS); Index: src/gnu/dist/gcc4/libobjc/sendmsg.c diff -u src/gnu/dist/gcc4/libobjc/sendmsg.c:1.2 src/gnu/dist/gcc4/libobjc/sendmsg.c:1.2.42.1 --- src/gnu/dist/gcc4/libobjc/sendmsg.c:1.2 Fri May 12 00:25:04 2006 +++ src/gnu/dist/gcc4/libobjc/sendmsg.c Thu May 22 11:36:29 2014 @@ -86,7 +86,7 @@ Method_t search_for_method_in_list (Meth id nil_method (id, SEL); /* Given a selector, return the proper forwarding implementation. */ -inline +static inline IMP __objc_get_forward_imp (SEL sel) { Index: src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h diff -u src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h:1.2 src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h:1.2.6.1 --- src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h:1.2 Tue Dec 14 02:28:57 2010 +++ src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h Thu May 22 11:36:29 2014 @@ -35,6 +35,8 @@ // Full details can be found from the CVS files at: // anon...@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h // See www.netbsd.org for details of access. + +#include <sys/ctype_bits.h> struct ctype_base { @@ -43,16 +45,16 @@ // NB: Offsets into ctype<char>::_M_table force a particular size // on the mask type. Because of this, we don't use an enum. - typedef unsigned char mask; + typedef unsigned short mask; static const mask upper = _CTYPE_U; static const mask lower = _CTYPE_L; - static const mask alpha = _CTYPE_U | _CTYPE_L; - static const mask digit = _CTYPE_N; - static const mask xdigit = _CTYPE_N | _CTYPE_X; + static const mask alpha = _CTYPE_A; + static const mask digit = _CTYPE_D; + static const mask xdigit = _CTYPE_X; static const mask space = _CTYPE_S; - static const mask print = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N | _CTYPE_B; - static const mask graph = _CTYPE_P | _CTYPE_U | _CTYPE_L | _CTYPE_N; + static const mask print = _CTYPE_R; + static const mask graph = _CTYPE_G; static const mask cntrl = _CTYPE_C; static const mask punct = _CTYPE_P; - static const mask alnum = _CTYPE_U | _CTYPE_L | _CTYPE_N; + static const mask alnum = _CTYPE_A | _CTYPE_D; }; Index: src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h diff -u src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h:1.1.1.1 src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h:1.1.1.1.42.1 --- src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h:1.1.1.1 Thu Apr 20 10:16:24 2006 +++ src/gnu/dist/gcc4/libstdc++-v3/config/os/bsd/netbsd/ctype_noninline.h Thu May 22 11:36:29 2014 @@ -33,11 +33,11 @@ // Information as gleaned from /usr/include/ctype.h - extern "C" const u_int8_t _C_ctype_[]; + extern "C" const unsigned short _C_ctype_tab_[]; const ctype_base::mask* ctype<char>::classic_table() throw() - { return _C_ctype_ + 1; } + { return _C_ctype_tab_ + 1; } ctype<char>::ctype(__c_locale, const mask* __table, bool __del, size_t __refs) Index: src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope diff -u src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope:1.1.1.1 src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope:1.1.1.1.42.1 --- src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope:1.1.1.1 Thu Apr 20 10:03:58 2006 +++ src/gnu/dist/gcc4/libstdc++-v3/include/ext/rope Thu May 22 11:36:29 2014 @@ -708,7 +708,7 @@ protected: if (_M_data != this->_M_c_string) this->_M_free_c_string(); - __STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator()); + this->__STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator()); } #endif protected: @@ -1150,7 +1150,7 @@ protected: operator*() { if (0 == this->_M_buf_ptr) - _S_setcache(*this); + this->_S_setcache(*this); return *this->_M_buf_ptr; } Index: src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h diff -u src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.2 src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.2.4.1 --- src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h:1.2 Sat Feb 5 00:37:40 2011 +++ src/gnu/dist/gcc4/libstdc++-v3/include/ext/ropeimpl.h Thu May 22 11:36:29 2014 @@ -382,7 +382,7 @@ namespace __gnu_cxx _Rope_RopeLeaf<_CharT, _Alloc>* __l = (_Rope_RopeLeaf<_CharT, _Alloc>*)this; __l->_Rope_RopeLeaf<_CharT, _Alloc>::~_Rope_RopeLeaf(); - _L_deallocate(__l, 1); + this->_L_deallocate(__l, 1); break; } case _Rope_constants::_S_concat: @@ -391,7 +391,7 @@ namespace __gnu_cxx = (_Rope_RopeConcatenation<_CharT, _Alloc>*)this; __c->_Rope_RopeConcatenation<_CharT, _Alloc>:: ~_Rope_RopeConcatenation(); - _C_deallocate(__c, 1); + this->_C_deallocate(__c, 1); break; } case _Rope_constants::_S_function: @@ -399,7 +399,7 @@ namespace __gnu_cxx _Rope_RopeFunction<_CharT, _Alloc>* __f = (_Rope_RopeFunction<_CharT, _Alloc>*)this; __f->_Rope_RopeFunction<_CharT, _Alloc>::~_Rope_RopeFunction(); - _F_deallocate(__f, 1); + this->_F_deallocate(__f, 1); break; } case _Rope_constants::_S_substringfn: @@ -408,7 +408,7 @@ namespace __gnu_cxx (_Rope_RopeSubstring<_CharT, _Alloc>*)this; __ss->_Rope_RopeSubstring<_CharT, _Alloc>:: ~_Rope_RopeSubstring(); - _S_deallocate(__ss, 1); + this->_S_deallocate(__ss, 1); break; } } @@ -513,7 +513,7 @@ namespace __gnu_cxx } catch(...) { - _C_deallocate(__result,1); + rope::_C_deallocate(__result,1); __throw_exception_again; } // In case of exception, we need to deallocate Index: src/gnu/dist/gettext/gettext-tools/doc/Makefile.in diff -u src/gnu/dist/gettext/gettext-tools/doc/Makefile.in:1.1.1.1 src/gnu/dist/gettext/gettext-tools/doc/Makefile.in:1.1.1.1.42.1 --- src/gnu/dist/gettext/gettext-tools/doc/Makefile.in:1.1.1.1 Fri Apr 29 15:07:11 2005 +++ src/gnu/dist/gettext/gettext-tools/doc/Makefile.in Thu May 22 11:36:29 2014 @@ -719,11 +719,15 @@ uninstall-am: uninstall-docDATA uninstal iso-639.texi: ISO_639 iso-639.sed + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_iso-639.texi: $(SED) -f $(srcdir)/iso-639.sed $(srcdir)/ISO_639 > iso-639.tmp rm -f $(srcdir)/iso-639.texi mv iso-639.tmp $(srcdir)/iso-639.texi iso-3166.texi: ISO_3166 iso-3166.sed + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_iso-3166.texi: $(SED) -f $(srcdir)/iso-3166.sed $(srcdir)/ISO_3166 > iso-3166.tmp rm -f $(srcdir)/iso-3166.texi mv iso-3166.tmp $(srcdir)/iso-3166.texi Index: src/gnu/dist/gkermit/gkermit.c diff -u src/gnu/dist/gkermit/gkermit.c:1.3 src/gnu/dist/gkermit/gkermit.c:1.3.4.1 --- src/gnu/dist/gkermit/gkermit.c:1.3 Sun May 15 14:30:08 2011 +++ src/gnu/dist/gkermit/gkermit.c Thu May 22 11:36:29 2014 @@ -131,8 +131,8 @@ char spadc = 0, /* Padding character rcvpkt[MAXRP+16], /* Packet most recently received */ *rdatap, /* Pointer to data field of rcvpkt */ xxdata[MAXRP+16], /* Packet data buffer */ - *isp = NUL, /* Input string pointer */ - *osp = NUL, /* Output string pointer */ + *isp = NULL, /* Input string pointer */ + *osp = NULL, /* Output string pointer */ smark = '\1', /* Outbound packet-start character */ rmark = '\1'; /* Incoming packet-start character */ Index: src/gnu/dist/gkermit/gkermit.nr diff -u src/gnu/dist/gkermit/gkermit.nr:1.1.1.1 src/gnu/dist/gkermit/gkermit.nr:1.1.1.1.40.1 --- src/gnu/dist/gkermit/gkermit.nr:1.1.1.1 Wed Nov 1 13:03:57 2006 +++ src/gnu/dist/gkermit/gkermit.nr Thu May 22 11:36:29 2014 @@ -2,7 +2,6 @@ .TH GKERMIT 1C "25 Dec 1999" "UNIX G-Kermit" .SH NAME gkermit \- G-Kermit (GNU Kermit) 1.00 file transfer software. -.ll 80 .SH SYNOPSIS .nf .sp Index: src/gnu/dist/groff/src/devices/grohtml/post-html.cpp diff -u src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.1.1.3 src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.1.1.3.42.1 --- src/gnu/dist/groff/src/devices/grohtml/post-html.cpp:1.1.1.3 Mon Feb 6 18:14:50 2006 +++ src/gnu/dist/groff/src/devices/grohtml/post-html.cpp Thu May 22 11:36:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: post-html.cpp,v 1.1.1.3 2006/02/06 18:14:50 wiz Exp $ */ +/* $NetBSD: post-html.cpp,v 1.1.1.3.42.1 2014/05/22 11:36:29 yamt Exp $ */ // -*- C++ -*- /* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 @@ -1589,7 +1589,7 @@ void header_desc::write_headings (FILE * buffer += as_string(h); buffer += '\0'; - fprintf(f, buffer.contents()); + fprintf(f, "%s", buffer.contents()); } else fputs(g->text_string, f); h++; Index: src/gnu/dist/groff/src/roff/troff/node.cpp diff -u src/gnu/dist/groff/src/roff/troff/node.cpp:1.1.1.3.42.1 src/gnu/dist/groff/src/roff/troff/node.cpp:1.1.1.3.42.2 --- src/gnu/dist/groff/src/roff/troff/node.cpp:1.1.1.3.42.1 Tue Apr 17 00:05:09 2012 +++ src/gnu/dist/groff/src/roff/troff/node.cpp Thu May 22 11:36:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: node.cpp,v 1.1.1.3.42.1 2012/04/17 00:05:09 yamt Exp $ */ +/* $NetBSD: node.cpp,v 1.1.1.3.42.2 2014/05/22 11:36:29 yamt Exp $ */ // -*- C++ -*- /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005 @@ -2159,7 +2159,7 @@ void glyph_node::debug_node() if (c) fprintf(stderr, "%c", c); else - fprintf(stderr, ci->nm.contents()); + fprintf(stderr, "%s", ci->nm.contents()); if (push_state) fprintf(stderr, " <push_state>"); if (state) Index: src/gnu/dist/groff/tmac/doc-common diff -u src/gnu/dist/groff/tmac/doc-common:1.9 src/gnu/dist/groff/tmac/doc-common:1.9.6.1 --- src/gnu/dist/groff/tmac/doc-common:1.9 Sun Oct 25 18:33:36 2009 +++ src/gnu/dist/groff/tmac/doc-common Thu May 22 11:36:29 2014 @@ -276,10 +276,10 @@ .ds doc-volume-as-evbppc evbppc .ds doc-volume-as-evbsh3 evbsh3 .ds doc-volume-as-hp300 hp300 -.ds doc-volume-as-hp700 hp700 .ds doc-volume-as-hpcarm hpcarm .ds doc-volume-as-hpcmips hpcmips .ds doc-volume-as-hpcsh hpcsh +.ds doc-volume-as-hppa hppa .ds doc-volume-as-i386 i386 .ds doc-volume-as-luna68k luna68k .ds doc-volume-as-m68k m68k Index: src/gnu/dist/groff/tmac/groff_mdoc.man diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.16.4.1 src/gnu/dist/groff/tmac/groff_mdoc.man:1.16.4.2 --- src/gnu/dist/groff/tmac/groff_mdoc.man:1.16.4.1 Tue Apr 17 00:05:09 2012 +++ src/gnu/dist/groff/tmac/groff_mdoc.man Thu May 22 11:36:29 2014 @@ -44,7 +44,7 @@ .\" for an already extremely slow package. .\" . -.Dd November 17, 2009 +.Dd June 9, 2013 .Os .Dt GROFF_MDOC 7 . @@ -771,7 +771,7 @@ By default, the following architecture k .Bd -ragged -offset indent .No alpha , acorn26 , acorn32 , algor , amd64 , amiga , arc , arm26 , .No arm32 , atari , bebox , cats , cesfic , cobalt , dreamcast , evbarm , -.No evbmips , evbppc , evbsh3 , hp300 , hp700 , hpcmips , i386 , luna68k , +.No evbmips , evbppc , evbsh3 , hp300 , hpcmips , hppa , i386 , luna68k , .No m68k , mac68k , macppc , mips , mmeye , mvme68k , mvmeppc , netwinder , .No news68k , newsmips , next68k , ofppc , pc532 , pmax , pmppc , powerpc , .No prep , sandpoint , sgimips , sh3 , shark , sparc , sparc64 , sun3 , @@ -1180,8 +1180,8 @@ documented, or the name of the author of .An "Joe Author" .It Li ".An \*[q]Joe Author\*[q] ," .An "Joe Author" , -.It Li ".An \*[q]Joe Author\*[q] Aq nob...@freebsd.org" -.An "Joe Author" Aq nob...@freebsd.org +.It Li ".An \*[q]Joe Author\*[q] Aq Mt nob...@freebsd.org" +.An "Joe Author" Aq Mt nob...@freebsd.org .It Li ".An \*[q]Joe Author\*[q] ) ) ," .An "Joe Author" ) ) , .El @@ -1272,7 +1272,8 @@ macro does not assert a dash in front of Traditionally flags are marked by the preceding dash, however, some commands or subsets of commands do not use them. Command modifiers may also be specified in conjunction with interactive -commands such as editor commands. +commands such as editor commands, or used for fixed command strings given +on the command line to change program behaviour. See .Sx Flags . .Pp Index: src/gnu/dist/texinfo/info/session.c diff -u src/gnu/dist/texinfo/info/session.c:1.5 src/gnu/dist/texinfo/info/session.c:1.5.2.1 --- src/gnu/dist/texinfo/info/session.c:1.5 Tue Sep 2 08:41:51 2008 +++ src/gnu/dist/texinfo/info/session.c Thu May 22 11:36:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: session.c,v 1.5 2008/09/02 08:41:51 christos Exp $ */ +/* $NetBSD: session.c,v 1.5.2.1 2014/05/22 11:36:29 yamt Exp $ */ /* session.c -- user windowing interface to Info. Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp @@ -2020,7 +2020,7 @@ nearest_xref (REFERENCE **xref_list, lon /* See how far POS is from this xref. Take into account the `*Note' that begins the xref, since as far as the user is concerned, that's where it starts. */ - delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))), + delta = MIN (labs (pos - (xref->start - (long)strlen (INFO_XREF_LABEL))), labs (pos - xref->end)); /* It's the <= instead of < that makes us choose the forward xref @@ -2247,7 +2247,7 @@ info_menu_or_ref_item (WINDOW *window, i { /* ref->end is more accurate estimate of position for menus than ref->start. Go figure. */ - int dist = abs (window->point - ref->end); + int dist = labs (window->point - ref->end); if (dist < min_dist) { Index: src/gnu/dist/texinfo/util/texi2dvi diff -u src/gnu/dist/texinfo/util/texi2dvi:1.9 src/gnu/dist/texinfo/util/texi2dvi:1.9.2.1 --- src/gnu/dist/texinfo/util/texi2dvi:1.9 Tue Sep 2 08:00:24 2008 +++ src/gnu/dist/texinfo/util/texi2dvi Thu May 22 11:36:29 2014 @@ -605,10 +605,10 @@ $textra" "$filename_input" >"$filename_x # If this is a Texinfo file with a specified input encoding, and # recode is available, then recode to plain 7 bit Texinfo. if test $language = texinfo; then - pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ - t found - d - :found + pgm='s/\(^\|.* \)@documentencoding *\([^ ][^ ]*\)\( .*\|$\)/\2/ + t found + d + :found q' encoding=`sed -e "$pgm" "$filename_input"` if $recode && test -n "$encoding" && findprog recode; then Index: src/gnu/usr.bin/c89/c89.1 diff -u src/gnu/usr.bin/c89/c89.1:1.2 src/gnu/usr.bin/c89/c89.1:1.2.4.1 --- src/gnu/usr.bin/c89/c89.1:1.2 Wed Apr 30 13:10:50 2008 +++ src/gnu/usr.bin/c89/c89.1 Thu May 22 11:36:29 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: c89.1,v 1.2 2008/04/30 13:10:50 martin Exp $ +.\" $NetBSD: c89.1,v 1.2.4.1 2014/05/22 11:36:29 yamt Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ and definition of the preprocessor symbo .Ev __STRICT_ANSI__ . .Pp The following options are available: -.Bl -tag -width -pedantic-errorsxx +.Bl -tag -width "-pedantic-errorsxx" .It Fl pedantic Issue extra warnings defined by ANSI for use of non-ANSI features. .It Fl pedantic-errors Index: src/gnu/usr.bin/c99/c99.1 diff -u src/gnu/usr.bin/c99/c99.1:1.3 src/gnu/usr.bin/c99/c99.1:1.3.6.1 --- src/gnu/usr.bin/c99/c99.1:1.3 Fri May 14 01:53:28 2010 +++ src/gnu/usr.bin/c99/c99.1 Thu May 22 11:36:29 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: c99.1,v 1.3 2010/05/14 01:53:28 joerg Exp $ +.\" $NetBSD: c99.1,v 1.3.6.1 2014/05/22 11:36:29 yamt Exp $ .\" .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -54,7 +54,7 @@ and definition of the preprocessor symbo .Ev __STRICT_ANSI__ . .Pp The following options are available: -.Bl -tag -width -pedantic-errorsxx +.Bl -tag -width "-pedantic-errorsxx" .It Fl pedantic Issue extra warnings defined by ANSI for use of non-ANSI features. .It Fl pedantic-errors Index: src/gnu/usr.bin/gettext/include/config.h diff -u src/gnu/usr.bin/gettext/include/config.h:1.4 src/gnu/usr.bin/gettext/include/config.h:1.4.6.1 --- src/gnu/usr.bin/gettext/include/config.h:1.4 Mon Oct 12 22:20:50 2009 +++ src/gnu/usr.bin/gettext/include/config.h Thu May 22 11:36:30 2014 @@ -382,10 +382,10 @@ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the `stpcpy' function. */ -/* #undef HAVE_STPCPY */ +#define HAVE_STPCPY 1 /* Define if you have the stpncpy() function and it works. */ -/* #undef HAVE_STPNCPY */ +#define HAVE_STPNCPY 1 /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 Index: src/gnu/usr.bin/gettext/libnlspr/Makefile diff -u src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9.4.1 --- src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 Thu May 26 12:56:28 2011 +++ src/gnu/usr.bin/gettext/libnlspr/Makefile Thu May 22 11:36:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2011/05/26 12:56:28 joerg Exp $ +# $NetBSD: Makefile,v 1.9.4.1 2014/05/22 11:36:30 yamt Exp $ LIBISPRIVATE= yes @@ -70,9 +70,9 @@ write-tcl.c .PATH: ${DIST}/gettext/gettext-tools/src ${DIST}/gettext/gettext-tools/lib CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl CPPFLAGS+=-I${DIST}/gettext/gettext-tools/src -CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\" -CPPFLAGS+=-DGETTEXTJAR=\"${DESTDIR}/usr/share/gettext/gettext.jar\" -CPPFLAGS+=-DGETTEXTDATADIR=\"${DESTDIR}/usr/share/gettext\" +CPPFLAGS+=-DLIBDIR=\"/usr/share\" +CPPFLAGS+=-DGETTEXTJAR=\"/usr/share/gettext/gettext.jar\" +CPPFLAGS+=-DGETTEXTDATADIR=\"/usr/share/gettext\" COPTS.format-java.c = -Wno-stack-protector COPTS.msgl-cat.c = -Wno-stack-protector Index: src/gnu/usr.bin/gettext/libnlsut/Makefile diff -u src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9 src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9.6.1 --- src/gnu/usr.bin/gettext/libnlsut/Makefile:1.9 Mon Oct 19 00:28:19 2009 +++ src/gnu/usr.bin/gettext/libnlsut/Makefile Thu May 22 11:36:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/10/19 00:28:19 christos Exp $ +# $NetBSD: Makefile,v 1.9.6.1 2014/05/22 11:36:30 yamt Exp $ LIBISPRIVATE= yes @@ -45,8 +45,6 @@ quotearg.c \ safe-read.c \ safe-write.c \ sh-quote.c \ -stpcpy.c \ -stpncpy.c \ tmpdir.c \ wait-process.c \ xallocsa.c \ Index: src/gnu/usr.bin/gettext/msginit/Makefile diff -u src/gnu/usr.bin/gettext/msginit/Makefile:1.3 src/gnu/usr.bin/gettext/msginit/Makefile:1.3.40.1 --- src/gnu/usr.bin/gettext/msginit/Makefile:1.3 Fri Nov 10 17:36:08 2006 +++ src/gnu/usr.bin/gettext/msginit/Makefile Thu May 22 11:36:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/11/10 17:36:08 christos Exp $ +# $NetBSD: Makefile,v 1.3.40.1 2014/05/22 11:36:30 yamt Exp $ PROG= msginit SRCS+= msginit.c \ @@ -9,9 +9,9 @@ localename.c .include "${.CURDIR}/../Makefile.inc.prog" CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl -CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\" \ - -DPROJECTSDIR=\"${DESTDIR}/usr/share\" \ - -DLOCALE_ALIAS_PATH=\"${DESTDIR}/usr/share/locale\" +CPPFLAGS+=-DLIBDIR=\"/usr/share\" \ + -DPROJECTSDIR=\"/usr/share\" \ + -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" COPTS.msginit.c = -Wno-stack-protector COPTS.localealias.c = -Wno-stack-protector Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.65.2.2 src/gnu/usr.bin/groff/tmac/mdoc.local:1.65.2.3 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.65.2.2 Tue Oct 30 18:58:33 2012 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Thu May 22 11:36:30 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.65.2.2 2012/10/30 18:58:33 yamt Exp $ +.\" $NetBSD: mdoc.local,v 1.65.2.3 2014/05/22 11:36:30 yamt Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -59,6 +59,7 @@ .ds doc-operating-system-NetBSD-5.0 5.0 .ds doc-operating-system-NetBSD-5.1 5.1 .ds doc-operating-system-NetBSD-6.0 6.0 +.ds doc-operating-system-NetBSD-6.1 6.1 .ds doc-operating-system-NetBSD-7.0 7.0 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 @@ -88,15 +89,22 @@ .ds doc-str-Lb-libdm Device-mapper Library (libdm, \-ldm) .ds doc-str-Lb-libexecinfo Backtrace Access Library (libexecinfo, \-lexecinfo) .ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) -.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) +.ds doc-str-Lb-libiscsi iSCSI Protocol Library (libiscsi, \-liscsi) .ds doc-str-Lb-libisns Internet Storage Name Service Library (libisns, \-lisns) -.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) -.ds doc-str-Lb-libperfuse PUFFS enabled relay to FUSE Library (libperfuse, \-lperfuse) +.ds doc-str-Lb-libmj Minimalist JSON Library (libmj, \-lmj) +.ds doc-str-Lb-libmandoc Mandoc Macro Compiler Library (libmandoc, \-lmandoc) +.ds doc-str-Lb-libnetpgp Netpgp Signing, Verification, Encryption and Decryption (libnetpgp, \-lnetpgp) +.ds doc-str-Lb-libnetpgpverify Netpgp Signature Verification (libnetpgpverify, \-lnetpgpverify) +.ds doc-str-Lb-libnpf NPF Packet Filter Library (libnpf, \-lnpf) +.ds doc-str-Lb-libperfuse PUFFS-enabled Relay to FUSE Library (libperfuse, \-lperfuse) .ds doc-str-Lb-libppath Property-List Paths Library (libppath, \-lppath) .ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) .ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) .ds doc-str-Lb-libquota Disk Quota Access and Control Library (libquota, \-lquota) .ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) +.ds doc-str-Lb-librumpclient Clientside Stubs for rump Kernel Remote Protocols (librumpclient, \-lrumpclient) .ds doc-str-Lb-libsaslc Simple Authentication and Security Layer client library (libsaslc, \-lsaslc) .ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) .ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) +.ds doc-str-St--p1003.1j-2000 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1j-2000 +.as doc-str-St--p1003.1j-2000 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) Index: src/gnu/usr.bin/send-pr/categories diff -u src/gnu/usr.bin/send-pr/categories:1.57 src/gnu/usr.bin/send-pr/categories:1.57.4.1 --- src/gnu/usr.bin/send-pr/categories:1.57 Thu Jan 27 18:51:16 2011 +++ src/gnu/usr.bin/send-pr/categories Thu May 22 11:36:30 2014 @@ -25,7 +25,6 @@ port-evbmips port-evbppc port-evbsh3 port-hp300 -port-hp700 port-hpcarm port-hpcmips port-hpcsh @@ -48,6 +47,7 @@ port-news68k port-newsmips port-next68k port-ofppc +port-playstation2 port-pmax port-powerpc port-prep Index: src/gnu/usr.bin/texinfo/makeinfo/Makefile diff -u src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.7 src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.7.4.1 --- src/gnu/usr.bin/texinfo/makeinfo/Makefile:1.7 Thu May 26 12:56:29 2011 +++ src/gnu/usr.bin/texinfo/makeinfo/Makefile Thu May 22 11:36:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/05/26 12:56:29 joerg Exp $ +# $NetBSD: Makefile,v 1.7.4.1 2014/05/22 11:36:30 yamt Exp $ PROG= makeinfo SRCS= cmds.c defun.c files.c float.c footnote.c \ @@ -12,4 +12,6 @@ WARNS?= 0 # pointer sign issues .include <bsd.prog.mk> +CPPFLAGS:= ${CPPFLAGS:S/-D_FORTIFY_SOURCE=2//} + .PATH: ${IDIST}/makeinfo ${IDIST}/doc