Upgrade to 5.2. I hope this will work for the Python users on

FreeBSD-3.x out there.

1 files changed, 159 insertions, 46 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index a57d385180a..78125002e1e 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -6,77 +6,190 @@
 #
 
 PORTNAME=		ncurses
-PORTVERSION=		4.2
+PORTVERSION=		5.2
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU} \
-			ftp://ftp.clark.net/pub/dickey/ncurses/4.2/
+MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} terminfo.src.gz
-
-FORBIDDEN=		"buffer overflows reported--don't link setuid/setgid commands to this.  See http://www.securityfocus.com/templates/archive.pike?list=1&msg=Pine.LNX.4.10.10010092242140.27629-100000@shell.solutions.fi " 
 
 MAINTAINER=		ports@FreeBSD.org
 
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+Y2K=			http://www.gnu.org/software/year2000.html
 
-Y2K=            http://www.gnu.org/software/year2000.html
+MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
+USE_LIBTOOL=		yes
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
+		--disable-termcap --includedir=${PREFIX}/include/ncurses \
+		--with-profile --with-shared --without-debug \
+		--without-curses-h --with-termlib --with-libtool
+CONFIGURE_ENV=	gnat_exists="no" ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
 
-MAN1=	captoinfo.1m clear.1 infocmp.1m tic.1m toe.1m tput.1 tset.1
-MAN3=	curs_addch.3x curs_addchstr.3x curs_addstr.3x curs_attr.3x \
-	curs_beep.3x curs_bkgd.3x curs_border.3x curs_clear.3x \
-	curs_color.3x curs_delch.3x curs_deleteln.3x curs_getch.3x \
-	curs_getstr.3x curs_getyx.3x curs_inch.3x curs_inchstr.3x \
-	curs_initscr.3x curs_inopts.3x curs_insch.3x curs_insstr.3x \
-	curs_instr.3x curs_kernel.3x curs_mouse.3x curs_move.3x \
-	curs_outopts.3x curs_overlay.3x curs_pad.3x curs_print.3x \
-	curs_printw.3x curs_refresh.3x curs_scanw.3x curs_scr_dmp.3x \
-	curs_scroll.3x curs_slk.3x curs_termattrs.3x curs_termcap.3x \
-	curs_terminfo.3x curs_touch.3x curs_util.3x curs_window.3x \
-	define_key.3x dft_fgbg.3x form.3x form_cursor.3x form_data.3x \
+MANCOMPRESSED=	yes
+MAN1=	captoinfo.1m clear.1 infocmp.1m infotocap.1m reset.1 tack.1 \
+	tic.1m toe.1m tput.1 tset.1
+MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
+	_traceattr2.3x _tracechar.3x _tracechtype.3x _tracechtype2.3x \
+	_tracedump.3x _tracef.3x _tracemouse.3x addch.3x addchnstr.3x \
+	addchstr.3x addnstr.3x addstr.3x assume_default_colors.3x \
+	attr_get.3x attr_off.3x attr_on.3x attr_set.3x attroff.3x \
+	attron.3x attrset.3x baudrate.3x beep.3x bkgd.3x bkgdset.3x \
+	border.3x bottom_panel.3x box.3x can_change_color.3x cbreak.3x \
+	chgat.3x clear.3x clearok.3x clrtobot.3x clrtoeol.3x \
+	color_content.3x color_set.3x copywin.3x current_field.3x \
+	current_item.3x curs_addch.3x curs_addchstr.3x curs_addstr.3x \
+	curs_attr.3x curs_beep.3x curs_bkgd.3x curs_border.3x \
+	curs_clear.3x curs_color.3x curs_delch.3x curs_deleteln.3x \
+	curs_extend.3x curs_getch.3x curs_getstr.3x curs_getyx.3x \
+	curs_inch.3x curs_inchstr.3x curs_initscr.3x curs_inopts.3x \
+	curs_insch.3x curs_insstr.3x curs_instr.3x curs_kernel.3x \
+	curs_mouse.3x curs_move.3x curs_outopts.3x curs_overlay.3x \
+	curs_pad.3x curs_print.3x curs_printw.3x curs_refresh.3x \
+	curs_scanw.3x curs_scr_dump.3x curs_scroll.3x curs_set.3x \
+	curs_slk.3x curs_termattrs.3x curs_termcap.3x curs_terminfo.3x \
+	curs_touch.3x curs_trace.3x curs_util.3x curs_window.3x \
+	curses_version.3x data_ahead.3x data_behind.3x \
+	def_prog_mode.3x def_shell_mode.3x default_colors.3x \
+	define_key.3x del_curterm.3x del_panel.3x delay_output.3x \
+	delch.3x deleteln.3x delscreen.3x delwin.3x derwin.3x \
+	doupdate.3x dup_field.3x dupwin.3x dynamic_field_info.3x \
+	echo.3x echochar.3x endwin.3x erase.3x erasechar.3x \
+	field_arg.3x field_back.3x field_buffer.3x field_count.3x \
+	field_fore.3x field_index.3x field_info.3x field_just.3x \
+	field_opts.3x field_opts_off.3x field_opts_on.3x field_pad.3x \
+	field_status.3x field_type.3x field_userptr.3x filter.3x \
+	flash.3x flushinp.3x form.3x form_cursor.3x form_data.3x \
 	form_driver.3x form_field.3x form_field_attributes.3x \
 	form_field_buffer.3x form_field_info.3x form_field_just.3x \
 	form_field_new.3x form_field_opts.3x form_field_userptr.3x \
-	form_field_validation.3x form_fieldtype.3x form_hook.3x \
-	form_new.3x form_new_page.3x form_opts.3x form_page.3x \
-	form_post.3x form_requestname.3x form_userptr.3x form_win.3x \
-	keyok.3x menu.3x menu_attribs.3x menu_cursor.3x menu_driver.3x \
-	menu_format.3x menu_hook.3x menu_items.3x menu_mark.3x \
-	menu_new.3x menu_opts.3x menu_pattern.3x menu_post.3x \
-	menu_requestname.3x menu_spacing.3x menu_userptr.3x \
-	menu_win.3x mitem_current.3x mitem_name.3x mitem_new.3x \
-	mitem_opts.3x mitem_userptr.3x mitem_value.3x mitem_visible.3x \
-	ncurses.3x panel.3x resizeterm.3x wresize.3x
-MAN5=	terminfo.5 term.5
+	form_field_validation.3x form_fields.3x form_fieldtype.3x \
+	form_hook.3x form_new.3x form_new_page.3x form_opts.3x \
+	form_opts_off.3x form_opts_on.3x form_page.3x form_post.3x \
+	form_request_by_name.3x form_request_name.3x \
+	form_requestname.3x form_sub.3x form_userptr.3x form_win.3x \
+	free_field.3x free_fieldtype.3x free_form.3x free_item.3x \
+	free_menu.3x getbegyx.3x getbkgd.3x getch.3x getmaxyx.3x \
+	getmouse.3x getnstr.3x getparyx.3x getstr.3x getsyx.3x \
+	getwin.3x getyx.3x halfdelay.3x has_colors.3x has_ic.3x \
+	has_il.3x has_key.3x hide_panel.3x hline.3x idcok.3x idlok.3x \
+	immedok.3x inch.3x inchnstr.3x inchstr.3x init_color.3x \
+	init_pair.3x initscr.3x innstr.3x insch.3x insdelln.3x \
+	insertln.3x insnstr.3x insstr.3x instr.3x intrflush.3x \
+	is_linetouched.3x is_wintouched.3x isendwin.3x item_count.3x \
+	item_description.3x item_index.3x item_name.3x item_opts.3x \
+	item_opts_off.3x item_opts_on.3x item_userptr.3x item_value.3x \
+	item_visible.3x keybound.3x keyname.3x keyok.3x keypad.3x \
+	killchar.3x leaveok.3x link_field.3x link_fieldtype.3x \
+	longname.3x mcprint.3x menu.3x menu_attributes.3x menu_back.3x \
+	menu_cursor.3x menu_driver.3x menu_fore.3x menu_format.3x \
+	menu_grey.3x menu_hook.3x menu_items.3x menu_mark.3x \
+	menu_new.3x menu_opts.3x menu_opts_off.3x menu_opts_on.3x \
+	menu_pad.3x menu_pattern.3x menu_post.3x \
+	menu_request_by_name.3x menu_request_name.3x \
+	menu_requestname.3x menu_spacing.3x menu_sub.3x \
+	menu_userptr.3x menu_win.3x meta.3x mitem_current.3x \
+	mitem_name.3x mitem_new.3x mitem_opts.3x mitem_userptr.3x \
+	mitem_value.3x mitem_visible.3x mouse_trafo.3x \
+	mouseinterval.3x mousemask.3x move.3x move_field.3x \
+	move_panel.3x mvaddch.3x mvaddchnstr.3x mvaddchstr.3x \
+	mvaddnstr.3x mvaddstr.3x mvchgat.3x mvcur.3x mvdelch.3x \
+	mvderwin.3x mvgetch.3x mvgetnstr.3x mvgetstr.3x mvhline.3x \
+	mvinch.3x mvinchnstr.3x mvinchstr.3x mvinnstr.3x mvinsch.3x \
+	mvinsnstr.3x mvinsstr.3x mvinstr.3x mvprintw.3x mvscanw.3x \
+	mvvline.3x mvwaddch.3x mvwaddchnstr.3x mvwaddchstr.3x \
+	mvwaddnstr.3x mvwaddstr.3x mvwchgat.3x mvwdelch.3x mvwgetch.3x \
+	mvwgetnstr.3x mvwgetstr.3x mvwhline.3x mvwin.3x mvwinch.3x \
+	mvwinchnstr.3x mvwinchstr.3x mvwinnstr.3x mvwinsch.3x \
+	mvwinsnstr.3x mvwinsstr.3x mvwinstr.3x mvwprintw.3x \
+	mvwscanw.3x mvwvline.3x napms.3x ncurses.3x new_field.3x \
+	new_fieldtype.3x new_form.3x new_item.3x new_menu.3x \
+	new_page.3x new_panel.3x newpad.3x newterm.3x newwin.3x nl.3x \
+	nocbreak.3x nodelay.3x noecho.3x nonl.3x noqiflush.3x noraw.3x \
+	notimeout.3x overlay.3x overwrite.3x pair_content.3x panel.3x \
+	panel_above.3x panel_below.3x panel_hidden.3x panel_userptr.3x \
+	panel_window.3x pechochar.3x pnoutrefresh.3x \
+	pos_form_cursor.3x pos_menu_cursor.3x post_form.3x \
+	post_menu.3x prefresh.3x printw.3x putp.3x putwin.3x \
+	qiflush.3x raw.3x redrawwin.3x refresh.3x replace_panel.3x \
+	reset_prog_mode.3x reset_shell_mode.3x resetty.3x \
+	resizeterm.3x restartterm.3x ripoffline.3x savetty.3x \
+	scale_form.3x scale_menu.3x scanw.3x scr_dump.3x scr_init.3x \
+	scr_restore.3x scr_set.3x scrl.3x scroll.3x scrollok.3x \
+	set_current_field.3x set_current_item.3x set_curterm.3x \
+	set_field_back.3x set_field_buffer.3x set_field_fore.3x \
+	set_field_init.3x set_field_just.3x set_field_opts.3x \
+	set_field_pad.3x set_field_status.3x set_field_term.3x \
+	set_field_type.3x set_field_userptr.3x set_fieldtype_arg.3x \
+	set_fieldtype_choice.3x set_form_fields.3x set_form_init.3x \
+	set_form_opts.3x set_form_page.3x set_form_sub.3x \
+	set_form_term.3x set_form_userptr.3x set_form_win.3x \
+	set_item_init.3x set_item_opts.3x set_item_term.3x \
+	set_item_userptr.3x set_item_value.3x set_max_field.3x \
+	set_menu_back.3x set_menu_fore.3x set_menu_format.3x \
+	set_menu_grey.3x set_menu_init.3x set_menu_items.3x \
+	set_menu_mark.3x set_menu_opts.3x set_menu_pad.3x \
+	set_menu_pattern.3x set_menu_spacing.3x set_menu_sub.3x \
+	set_menu_term.3x set_menu_userptr.3x set_menu_win.3x \
+	set_new_page.3x set_panel_userptr.3x set_term.3x \
+	set_top_row.3x setscrreg.3x setsyx.3x setterm.3x setupterm.3x \
+	show_panel.3x slk_attr.3x slk_attr_off.3x slk_attr_on.3x \
+	slk_attr_set.3x slk_attroff.3x slk_attron.3x slk_attrset.3x \
+	slk_clear.3x slk_color.3x slk_init.3x slk_label.3x \
+	slk_noutrefresh.3x slk_refresh.3x slk_restore.3x slk_set.3x \
+	slk_touch.3x standend.3x standout.3x start_color.3x subpad.3x \
+	subwin.3x syncok.3x termattrs.3x termname.3x tgetent.3x \
+	tgetflag.3x tgetnum.3x tgetstr.3x tgoto.3x tigetflag.3x \
+	tigetnum.3x tigetstr.3x timeout.3x top_panel.3x top_row.3x \
+	touchline.3x touchwin.3x tparm.3x tputs.3x trace.3x \
+	typeahead.3x unctrl.3x ungetch.3x ungetmouse.3x unpost_form.3x \
+	unpost_menu.3x untouchwin.3x update_panels.3x \
+	use_default_colors.3x use_env.3x use_extended_names.3x \
+	vidattr.3x vidputs.3x vline.3x vw_printw.3x vw_scanw.3x \
+	vwprintw.3x vwscanw.3x waddch.3x waddchnstr.3x waddchstr.3x \
+	waddnstr.3x waddstr.3x wattr_get.3x wattr_off.3x wattr_on.3x \
+	wattr_set.3x wattroff.3x wattron.3x wattrset.3x wbkgd.3x \
+	wbkgdset.3x wborder.3x wchgat.3x wclear.3x wclrtobot.3x \
+	wclrtoeol.3x wcolor_set.3x wcursyncup.3x wdelch.3x \
+	wdeleteln.3x wechochar.3x wenclose.3x werase.3x wgetch.3x \
+	wgetnstr.3x wgetstr.3x whline.3x winch.3x winchnstr.3x \
+	winchstr.3x winnstr.3x winsch.3x winsdelln.3x winsertln.3x \
+	winsnstr.3x winsstr.3x winstr.3x wmouse_trafo.3x wmove.3x \
+	wnoutrefresh.3x wprintw.3x wredrawln.3x wrefresh.3x wresize.3x \
+	wscanw.3x wscrl.3x wsetscrreg.3x wstandend.3x wstandout.3x \
+	wsyncdown.3x wsyncup.3x wtimeout.3x wtouchln.3x wvline.3x
+MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
-MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
-		--disable-termcap --includedir=${PREFIX}/include/ncurses \
-		--with-profile --with-shared
-CONFIGURE_ENV=		gnat_exists="no" ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
-
-post-extract:
-	@ ${RM} ${WRKSRC}/misc/terminfo.src
-	@ ${CP} ${DISTDIR}/terminfo.src.gz ${WRKSRC}/misc
-	@ ${GUNZIP_CMD} ${WRKSRC}/misc/terminfo.src.gz
+DOCS=		ANNOUNCE INSTALL NEWS README TO-DO doc/html/announce.html \
+		doc/hackguide.doc doc/html/hackguide.html \
+		doc/html/index.html doc/ncurses-intro.doc \
+		doc/html/ncurses-intro.html
+EXAMPLES= 	Makefile README blue.c bs.6 bs.c cardfile.c cardfile.dat \
+		ditto.c dots.c filter.c firework.c firstlast.c gdc.6 \
+		gdc.c hanoi.c hashtest.c knight.c lrtest.c ncurses.c \
+		newdemo.c railroad.c rain.c tclock.c test.priv.h \
+		testaddch.c testcurs.c testscanw.c view.c worm.c \
+		xmas.c
+EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
+		cursesapp.h cursesf.cc cursesf.h cursesm.cc cursesm.h \
+		cursesmain.cc cursesp.cc cursesp.h cursesw.cc \
+		cursesw.h cursslk.cc cursslk.h demo.cc etip.h \
+		internal.h
 
 post-install:
+	@ ${GZIP_CMD} ${PREFIX}/man/man1/tack.1
 	@ ${MKDIR} ${PREFIX}/share/doc/ncurses
-.for file in ANNOUNCE INSTALL NEWS README TO-DO announce.html misc/hackguide.doc misc/hackguide.html misc/ncurses-intro.doc misc/ncurses-intro.html
+.for file in ${DOCS}
 	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ncurses
 .endfor
 	@ ${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src ${PREFIX}/share/misc/terminfo
 	@ ${MKDIR} ${PREFIX}/share/examples/ncurses
-.for file in README blue.c bs.6 bs.c firework.c gdc.6 gdc.c hanoi.c hashtest.c knight.c lrtest.c ncurses.c newdemo.c rain.c tclock.c test.priv.h testcurs.c view.c worm.c xmas.c
+.for file in ${EXAMPLES}
 	@ ${INSTALL_DATA} ${WRKSRC}/test/${file} ${PREFIX}/share/examples/ncurses
 .endfor
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/test/tracemunch ${PREFIX}/share/examples/ncurses
 	@ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/ncurses
 	@ ${MKDIR} ${PREFIX}/share/examples/ncurses/c++
-.for file in NEWS PROBLEMS README-first cursesp.cc cursesp.h cursesw.cc cursesw.h demo.cc
+.for file in ${EXAMPLES_CPP}
 	@ ${INSTALL_DATA} ${WRKSRC}/c++/${file} ${PREFIX}/share/examples/ncurses/c++
 .endfor
-	@ ${INSTALL_DATA} ${FILESDIR}/Makefile.c++ ${PREFIX}/share/examples/ncurses/c++/Makefile
 
 .include <bsd.port.mk>