Thu Mar 20 12:38:26 2014 UTC ()
Include <stdint.h> before using uintptr_t.

Pointed out by Iain Morgan on pkgsrc-users as causing a build failure
on Linux.


(gdt)
diff -r1.53 -r1.54 pkgsrc/editors/nedit/Makefile
diff -r1.15 -r1.16 pkgsrc/editors/nedit/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/nedit/patches/patch-util_prefFile.c
cvs diff -r1.53 -r1.54 pkgsrc/editors/nedit/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/nedit/Makefile 2013/06/23 09:30:14 1.53
+++ pkgsrc/editors/nedit/Makefile 2014/03/20 12:38:26 1.54
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.53 2013/06/23 09:30:14 mbalmer Exp $ 1# $NetBSD: Makefile,v 1.54 2014/03/20 12:38:26 gdt Exp $
2 2
3DISTNAME= nedit-${VERS}-src 3DISTNAME= nedit-${VERS}-src
4PKGNAME= nedit-${VERS} 4PKGNAME= nedit-${VERS}
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} \ 7MASTER_SITES= ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} \
8 ${MASTER_SITE_SOURCEFORGE:=nedit/} 8 ${MASTER_SITE_SOURCEFORGE:=nedit/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.nedit.org/ 12HOMEPAGE= http://www.nedit.org/
13COMMENT= Motif based standard GUI style text editor 13COMMENT= Motif based standard GUI style text editor
 14LICENSE= gnu-gpl-v2
14 15
15VERS= 5.5 16VERS= 5.5
16MASTER_SITE_NEDIT= http://www.nedit.org/ftp/ \ 17MASTER_SITE_NEDIT= http://www.nedit.org/ftp/ \
17 http://nl.nedit.org/ftp/ \ 18 http://nl.nedit.org/ftp/ \
18 ftp://nl.nedit.org/pub/NEdit/ \ 19 ftp://nl.nedit.org/pub/NEdit/ \
19 ftp://ftp.fu-berlin.de/unix/editors/nedit/ \ 20 ftp://ftp.fu-berlin.de/unix/editors/nedit/ \
20 http://gd.tuwien.ac.at/editors/nedit/NEdit/ \ 21 http://gd.tuwien.ac.at/editors/nedit/NEdit/ \
21 ftp://cri.univ-tlse1.fr/pub/unix/nedit/NEdit/ \ 22 ftp://cri.univ-tlse1.fr/pub/unix/nedit/NEdit/ \
22 ftp://ftp.chg.ru/pub/unix/editors/nedit/ 23 ftp://ftp.chg.ru/pub/unix/editors/nedit/
23 24
24WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 25WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
25BUILD_TARGET= netbsd 26BUILD_TARGET= netbsd
26INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 27INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
cvs diff -r1.15 -r1.16 pkgsrc/editors/nedit/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/nedit/distinfo 2013/06/23 09:45:52 1.15
+++ pkgsrc/editors/nedit/distinfo 2014/03/20 12:38:26 1.16
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.15 2013/06/23 09:45:52 obache Exp $ 1$NetBSD: distinfo,v 1.16 2014/03/20 12:38:26 gdt Exp $
2 2
3SHA1 (nedit-5.5-src.tar.bz2) = 7d3c87a793a5047cf857af1ac82e39f3b33e8a87 3SHA1 (nedit-5.5-src.tar.bz2) = 7d3c87a793a5047cf857af1ac82e39f3b33e8a87
4RMD160 (nedit-5.5-src.tar.bz2) = 93fce64bdc5d8a9eff86ab76cec67d44d676d0eb 4RMD160 (nedit-5.5-src.tar.bz2) = 93fce64bdc5d8a9eff86ab76cec67d44d676d0eb
5Size (nedit-5.5-src.tar.bz2) = 1124825 bytes 5Size (nedit-5.5-src.tar.bz2) = 1124825 bytes
6SHA1 (patch-Xlt_SlideC.c) = aafca789053536a0d3ca0bc98ae301c60697e4c2 6SHA1 (patch-Xlt_SlideC.c) = aafca789053536a0d3ca0bc98ae301c60697e4c2
7SHA1 (patch-aa) = 29cf7e55b23e437b0203e0dde09cc053d65f245c 7SHA1 (patch-aa) = 29cf7e55b23e437b0203e0dde09cc053d65f245c
8SHA1 (patch-source_highlight.c) = f6c8de27402e3e6d4fd73cb11e541c5c053835d9 8SHA1 (patch-source_highlight.c) = f6c8de27402e3e6d4fd73cb11e541c5c053835d9
9SHA1 (patch-source_interpret.c) = 85bd739969674bbe436b79362dec7ef70204888e 9SHA1 (patch-source_interpret.c) = 85bd739969674bbe436b79362dec7ef70204888e
10SHA1 (patch-source_macro.c) = bb00f95dae17053f9a01bd2b18ed6f1139f65314 10SHA1 (patch-source_macro.c) = bb00f95dae17053f9a01bd2b18ed6f1139f65314
11SHA1 (patch-source_menu.c) = 529be222b97904b82721dc79ae8fa587378ccd48 11SHA1 (patch-source_menu.c) = 529be222b97904b82721dc79ae8fa587378ccd48
12SHA1 (patch-source_parse.y) = 9a126e619ec53b76bcfc404055642cb9e47df9e3 12SHA1 (patch-source_parse.y) = 9a126e619ec53b76bcfc404055642cb9e47df9e3
13SHA1 (patch-source_preferences.c) = 9d2d111e5bd1a06086f89bdcd3c692d2f9d6ca44 13SHA1 (patch-source_preferences.c) = 9d2d111e5bd1a06086f89bdcd3c692d2f9d6ca44
14SHA1 (patch-source_regularExp.c) = d607b663a3853a6963d3dea7a32ba6c42af681eb 14SHA1 (patch-source_regularExp.c) = d607b663a3853a6963d3dea7a32ba6c42af681eb
15SHA1 (patch-source_search.c) = b60f984d803d58618813f39a4b93e27f2b9325c8 15SHA1 (patch-source_search.c) = b60f984d803d58618813f39a4b93e27f2b9325c8
16SHA1 (patch-source_selection.c) = 28d0fd4eaddbd1e36ef2eef12ad28fa5adc406ca 16SHA1 (patch-source_selection.c) = 28d0fd4eaddbd1e36ef2eef12ad28fa5adc406ca
17SHA1 (patch-source_shell.c) = 8d8b0820d509553140f2e1d173287122ed6d7a96 17SHA1 (patch-source_shell.c) = 8d8b0820d509553140f2e1d173287122ed6d7a96
18SHA1 (patch-source_tags.c) = ae8ebe7ab48a154d7538e417540eeac223cae624 18SHA1 (patch-source_tags.c) = ae8ebe7ab48a154d7538e417540eeac223cae624
19SHA1 (patch-source_text.c) = e88669188ed3512ee3945ab68bb392d0f3aa7708 19SHA1 (patch-source_text.c) = e88669188ed3512ee3945ab68bb392d0f3aa7708
20SHA1 (patch-source_textBuf.c) = 06fadd285929922fe42904d3d49e7eacf4e61e90 20SHA1 (patch-source_textBuf.c) = 06fadd285929922fe42904d3d49e7eacf4e61e90
21SHA1 (patch-source_textDisp.c) = 84e3631eb7076c77704390ac6aee66b27d0422f3 21SHA1 (patch-source_textDisp.c) = 84e3631eb7076c77704390ac6aee66b27d0422f3
22SHA1 (patch-source_textDrag.c) = 8b66f1bb80bbc2b3cf3751ff7c601ded34b54646 22SHA1 (patch-source_textDrag.c) = 8b66f1bb80bbc2b3cf3751ff7c601ded34b54646
23SHA1 (patch-source_userCmds.c) = 22c6468cffd2cd0d10af03452a2c14d63e893cbe 23SHA1 (patch-source_userCmds.c) = 22c6468cffd2cd0d10af03452a2c14d63e893cbe
24SHA1 (patch-source_window.c) = 72fda2bf7cc178ec57f38d25915dab8a8765874d 24SHA1 (patch-source_window.c) = 72fda2bf7cc178ec57f38d25915dab8a8765874d
25SHA1 (patch-util_misc.c) = d3445336389fc26b69b2e0205930f8843f224784 25SHA1 (patch-util_misc.c) = d3445336389fc26b69b2e0205930f8843f224784
26SHA1 (patch-util_prefFile.c) = 4accc0a25c7744076a7f8ee72c0a04328f0db915 26SHA1 (patch-util_prefFile.c) = 2fb587dd1a4b27a16469b31f4355b9d7e62b37da
cvs diff -r1.1 -r1.2 pkgsrc/editors/nedit/patches/patch-util_prefFile.c (expand / switch to unified diff)

--- pkgsrc/editors/nedit/patches/patch-util_prefFile.c 2013/04/28 20:35:23 1.1
+++ pkgsrc/editors/nedit/patches/patch-util_prefFile.c 2014/03/20 12:38:26 1.2
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1$NetBSD: patch-util_prefFile.c,v 1.1 2013/04/28 20:35:23 dholland Exp $ 1$NetBSD: patch-util_prefFile.c,v 1.2 2014/03/20 12:38:26 gdt Exp $
2 2
3Silence gcc warnings about unsafe pointer casts. 3Silence gcc warnings about unsafe pointer casts.
4 4
5--- util/prefFile.c~ 2004-07-21 11:32:07.000000000 +0000 5--- util/prefFile.c.orig 2004-07-21 11:32:07.000000000 +0000
6+++ util/prefFile.c 6+++ util/prefFile.c
7@@ -353,9 +353,9 @@ static int stringToPref(const char *stri 7@@ -35,6 +35,7 @@ static const char CVSID[] = "$Id: prefFi
 8 #include "fileUtils.h"
 9 #include "utils.h"
 10
 11+#include <stdint.h>
 12 #include <stdlib.h>
 13 #include <stdio.h>
 14 #include <string.h>
 15@@ -353,9 +354,9 @@ static int stringToPref(const char *stri
8 *(int *)rsrcDescrip->valueAddr = 0; 16 *(int *)rsrcDescrip->valueAddr = 0;
9 return False; 17 return False;
10 case PREF_STRING: 18 case PREF_STRING:
11- if ((int)strlen(string) >= (int)rsrcDescrip->arg) 19- if ((int)strlen(string) >= (int)rsrcDescrip->arg)
12+ if (strlen(string) >= (uintptr_t)rsrcDescrip->arg) 20+ if (strlen(string) >= (uintptr_t)rsrcDescrip->arg)
13 return False; 21 return False;
14- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg); 22- strncpy(rsrcDescrip->valueAddr, string, (int)rsrcDescrip->arg);
15+ strncpy(rsrcDescrip->valueAddr, string, (uintptr_t)rsrcDescrip->arg); 23+ strncpy(rsrcDescrip->valueAddr, string, (uintptr_t)rsrcDescrip->arg);
16 return True; 24 return True;
17 case PREF_ALLOC_STRING: 25 case PREF_ALLOC_STRING:
18 *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1); 26 *(char **)rsrcDescrip->valueAddr = XtMalloc(strlen(string) + 1);