From owner-freebsd-current Fri Aug 17 3:28:49 2001 Delivered-To: freebsd-current@freebsd.org Received: from wolf.istc.kiev.ua (wolf.istc.kiev.ua [193.193.221.1]) by hub.freebsd.org (Postfix) with ESMTP id 7B43C37B401; Fri, 17 Aug 2001 03:28:41 -0700 (PDT) (envelope-from max@vega.com) Received: from vega.vega.com (root@[62.149.3.53]) by wolf.istc.kiev.ua ( . . / . . ) with ESMTP id NAA18483; Fri, 17 Aug 2001 13:17:17 +0300 Received: (from max@localhost) by vega.vega.com (8.11.4/8.11.3) id f7HALxG16809; Fri, 17 Aug 2001 13:21:59 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) From: Maxim Sobolev Message-Id: <200108171021.f7HALxG16809@vega.vega.com> Subject: 4-STABLE-->5-CURRENT upgrade path is b0rken in libform [patch] To: ru@freebsd.org Date: Fri, 17 Aug 2001 13:21:59 +0300 (EEST) Cc: current@freebsd.org X-Mailer: ELM [version 2.5 PL5] MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="%--multipart-mixed-boundary-1.16774.998043719--%" Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --%--multipart-mixed-boundary-1.16774.998043719--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi, Currently 4-STABLE --> 5-CURRENT upgrade path is broken in libform because it uses older curses.h header from the host system, which misses some macros necessary. Attached patch is expected to fix the problem, please review it and let me know if it is OK to commit it. -Maxim --%--multipart-mixed-boundary-1.16774.998043719--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Description: ASCII text Content-Disposition: attachment; filename="diff" Index: Makefile =================================================================== RCS file: /home/ncvs/src/lib/libform/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- Makefile 2001/03/27 17:27:01 1.6 +++ Makefile 2001/08/17 10:16:24 @@ -21,8 +21,9 @@ INCS= ${NCURSES}/form/form.h CLEANFILES+= ncurses_def.h -CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \ - -I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H +CFLAGS+= -I. -I${.CURDIR}/../libncurses -I${.OBJDIR}/../libncurses \ + -I${NCURSES}/form -I${NCURSES}/menu -I${NCURSES}/include \ + -Wall -DNDEBUG -DHAVE_CONFIG_H ncurses_def.h: MKncurses_def.sh ncurses_defs AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \ --%--multipart-mixed-boundary-1.16774.998043719--%-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message