3 files changed, 100 insertions, 107 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index d898289c82f9..f217fd96ff25 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -6,24 +6,18 @@
 #
 
 PORTNAME=		ncurses
-PORTVERSION=		5.4
+PORTVERSION=		5.5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	ncurses
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		garga@FreeBSD.org
 COMMENT=		Library for terminal-independent, full-screen output
 
 LIB_DEPENDS=		utf-8:${PORTSDIR}/converters/libutf-8
 
 NO_FILTER_SHLIBS=	no
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 400000
-MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
@@ -39,6 +33,8 @@ CONFIGURE_ARGS+=	--with-trace
 CONFIGURE_ENV=	gnat_exists="no" \
 		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
 
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+
 INSTALLS_SHLIB=	yes
 MANCOMPRESSED=	yes
 MAN1=	captoinfo.1m clear.1 infocmp.1m infotocap.1m reset.1 tack.1 \
@@ -187,12 +183,12 @@ MAN3=	COLOR_PAIR.3x PAIR_NUMBER.3x _nc_tracebits.3x _traceattr.3x \
 MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PORTDOCS=	*
 
-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
+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 \
@@ -205,30 +201,28 @@ EXAMPLES_CPP=	Makefile NEWS PROBLEMS README-first cursesapp.cc \
 		cursesw.h cursslk.cc cursslk.h demo.cc etip.h \
 		internal.h
 
-pre-configure:
-	${MKDIR} ${WRKDIR}
-	${ECHO_CMD} \
-	"Warning:  source code for this version has not been reviewed!" \
-		> ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} 
-	@${ECHO_CMD} Waiting ten seconds--press control-C to cancel build.
-	@sleep 10
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400000
+MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
+.endif
 
 post-install:
-	@ ${GZIP_CMD} ${PREFIX}/man/man1/tack.1
-	@ ${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/c++
-.for file in ${DOCS}
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-	@ ${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
+	${MKDIR} ${EXAMPLESDIR}/c++
+	${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
 		${PREFIX}/share/misc/terminfo
-.for file in ${EXAMPLES}
-	@ ${INSTALL_DATA} ${WRKSRC}/test/${file} ${EXAMPLESDIR}
+.for f in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/test/${f} ${EXAMPLESDIR}
 .endfor
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/test/tracemunch ${EXAMPLESDIR}
-.for file in ${EXAMPLES_CPP}
-	@ ${INSTALL_DATA} ${WRKSRC}/c++/${file} ${EXAMPLESDIR}/c++
+	${INSTALL_SCRIPT} ${WRKSRC}/test/tracemunch ${EXAMPLESDIR}
+.for f in ${EXAMPLES_CPP}
+	${INSTALL_DATA} ${WRKSRC}/c++/${f} ${EXAMPLESDIR}/c++
 .endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+. for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+. endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/ncurses-devel/distinfo b/devel/ncurses-devel/distinfo
index 3271a94e7c43..c0e34c6ec979 100644
--- a/devel/ncurses-devel/distinfo
+++ b/devel/ncurses-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ncurses-5.4.tar.gz) = 069c8880072060373290a4fefff43520
-SHA256 (ncurses-5.4.tar.gz) = 5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36
-SIZE (ncurses-5.4.tar.gz) = 2154022
+MD5 (ncurses-5.5.tar.gz) = e73c1ac10b4bfc46db43b2ddfd6244ef
+SHA256 (ncurses-5.5.tar.gz) = 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93
+SIZE (ncurses-5.5.tar.gz) = 2314030
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index 77625a9a112b..1ac69a3714e3 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -27,91 +27,80 @@ include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
 lib/libform.so.5
-lib/libform.so.5.4
+lib/libform.so.%%PORTVERSION%%
 lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
 lib/libmenu.so.5
-lib/libmenu.so.5.4
+lib/libmenu.so.%%PORTVERSION%%
 lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
 lib/libncurses.so.5
-lib/libncurses.so.5.4
+lib/libncurses.so.%%PORTVERSION%%
 lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
 lib/libpanel.so.5
-lib/libpanel.so.5.4
+lib/libpanel.so.%%PORTVERSION%%
 lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
 lib/libtinfo.so.5
-lib/libtinfo.so.5.4
+lib/libtinfo.so.%%PORTVERSION%%
 lib/libtinfo_p.a
-share/doc/ncurses/ANNOUNCE
-share/doc/ncurses/INSTALL
-share/doc/ncurses/NEWS
-share/doc/ncurses/README
-share/doc/ncurses/TO-DO
-share/doc/ncurses/announce.html
-share/doc/ncurses/hackguide.doc
-share/doc/ncurses/hackguide.html
-share/doc/ncurses/index.html
-share/doc/ncurses/ncurses-intro.doc
-share/doc/ncurses/ncurses-intro.html
-share/examples/ncurses/Makefile
-share/examples/ncurses/README
-share/examples/ncurses/blue.c
-share/examples/ncurses/bs.6
-share/examples/ncurses/bs.c
-share/examples/ncurses/c++/Makefile
-share/examples/ncurses/c++/NEWS
-share/examples/ncurses/c++/PROBLEMS
-share/examples/ncurses/c++/README-first
-share/examples/ncurses/c++/cursesapp.cc
-share/examples/ncurses/c++/cursesapp.h
-share/examples/ncurses/c++/cursesf.cc
-share/examples/ncurses/c++/cursesf.h
-share/examples/ncurses/c++/cursesm.cc
-share/examples/ncurses/c++/cursesm.h
-share/examples/ncurses/c++/cursesmain.cc
-share/examples/ncurses/c++/cursesp.cc
-share/examples/ncurses/c++/cursesp.h
-share/examples/ncurses/c++/cursesw.cc
-share/examples/ncurses/c++/cursesw.h
-share/examples/ncurses/c++/cursslk.cc
-share/examples/ncurses/c++/cursslk.h
-share/examples/ncurses/c++/demo.cc
-share/examples/ncurses/c++/etip.h
-share/examples/ncurses/c++/internal.h
-share/examples/ncurses/cardfile.c
-share/examples/ncurses/cardfile.dat
-share/examples/ncurses/ditto.c
-share/examples/ncurses/dots.c
-share/examples/ncurses/filter.c
-share/examples/ncurses/firework.c
-share/examples/ncurses/firstlast.c
-share/examples/ncurses/gdc.6
-share/examples/ncurses/gdc.c
-share/examples/ncurses/hanoi.c
-share/examples/ncurses/hashtest.c
-share/examples/ncurses/knight.c
-share/examples/ncurses/lrtest.c
-share/examples/ncurses/ncurses.c
-share/examples/ncurses/newdemo.c
-share/examples/ncurses/railroad.c
-share/examples/ncurses/rain.c
-share/examples/ncurses/tclock.c
-share/examples/ncurses/test.priv.h
-share/examples/ncurses/testaddch.c
-share/examples/ncurses/testcurs.c
-share/examples/ncurses/testscanw.c
-share/examples/ncurses/tracemunch
-share/examples/ncurses/view.c
-share/examples/ncurses/worm.c
-share/examples/ncurses/xmas.c
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/blue.c
+%%EXAMPLESDIR%%/bs.6
+%%EXAMPLESDIR%%/bs.c
+%%EXAMPLESDIR%%/c++/Makefile
+%%EXAMPLESDIR%%/c++/NEWS
+%%EXAMPLESDIR%%/c++/PROBLEMS
+%%EXAMPLESDIR%%/c++/README-first
+%%EXAMPLESDIR%%/c++/cursesapp.cc
+%%EXAMPLESDIR%%/c++/cursesapp.h
+%%EXAMPLESDIR%%/c++/cursesf.cc
+%%EXAMPLESDIR%%/c++/cursesf.h
+%%EXAMPLESDIR%%/c++/cursesm.cc
+%%EXAMPLESDIR%%/c++/cursesm.h
+%%EXAMPLESDIR%%/c++/cursesmain.cc
+%%EXAMPLESDIR%%/c++/cursesp.cc
+%%EXAMPLESDIR%%/c++/cursesp.h
+%%EXAMPLESDIR%%/c++/cursesw.cc
+%%EXAMPLESDIR%%/c++/cursesw.h
+%%EXAMPLESDIR%%/c++/cursslk.cc
+%%EXAMPLESDIR%%/c++/cursslk.h
+%%EXAMPLESDIR%%/c++/demo.cc
+%%EXAMPLESDIR%%/c++/etip.h
+%%EXAMPLESDIR%%/c++/internal.h
+%%EXAMPLESDIR%%/cardfile.c
+%%EXAMPLESDIR%%/cardfile.dat
+%%EXAMPLESDIR%%/ditto.c
+%%EXAMPLESDIR%%/dots.c
+%%EXAMPLESDIR%%/filter.c
+%%EXAMPLESDIR%%/firework.c
+%%EXAMPLESDIR%%/firstlast.c
+%%EXAMPLESDIR%%/gdc.6
+%%EXAMPLESDIR%%/gdc.c
+%%EXAMPLESDIR%%/hanoi.c
+%%EXAMPLESDIR%%/hashtest.c
+%%EXAMPLESDIR%%/knight.c
+%%EXAMPLESDIR%%/lrtest.c
+%%EXAMPLESDIR%%/ncurses.c
+%%EXAMPLESDIR%%/newdemo.c
+%%EXAMPLESDIR%%/railroad.c
+%%EXAMPLESDIR%%/rain.c
+%%EXAMPLESDIR%%/tclock.c
+%%EXAMPLESDIR%%/test.priv.h
+%%EXAMPLESDIR%%/testaddch.c
+%%EXAMPLESDIR%%/testcurs.c
+%%EXAMPLESDIR%%/testscanw.c
+%%EXAMPLESDIR%%/tracemunch
+%%EXAMPLESDIR%%/view.c
+%%EXAMPLESDIR%%/worm.c
+%%EXAMPLESDIR%%/xmas.c
 share/misc/tabset/std
 share/misc/tabset/stdcrt
 share/misc/tabset/vt100
@@ -257,6 +246,7 @@ share/misc/terminfo/a/adm42-ns
 share/misc/terminfo/a/adm5
 share/misc/terminfo/a/aepro
 share/misc/terminfo/a/aixterm
+share/misc/terminfo/a/aixterm-16color
 share/misc/terminfo/a/aixterm-m
 share/misc/terminfo/a/aixterm-m-old
 share/misc/terminfo/a/aj
@@ -955,6 +945,7 @@ share/misc/terminfo/e/elks-glasstty
 share/misc/terminfo/e/elks-vt52
 share/misc/terminfo/e/emots
 share/misc/terminfo/e/emu
+share/misc/terminfo/e/emu-220
 share/misc/terminfo/e/emx-base
 share/misc/terminfo/e/env230
 share/misc/terminfo/e/envision230
@@ -1176,6 +1167,7 @@ share/misc/terminfo/h/hpgeneric
 share/misc/terminfo/h/hpsub
 share/misc/terminfo/h/hpterm
 share/misc/terminfo/h/htx11
+share/misc/terminfo/h/hurd
 share/misc/terminfo/h/hz1000
 share/misc/terminfo/h/hz1420
 share/misc/terminfo/h/hz1500
@@ -1366,6 +1358,7 @@ share/misc/terminfo/m/minitel1b-80
 share/misc/terminfo/m/minix
 share/misc/terminfo/m/minix-old
 share/misc/terminfo/m/minix-old-am
+share/misc/terminfo/m/mlterm
 share/misc/terminfo/m/mm314
 share/misc/terminfo/m/mm340
 share/misc/terminfo/m/mod
@@ -1374,6 +1367,7 @@ share/misc/terminfo/m/modgraph
 share/misc/terminfo/m/modgraph2
 share/misc/terminfo/m/modgraph48
 share/misc/terminfo/m/mono-emx
+share/misc/terminfo/m/morphos
 share/misc/terminfo/m/mouse-sun
 share/misc/terminfo/m/ms-vt-utf8
 share/misc/terminfo/m/ms-vt100
@@ -1789,6 +1783,7 @@ share/misc/terminfo/r/rt6221
 share/misc/terminfo/r/rt6221-w
 share/misc/terminfo/r/rtpc
 share/misc/terminfo/r/rxvt
+share/misc/terminfo/r/rxvt+pcfkeys
 share/misc/terminfo/r/rxvt-16color
 share/misc/terminfo/r/rxvt-basic
 share/misc/terminfo/r/rxvt-color
@@ -1813,6 +1808,7 @@ share/misc/terminfo/s/screen-s
 share/misc/terminfo/s/screen-w
 share/misc/terminfo/s/screen.linux
 share/misc/terminfo/s/screen.teraterm
+share/misc/terminfo/s/screen.xterm-new
 share/misc/terminfo/s/screen.xterm-r6
 share/misc/terminfo/s/screen.xterm-xfree86
 share/misc/terminfo/s/screen2
@@ -1836,6 +1832,7 @@ share/misc/terminfo/s/sun-48
 share/misc/terminfo/s/sun-c
 share/misc/terminfo/s/sun-cgsix
 share/misc/terminfo/s/sun-cmd
+share/misc/terminfo/s/sun-color
 share/misc/terminfo/s/sun-e
 share/misc/terminfo/s/sun-e-s
 share/misc/terminfo/s/sun-il
@@ -2170,6 +2167,7 @@ share/misc/terminfo/v/vt100-nam
 share/misc/terminfo/v/vt100-nam-w
 share/misc/terminfo/v/vt100-nav
 share/misc/terminfo/v/vt100-nav-w
+share/misc/terminfo/v/vt100-putty
 share/misc/terminfo/v/vt100-s
 share/misc/terminfo/v/vt100-s-bot
 share/misc/terminfo/v/vt100-s-top
@@ -2535,6 +2533,7 @@ share/misc/terminfo/x/xnuppc-m-f
 share/misc/terminfo/x/xnuppc-m-f2
 share/misc/terminfo/x/xtalk
 share/misc/terminfo/x/xterm
+share/misc/terminfo/x/xterm+pcfkeys
 share/misc/terminfo/x/xterm+sl
 share/misc/terminfo/x/xterm+sl-twm
 share/misc/terminfo/x/xterm-1002
@@ -2564,6 +2563,7 @@ share/misc/terminfo/x/xterm-xf86-v33
 share/misc/terminfo/x/xterm-xf86-v333
 share/misc/terminfo/x/xterm-xf86-v40
 share/misc/terminfo/x/xterm-xf86-v43
+share/misc/terminfo/x/xterm-xf86-v44
 share/misc/terminfo/x/xterm-xfree86
 share/misc/terminfo/x/xterm-xi
 share/misc/terminfo/x/xterm1
@@ -2648,7 +2648,6 @@ share/misc/terminfo/z/ztx11
 @dirrm share/misc/terminfo/1
 @dirrm share/misc/terminfo
 @dirrm share/misc/tabset
-@dirrm share/examples/ncurses/c++
-@dirrm share/examples/ncurses
-@dirrm share/doc/ncurses
+@dirrm %%EXAMPLESDIR%%/c++
+@dirrm %%EXAMPLESDIR%%
 @dirrm include/ncurses