Munge patches using intptr_t to include stdint.h.

Patch changes are from Iain Morgan.  Beyond that, I have:
  omitted changing patches for line # and ~/orig nits
  used INSTALLATION_DIRS for share/doc/nedit

I sent mail to upstream about the patches.  After all, the distfile is
just about 9.5 years old, so surely they are due for at least a point
release.

7 files changed, 86 insertions, 46 deletions

diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 391493acab2..fd1de512b65 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2014/03/20 12:38:26 gdt Exp $
+# $NetBSD: Makefile,v 1.55 2014/03/22 17:26:12 gdt Exp $
 
 DISTNAME=	nedit-${VERS}-src
 PKGNAME=	nedit-${VERS}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	editors
+# @pkglint: MASTER_SITE_NEDIT is defined below
 MASTER_SITES=	${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} \
 		${MASTER_SITE_SOURCEFORGE:=nedit/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +25,7 @@ MASTER_SITE_NEDIT=	http://www.nedit.org/ftp/			\
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 BUILD_TARGET=		netbsd
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PREFIX}/share/doc/nedit
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/source/nedit ${DESTDIR}${PREFIX}/bin
@@ -33,7 +34,6 @@ do-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit.1
 	${INSTALL_MAN} ${WRKSRC}/doc/nc.man \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nedit-nc.1
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/nedit
 .for f in README ReleaseNotes
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/nedit
 .endfor
diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo
index d31d56c0f6f..701aa35d1ba 100644
--- a/editors/nedit/distinfo
+++ b/editors/nedit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2014/03/20 12:38:26 gdt Exp $
+$NetBSD: distinfo,v 1.17 2014/03/22 17:26:12 gdt Exp $
 
 SHA1 (nedit-5.5-src.tar.bz2) = 7d3c87a793a5047cf857af1ac82e39f3b33e8a87
 RMD160 (nedit-5.5-src.tar.bz2) = 93fce64bdc5d8a9eff86ab76cec67d44d676d0eb
@@ -6,11 +6,11 @@ Size (nedit-5.5-src.tar.bz2) = 1124825 bytes
 SHA1 (patch-Xlt_SlideC.c) = aafca789053536a0d3ca0bc98ae301c60697e4c2
 SHA1 (patch-aa) = 29cf7e55b23e437b0203e0dde09cc053d65f245c
 SHA1 (patch-source_highlight.c) = f6c8de27402e3e6d4fd73cb11e541c5c053835d9
-SHA1 (patch-source_interpret.c) = 85bd739969674bbe436b79362dec7ef70204888e
-SHA1 (patch-source_macro.c) = bb00f95dae17053f9a01bd2b18ed6f1139f65314
+SHA1 (patch-source_interpret.c) = c2fc78178c814fff1b572f8674f0fec3803926e5
+SHA1 (patch-source_macro.c) = e0a1562687c3f989d96eb2fc62a93452273d1ea7
 SHA1 (patch-source_menu.c) = 529be222b97904b82721dc79ae8fa587378ccd48
-SHA1 (patch-source_parse.y) = 9a126e619ec53b76bcfc404055642cb9e47df9e3
-SHA1 (patch-source_preferences.c) = 9d2d111e5bd1a06086f89bdcd3c692d2f9d6ca44
+SHA1 (patch-source_parse.y) = 089eb827eaa9d5d1b23237bf67df883d7d416a33
+SHA1 (patch-source_preferences.c) = 12c27f32cd7e9e2e6f48ac2f8fd53b2b42cba2e3
 SHA1 (patch-source_regularExp.c) = d607b663a3853a6963d3dea7a32ba6c42af681eb
 SHA1 (patch-source_search.c) = b60f984d803d58618813f39a4b93e27f2b9325c8
 SHA1 (patch-source_selection.c) = 28d0fd4eaddbd1e36ef2eef12ad28fa5adc406ca
@@ -20,7 +20,7 @@ SHA1 (patch-source_text.c) = e88669188ed3512ee3945ab68bb392d0f3aa7708
 SHA1 (patch-source_textBuf.c) = 06fadd285929922fe42904d3d49e7eacf4e61e90
 SHA1 (patch-source_textDisp.c) = 84e3631eb7076c77704390ac6aee66b27d0422f3
 SHA1 (patch-source_textDrag.c) = 8b66f1bb80bbc2b3cf3751ff7c601ded34b54646
-SHA1 (patch-source_userCmds.c) = 22c6468cffd2cd0d10af03452a2c14d63e893cbe
+SHA1 (patch-source_userCmds.c) = 7bf5de6ec24f5c5867a95bd75b6c038c92975a79
 SHA1 (patch-source_window.c) = 72fda2bf7cc178ec57f38d25915dab8a8765874d
 SHA1 (patch-util_misc.c) = d3445336389fc26b69b2e0205930f8843f224784
 SHA1 (patch-util_prefFile.c) = 2fb587dd1a4b27a16469b31f4355b9d7e62b37da
diff --git a/editors/nedit/patches/patch-source_interpret.c b/editors/nedit/patches/patch-source_interpret.c
index 6f062481d0a..4826eafa34b 100644
--- a/editors/nedit/patches/patch-source_interpret.c
+++ b/editors/nedit/patches/patch-source_interpret.c
@@ -1,12 +1,20 @@
-$NetBSD: patch-source_interpret.c,v 1.1 2013/04/28 20:35:22 dholland Exp $
+$NetBSD: patch-source_interpret.c,v 1.2 2014/03/22 17:26:13 gdt Exp $
 
 Silence gcc warnings about unsafe pointer casts.
 (This code should be rewritten to use a union, but I'm leaving that 
 for upstream.)
 
---- source/interpret.c~	2004-07-21 11:32:05.000000000 +0000
+--- source/interpret.c.orig	2004-07-21 11:32:05.000000000 +0000
 +++ source/interpret.c
-@@ -1254,14 +1254,14 @@ static int pushArraySymVal(void)
+@@ -45,6 +45,7 @@ static const char CVSID[] = "$Id: interp
+ #include <limits.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <stdint.h>
+ #ifdef VMS
+ #include "../util/VMSparam.h"
+ #else
+@@ -1254,14 +1255,14 @@ static int pushArraySymVal(void)
  {
      Symbol *sym;
      DataValue *dataPtr;
@@ -23,7 +31,7 @@ for upstream.)
      PC++;
      
      if (sym->type == LOCAL_SYM) {
-@@ -1872,7 +1872,7 @@ static int callSubroutine(void)
+@@ -1872,7 +1873,7 @@ static int callSubroutine(void)
      char *errMsg;
      
      sym = (Symbol *)*PC++;
@@ -32,7 +40,7 @@ for upstream.)
      
      DISASM_RT(PC-3, 3);
      STACKDUMP(nArgs, 3);
-@@ -2064,7 +2064,7 @@ static int branch(void)
+@@ -2064,7 +2065,7 @@ static int branch(void)
      DISASM_RT(PC-1, 2);
      STACKDUMP(0, 3);
  
@@ -41,7 +49,7 @@ for upstream.)
      return STAT_OK;
  }
  
-@@ -2085,7 +2085,7 @@ static int branchTrue(void)
+@@ -2085,7 +2086,7 @@ static int branchTrue(void)
      STACKDUMP(1, 3);
  
      POP_INT(value)
@@ -50,7 +58,7 @@ for upstream.)
      PC++;
      
      if (value)
-@@ -2101,7 +2101,7 @@ static int branchFalse(void)
+@@ -2101,7 +2102,7 @@ static int branchFalse(void)
      STACKDUMP(1, 3);
  
      POP_INT(value)
@@ -59,7 +67,7 @@ for upstream.)
      PC++;
      
      if (!value)
-@@ -2420,7 +2420,7 @@ static int arrayRef(void)
+@@ -2420,7 +2421,7 @@ static int arrayRef(void)
      char *keyString = NULL;
      int nDim;
      
@@ -68,7 +76,7 @@ for upstream.)
      PC++;
  
      DISASM_RT(PC-2, 2);
-@@ -2471,7 +2471,7 @@ static int arrayAssign(void)
+@@ -2471,7 +2472,7 @@ static int arrayAssign(void)
      int errNum;
      int nDim;
      
@@ -77,7 +85,7 @@ for upstream.)
      PC++;
  
      DISASM_RT(PC-2, 1);
-@@ -2524,9 +2524,9 @@ static int arrayRefAndAssignSetup(void)
+@@ -2524,9 +2525,9 @@ static int arrayRefAndAssignSetup(void)
      char *keyString = NULL;
      int binaryOp, nDim;
      
@@ -89,7 +97,7 @@ for upstream.)
      PC++;
  
      DISASM_RT(PC-3, 3);
-@@ -2642,7 +2642,7 @@ static int arrayIter(void)
+@@ -2642,7 +2643,7 @@ static int arrayIter(void)
      PC++;
      iterator = (Symbol *)*PC;
      PC++;
@@ -98,7 +106,7 @@ for upstream.)
      PC++;
  
      if (item->type == LOCAL_SYM) {
-@@ -2739,7 +2739,7 @@ static int deleteArrayElement(void)
+@@ -2739,7 +2740,7 @@ static int deleteArrayElement(void)
      char *keyString = NULL;
      int nDim;
  
diff --git a/editors/nedit/patches/patch-source_macro.c b/editors/nedit/patches/patch-source_macro.c
index fe6bc9a757a..fb92e3e1c7e 100644
--- a/editors/nedit/patches/patch-source_macro.c
+++ b/editors/nedit/patches/patch-source_macro.c
@@ -1,11 +1,19 @@
-$NetBSD: patch-source_macro.c,v 1.1 2013/04/28 20:35:22 dholland Exp $
+$NetBSD: patch-source_macro.c,v 1.2 2014/03/22 17:26:13 gdt Exp $
 
 Call XtVaCreateManagedWidget and XtVaGetValues correctly.
 Silence gcc warnings about unsafe pointer casts.
 
---- source/macro.c~	2004-08-01 10:06:10.000000000 +0000
+--- source/macro.c.orig	2004-08-01 10:06:10.000000000 +0000
 +++ source/macro.c
-@@ -2830,7 +2830,7 @@ static int dialogMS(WindowInfo *window, 
+@@ -62,6 +62,7 @@ static const char CVSID[] = "$Id: macro.
+ #include <string.h>
+ #include <ctype.h>
+ #include <errno.h>
++#include <stdint.h>
+ #ifdef VMS
+ #include "../util/VMSparam.h"
+ #include <types.h>
+@@ -2830,7 +2831,7 @@ static int dialogMS(WindowInfo *window,
      for (i=1; i<nBtns; i++) {
      	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
      	    	XmNlabelString, s1=XmStringCreateSimple(btnLabels[i]),
@@ -14,7 +22,7 @@ Silence gcc warnings about unsafe pointer casts.
      	XtAddCallback(btn, XmNactivateCallback, dialogBtnCB, window);
      	XmStringFree(s1);
      }
-@@ -2871,7 +2871,7 @@ static void dialogBtnCB(Widget w, XtPoin
+@@ -2871,7 +2872,7 @@ static void dialogBtnCB(Widget w, XtPoin
      	return; /* shouldn't happen */
      if (XtClass(w) == xmPushButtonWidgetClass) {
  	XtVaGetValues(w, XmNuserData, &userData, NULL);
@@ -23,7 +31,7 @@ Silence gcc warnings about unsafe pointer casts.
      } else
      	retVal.val.n = 1;
      retVal.tag = INT_TAG;
-@@ -3003,7 +3003,7 @@ static int stringDialogMS(WindowInfo *wi
+@@ -3003,7 +3004,7 @@ static int stringDialogMS(WindowInfo *wi
      for (i=1; i<nBtns; i++) {
      	btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
      	    	XmNlabelString, s1=XmStringCreateSimple(btnLabels[i]),
@@ -32,7 +40,7 @@ Silence gcc warnings about unsafe pointer casts.
      	XtAddCallback(btn, XmNactivateCallback, stringDialogBtnCB, window);
      	XmStringFree(s1);
      }
-@@ -3057,7 +3057,7 @@ static void stringDialogBtnCB(Widget w, 
+@@ -3057,7 +3058,7 @@ static void stringDialogBtnCB(Widget w,
         returned in w. */
      if (XtClass(w) == xmPushButtonWidgetClass) {
  	XtVaGetValues(w, XmNuserData, &userData, NULL);
@@ -41,7 +49,7 @@ Silence gcc warnings about unsafe pointer casts.
      } else
      	btnNum = 1;
      
-@@ -3456,7 +3456,7 @@ static int listDialogMS(WindowInfo *wind
+@@ -3456,7 +3457,7 @@ static int listDialogMS(WindowInfo *wind
      for (i=1; i<nBtns; i++) {
        btn = XtVaCreateManagedWidget("mdBtn", xmPushButtonWidgetClass, dialog,
                XmNlabelString, s1=XmStringCreateSimple(btnLabels[i]),
@@ -50,7 +58,7 @@ Silence gcc warnings about unsafe pointer casts.
        XtAddCallback(btn, XmNactivateCallback, listDialogBtnCB, window);
        XmStringFree(s1);
      }
-@@ -3536,7 +3536,7 @@ static void listDialogBtnCB(Widget w, Xt
+@@ -3536,7 +3537,7 @@ static void listDialogBtnCB(Widget w, Xt
         returned in w. */
      if (XtClass(w) == xmPushButtonWidgetClass) {
        XtVaGetValues(w, XmNuserData, &userData, NULL);
diff --git a/editors/nedit/patches/patch-source_parse.y b/editors/nedit/patches/patch-source_parse.y
index fc950ca15fe..8f54ee8f0f5 100644
--- a/editors/nedit/patches/patch-source_parse.y
+++ b/editors/nedit/patches/patch-source_parse.y
@@ -1,10 +1,18 @@
-$NetBSD: patch-source_parse.y,v 1.1 2013/04/28 20:35:22 dholland Exp $
+$NetBSD: patch-source_parse.y,v 1.2 2014/03/22 17:26:13 gdt Exp $
 
 Silence gcc warnings about unsafe pointer casts.
 
---- source/parse.y~	2003-12-19 23:23:31.000000000 +0000
+--- source/parse.y.orig	2003-12-19 23:23:31.000000000 +0000
 +++ source/parse.y
-@@ -178,69 +178,69 @@ simpstmt:   SYMBOL '=' expr {
+@@ -14,6 +14,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdint.h>
+ #include <X11/Intrinsic.h>
+ #include <Xm/Xm.h>
+ #ifdef VMS
+@@ -178,69 +179,69 @@ simpstmt:   SYMBOL '=' expr {
                  ADD_OP(OP_BIT_OR); ADD_OP(OP_ASSIGN); ADD_SYM($1);
              }
              | DELETE arraylv '[' arglist ']' {
@@ -99,7 +107,7 @@ Silence gcc warnings about unsafe pointer casts.
              }
              | INCR SYMBOL {
                  ADD_OP(OP_PUSH_SYM); ADD_SYM($2); ADD_OP(OP_INCR);
-@@ -289,17 +289,17 @@ expr:       numexpr %prec CONCAT
+@@ -289,17 +290,17 @@ expr:       numexpr %prec CONCAT
              }
              ;
  initarraylv:    SYMBOL {
@@ -121,7 +129,7 @@ Silence gcc warnings about unsafe pointer casts.
              }
              ;
  arrayexpr:  numexpr {
-@@ -317,7 +317,7 @@ numexpr:    NUMBER {
+@@ -317,7 +318,7 @@ numexpr:    NUMBER {
              }
              | SYMBOL '(' arglist ')' {
                  ADD_OP(OP_SUBR_CALL);
@@ -130,7 +138,7 @@ Silence gcc warnings about unsafe pointer casts.
                  ADD_OP(OP_FETCH_RET_VAL);
              }
              | '(' expr ')'
-@@ -331,7 +331,7 @@ numexpr:    NUMBER {
+@@ -331,7 +332,7 @@ numexpr:    NUMBER {
                 ADD_OP(OP_PUSH_ARG_ARRAY);
              }
              | numexpr '[' arglist ']' {
diff --git a/editors/nedit/patches/patch-source_preferences.c b/editors/nedit/patches/patch-source_preferences.c
index c85d00927e4..96e7a88e93f 100644
--- a/editors/nedit/patches/patch-source_preferences.c
+++ b/editors/nedit/patches/patch-source_preferences.c
@@ -1,10 +1,18 @@
-$NetBSD: patch-source_preferences.c,v 1.1 2013/04/28 20:35:22 dholland Exp $
+$NetBSD: patch-source_preferences.c,v 1.2 2014/03/22 17:26:13 gdt Exp $
 
 Silence gcc warnings about unsafe pointer casts.
 
---- source/preferences.c~	2004-08-20 19:33:20.000000000 +0000
+--- source/preferences.c.orig	2004-08-20 19:33:20.000000000 +0000
 +++ source/preferences.c
-@@ -2161,7 +2161,7 @@ void SetLanguageMode(WindowInfo *window,
+@@ -59,6 +59,7 @@ static const char CVSID[] = "$Id: prefer
+ #include <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <stdint.h>
+ #ifdef VMS
+ #include "../util/VMSparam.h"
+ #else
+@@ -2161,7 +2162,7 @@ void SetLanguageMode(WindowInfo *window,
  	XtVaGetValues(menu, XmNchildren, &items, XmNnumChildren, &nItems, NULL);
  	for (n=0; n<(int)nItems; n++) {
      	    XtVaGetValues(items[n], XmNuserData, &userData, NULL);
@@ -13,7 +21,7 @@ Silence gcc warnings about unsafe pointer casts.
  	}
      }
  }
-@@ -4946,7 +4946,7 @@ static void updateLanguageModeSubmenu(Wi
+@@ -4946,7 +4947,7 @@ static void updateLanguageModeSubmenu(Wi
              	xmToggleButtonGadgetClass, menu,
              	XmNlabelString, s1=XmStringCreateSimple(LanguageModes[i]->name),
   	    	XmNmarginHeight, 0,
@@ -22,7 +30,7 @@ Silence gcc warnings about unsafe pointer casts.
      		XmNset, window->languageMode==i, NULL);
          XmStringFree(s1);
  	XtAddCallback(btn, XmNvalueChangedCallback, setLangModeCB, window);
-@@ -4967,14 +4967,14 @@ static void setLangModeCB(Widget w, XtPo
+@@ -4967,14 +4968,14 @@ static void setLangModeCB(Widget w, XtPo
      XtVaGetValues(w, XmNuserData, &mode, NULL);
      
      /* If the mode didn't change, do nothing */
diff --git a/editors/nedit/patches/patch-source_userCmds.c b/editors/nedit/patches/patch-source_userCmds.c
index af53c8ed94b..c4133e260ef 100644
--- a/editors/nedit/patches/patch-source_userCmds.c
+++ b/editors/nedit/patches/patch-source_userCmds.c
@@ -1,11 +1,19 @@
-$NetBSD: patch-source_userCmds.c,v 1.1 2013/04/28 20:35:22 dholland Exp $
+$NetBSD: patch-source_userCmds.c,v 1.2 2014/03/22 17:26:13 gdt Exp $
 
 Silence gcc warnings about unsafe pointer casts.
 Call <ctype.h> functions correctly.
 
---- source/userCmds.c~	2004-09-02 08:50:38.000000000 +0000
+--- source/userCmds.c.orig	2004-09-02 08:50:38.000000000 +0000
 +++ source/userCmds.c
-@@ -1116,7 +1116,7 @@ static void dimSelDepItemsInMenu(Widget 
+@@ -51,6 +51,7 @@ static const char CVSID[] = "$Id: userCm
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdint.h>
+ #ifdef VMS
+ #include "../util/VMSparam.h"
+ #else
+@@ -1116,7 +1117,7 @@ static void dimSelDepItemsInMenu(Widget
  	    	XtVaGetValues(items[n], XmNsubMenuId, &subMenu, NULL);
  		dimSelDepItemsInMenu(subMenu, menuList, nMenuItems, sensitive);
  	    } else {
@@ -14,7 +22,7 @@ Call <ctype.h> functions correctly.
  		if (index <0 || index >= nMenuItems)
      		    return;
  		if (menuList[index]->input == FROM_SELECTION)
-@@ -2864,7 +2864,7 @@ static void generateAcceleratorString(ch
+@@ -2864,7 +2865,7 @@ static void generateAcceleratorString(ch
      /* for a consistent look to the accelerator names in the menus,
         capitalize the first letter of the keysym */
      strcpy(keyName, XKeysymToString(keysym));
@@ -23,7 +31,7 @@ Call <ctype.h> functions correctly.
      
      /* concatenate the strings together */
      sprintf(text, "%s%s%s%s%s%s%s%s", shiftStr, ctrlStr, altStr, 
-@@ -2946,7 +2946,7 @@ static int parseAcceleratorString(const 
+@@ -2946,7 +2947,7 @@ static int parseAcceleratorString(const
         of the keysyms are "prettied up" by generateAcceleratorString */
      *keysym = XStringToKeysym(fields[nFields-1]);
      if (*keysym == NoSymbol) {