Attachment #82551 for bug #118077

View | Details | Raw Unified | Return to bug 118077
Collapse All | Expand All





PORTNAME=	nvi
PORTVERSION=	1.81.5
PORTREVISION=	4
CATEGORIES=	editors
MASTER_SITES=	http://193.190.253.81/~skimo/nvi/devel/ \
		${MASTER_SITE_LOCAL}

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 700042
EXTRA_PATCHES+=	\
		files/extra-patch-cl-cl.h \
		files/extra-patch-cl-cl_funcs.c \
		files/extra-patch-cl-cl_screen.c \
		files/extra-patch-common-db.c \
		files/extra-patch-common-key.c \
		files/extra-patch-common-mem.h \
		files/extra-patch-vi-v_txt.c
.endif

# XXX: nvi doesn't really need sys/select.h, but I don't think the

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-cl-cl.h (+10 lines)
	1	--- ../cl/cl.h.orig 2001-07-08 09:06:11.000000000 -0400
	2	+++ ../cl/cl.h 2007-11-15 14:19:16.000000000 -0500
	3	@@ -80,6 +80,7 @@
	4	#define CLP(sp) ((CL_PRIVATE *)((sp)->gp->cl_private))
	5	#define GCLP(gp) ((CL_PRIVATE *)gp->cl_private)
	6	#define CLSP(sp) ((WINDOW *)((sp)->cl_private))
	7	+#define LCLSP(sp) ((sp)->cl_private)
	8
	9	/* Return possibilities from the keyboard read routine. */
	10	typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;




--- ../cl/cl_funcs.c.orig	2001-06-25 11:19:05.000000000 -0400
+++ ../cl/cl_funcs.c	2007-11-15 14:18:45.000000000 -0500
@@ -381,7 +381,7 @@
 
 	    if (CLSP(discardp)) {
 		    delwin(CLSP(discardp));
-		    CLSP(discardp) = NULL;
+		    LCLSP(discardp) = NULL;
 	    }
 	}
 
@@ -395,7 +395,7 @@
 
 		if (CLSP(tsp))
 			delwin(CLSP(tsp));
-		CLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
+		LCLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
 					   tsp->roff, tsp->coff);
 	}
 
@@ -716,9 +716,9 @@
 	if (CLSP(origp))
 		delwin(CLSP(origp));
 
-	CLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
+	LCLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
 				     origp->roff, origp->coff);
-	CLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
+	LCLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
 				     newp->roff, newp->coff);
 
 	/* origp is the original screen, giving up space to newp. */

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-cl-cl_screen.c (+11 lines)
	1	--- ../cl/cl_screen.c.orig 2001-06-25 11:19:06.000000000 -0400
	2	+++ ../cl/cl_screen.c 2007-11-15 14:19:50.000000000 -0500
	3	@@ -56,7 +56,7 @@
	4	if (F_ISSET(gp, G_SRESTART)) {
	5	if (CLSP(sp)) {
	6	delwin(CLSP(sp));
	7	- CLSP(sp) = NULL;
	8	+ LCLSP(sp) = NULL;
	9	}
	10	if (cl_quit(gp))
	11	return (1);

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-common-db.c (+11 lines)
	1	--- ../common/db.c.orig 2001-08-18 17:52:00.000000000 -0400
	2	+++ ../common/db.c 2007-11-15 13:56:15.000000000 -0500
	3	@@ -164,7 +164,7 @@
	4	nlen = 1024;
	5	retry:
	6	/* data.size contains length in bytes */
	7	- BINC_GOTO(sp, (char *)ep->c_lp, ep->c_blen, nlen);
	8	+ BINC_GOTO(sp, ep->c_lp, ep->c_blen, nlen);
	9
	10	/* Get the line from the underlying database. */
	11	memset(&key, 0, sizeof(key));

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-common-key.c (+11 lines)
	1	--- ../common/key.c.orig 2001-06-25 11:19:10.000000000 -0400
	2	+++ ../common/key.c 2007-11-15 13:50:47.000000000 -0500
	3	@@ -833,7 +833,7 @@
	4	wp = sp->wp;
	5	new_nelem = wp->i_nelem + add;
	6	olen = wp->i_nelem * sizeof(wp->i_event[0]);
	7	- BINC_RET(sp, (char )wp->i_event, olen, new_nelem sizeof(wp->i_event[0]));
	8	+ BINC_RET(sp, wp->i_event, olen, new_nelem * sizeof(wp->i_event[0]));
	9	wp->i_nelem = olen / sizeof(wp->i_event[0]);
	10	return (0);
	11	}




--- ../common/mem.h.orig	2000-08-20 05:12:59.000000000 -0400
+++ ../common/mem.h	2007-11-15 13:55:35.000000000 -0500
@@ -13,7 +13,7 @@
  * returns, one that jumps to an error label.
  */
 #define	BINC_GOTO(sp, lp, llen, nlen) {					\
-	char *L__p = lp;						\
+	CHAR_T *L__p = lp;						\
 	void *L__bincp;							\
 	if ((nlen) > llen) {						\
 		if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL)	\
@@ -25,12 +25,12 @@
 		lp = L__bincp;						\
 	}								\
 }
-#define	BINC_GOTOW(sp, lp, llen, nlen) {					\
+#define	BINC_GOTOW(sp, lp, llen, nlen) {				\
 	CHAR_T *L__bp = lp;						\
-	BINC_GOTO(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))    	\
+	BINC_GOTO(sp, lp, llen, (nlen) * sizeof(CHAR_T))	    	\
 }
 #define	BINC_RET(sp, lp, llen, nlen) {					\
-	char *L__p = lp;						\
+	CHAR_T *L__p = lp;						\
 	void *L__bincp;							\
 	if ((nlen) > llen) {						\
 		if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL)	\
@@ -44,7 +44,7 @@
 }
 #define	BINC_RETW(sp, lp, llen, nlen) {					\
 	CHAR_T *L__bp = lp;						\
-	BINC_RET(sp, (char *)lp, llen, (nlen) * sizeof(CHAR_T))	    	\
+	BINC_RET(sp, lp, llen, (nlen) * sizeof(CHAR_T))	    		\
 }
 
 /*
@@ -67,7 +67,7 @@
 }
 #define	GET_SPACE_GOTOW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	GET_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	GET_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T))		\
 }
 #define	GET_SPACE_RET(sp, bp, blen, nlen) {				\
 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
@@ -84,7 +84,7 @@
 }
 #define	GET_SPACE_RETW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	GET_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	GET_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T))		\
 }
 
 /*
@@ -104,7 +104,7 @@
 }
 #define	ADD_SPACE_GOTOW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	ADD_SPACE_GOTO(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	ADD_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T))		\
 }
 #define	ADD_SPACE_RET(sp, bp, blen, nlen) {				\
 	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp;			\
@@ -119,7 +119,7 @@
 }
 #define	ADD_SPACE_RETW(sp, bp, blen, nlen) {				\
 	CHAR_T *L__bp = bp;						\
-	ADD_SPACE_RET(sp, (char *)bp, blen, (nlen) * sizeof(CHAR_T))	\
+	ADD_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T))		\
 }
 
 /* Free a GET_SPACE returned buffer. */
@@ -132,7 +132,7 @@
 }
 #define	FREE_SPACEW(sp, bp, blen) {					\
 	CHAR_T *L__bp = bp;						\
-	FREE_SPACE(sp, (char *)bp, blen);				\
+	FREE_SPACE(sp, bp, blen);					\
 }
 
 /*

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-vi-v_txt.c (+11 lines)
	1	--- ../vi/v_txt.c.orig 2001-07-26 13:15:53.000000000 -0400
	2	+++ ../vi/v_txt.c 2007-11-15 13:57:33.000000000 -0500
	3	@@ -589,7 +589,7 @@
	4
	5	/* Check to see if the character fits into the replay buffers. */
	6	if (LF_ISSET(TXT_RECORD)) {
	7	- BINC_GOTO(sp, (char *)vip->rep,
	8	+ BINC_GOTO(sp, vip->rep,
	9	vip->rep_len, (rcol + 1) * sizeof(EVENT));
	10	vip->rep[rcol++] = *evp;
	11	}

Return to bug 118077

Lines 7-13 Link Here

(-)editors/nvi-devel/Makefile (-2 / +9 lines)
7		7
8	PORTNAME= nvi	8	PORTNAME= nvi
9	PORTVERSION= 1.81.5	9	PORTVERSION= 1.81.5
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= editors	11	CATEGORIES= editors
12	MASTER_SITES= http://193.190.253.81/~skimo/nvi/devel/ \	12	MASTER_SITES= http://193.190.253.81/~skimo/nvi/devel/ \
13	${MASTER_SITE_LOCAL}	13	${MASTER_SITE_LOCAL}
Lines 32-38 Link Here
32	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
33		33
34	.if ${OSVERSION} >= 700042	34	.if ${OSVERSION} >= 700042
35	BROKEN= Broken with gcc 4.2	35	EXTRA_PATCHES+= \
		36	files/extra-patch-cl-cl.h \
		37	files/extra-patch-cl-cl_funcs.c \
		38	files/extra-patch-cl-cl_screen.c \
		39	files/extra-patch-common-db.c \
		40	files/extra-patch-common-key.c \
		41	files/extra-patch-common-mem.h \
		42	files/extra-patch-vi-v_txt.c
36	.endif	43	.endif
37		44
38	# XXX: nvi doesn't really need sys/select.h, but I don't think the	45	# XXX: nvi doesn't really need sys/select.h, but I don't think the

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-cl-cl_funcs.c (+32 lines)
	1	--- ../cl/cl_funcs.c.orig 2001-06-25 11:19:05.000000000 -0400
	2	+++ ../cl/cl_funcs.c 2007-11-15 14:18:45.000000000 -0500
	3	@@ -381,7 +381,7 @@
	4
	5	if (CLSP(discardp)) {
	6	delwin(CLSP(discardp));
	7	- CLSP(discardp) = NULL;
	8	+ LCLSP(discardp) = NULL;
	9	}
	10	}
	11
	12	@@ -395,7 +395,7 @@
	13
	14	if (CLSP(tsp))
	15	delwin(CLSP(tsp));
	16	- CLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
	17	+ LCLSP(tsp) = subwin(stdscr, tsp->rows, tsp->cols,
	18	tsp->roff, tsp->coff);
	19	}
	20
	21	@@ -716,9 +716,9 @@
	22	if (CLSP(origp))
	23	delwin(CLSP(origp));
	24
	25	- CLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
	26	+ LCLSP(origp) = subwin(stdscr, origp->rows, origp->cols,
	27	origp->roff, origp->coff);
	28	- CLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
	29	+ LCLSP(newp) = subwin(stdscr, newp->rows, newp->cols,
	30	newp->roff, newp->coff);
	31
	32	/* origp is the original screen, giving up space to newp. */

Line 0 Link Here

(-)editors/nvi-devel/files/extra-patch-common-mem.h (+81 lines)
		1	--- ../common/mem.h.orig 2000-08-20 05:12:59.000000000 -0400
		2	+++ ../common/mem.h 2007-11-15 13:55:35.000000000 -0500
		3	@@ -13,7 +13,7 @@
		4	* returns, one that jumps to an error label.
		5	*/
		6	#define BINC_GOTO(sp, lp, llen, nlen) { \
		7	- char *L__p = lp; \
		8	+ CHAR_T *L__p = lp; \
		9	void *L__bincp; \
		10	if ((nlen) > llen) { \
		11	if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL) \
		12	@@ -25,12 +25,12 @@
		13	lp = L__bincp; \
		14	} \
		15	}
		16	-#define BINC_GOTOW(sp, lp, llen, nlen) { \
		17	+#define BINC_GOTOW(sp, lp, llen, nlen) { \
		18	CHAR_T *L__bp = lp; \
		19	- BINC_GOTO(sp, (char )lp, llen, (nlen) sizeof(CHAR_T)) \
		20	+ BINC_GOTO(sp, lp, llen, (nlen) * sizeof(CHAR_T)) \
		21	}
		22	#define BINC_RET(sp, lp, llen, nlen) { \
		23	- char *L__p = lp; \
		24	+ CHAR_T *L__p = lp; \
		25	void *L__bincp; \
		26	if ((nlen) > llen) { \
		27	if ((L__bincp = binc(sp, lp, &(llen), nlen)) == NULL) \
		28	@@ -44,7 +44,7 @@
		29	}
		30	#define BINC_RETW(sp, lp, llen, nlen) { \
		31	CHAR_T *L__bp = lp; \
		32	- BINC_RET(sp, (char )lp, llen, (nlen) sizeof(CHAR_T)) \
		33	+ BINC_RET(sp, lp, llen, (nlen) * sizeof(CHAR_T)) \
		34	}
		35
		36	/*
		37	@@ -67,7 +67,7 @@
		38	}
		39	#define GET_SPACE_GOTOW(sp, bp, blen, nlen) { \
		40	CHAR_T *L__bp = bp; \
		41	- GET_SPACE_GOTO(sp, (char )bp, blen, (nlen) sizeof(CHAR_T)) \
		42	+ GET_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T)) \
		43	}
		44	#define GET_SPACE_RET(sp, bp, blen, nlen) { \
		45	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
		46	@@ -84,7 +84,7 @@
		47	}
		48	#define GET_SPACE_RETW(sp, bp, blen, nlen) { \
		49	CHAR_T *L__bp = bp; \
		50	- GET_SPACE_RET(sp, (char )bp, blen, (nlen) sizeof(CHAR_T)) \
		51	+ GET_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T)) \
		52	}
		53
		54	/*
		55	@@ -104,7 +104,7 @@
		56	}
		57	#define ADD_SPACE_GOTOW(sp, bp, blen, nlen) { \
		58	CHAR_T *L__bp = bp; \
		59	- ADD_SPACE_GOTO(sp, (char )bp, blen, (nlen) sizeof(CHAR_T)) \
		60	+ ADD_SPACE_GOTO(sp, bp, blen, (nlen) * sizeof(CHAR_T)) \
		61	}
		62	#define ADD_SPACE_RET(sp, bp, blen, nlen) { \
		63	WIN *L__wp = (sp) == NULL ? NULL : (sp)->wp; \
		64	@@ -119,7 +119,7 @@
65	}
66	#define ADD_SPACE_RETW(sp, bp, blen, nlen) { \
67	CHAR_T *L__bp = bp; \
68	- ADD_SPACE_RET(sp, (char )bp, blen, (nlen) sizeof(CHAR_T)) \
69	+ ADD_SPACE_RET(sp, bp, blen, (nlen) * sizeof(CHAR_T)) \
70	}
71
72	/* Free a GET_SPACE returned buffer. */
73	@@ -132,7 +132,7 @@
74	}
75	#define FREE_SPACEW(sp, bp, blen) { \
76	CHAR_T *L__bp = bp; \
77	- FREE_SPACE(sp, (char *)bp, blen); \
78	+ FREE_SPACE(sp, bp, blen); \
79	}
80
81	/*