Index: head/devel/ncurses/Makefile
===================================================================
--- head/devel/ncurses/Makefile	(revision 181465)
+++ head/devel/ncurses/Makefile	(revision 181466)
@@ -1,144 +1,173 @@
 # New ports collection makefile for:	ncurses
 # Date created:				23 September 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ncurses
 PORTVERSION=	5.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Library for terminal-independent, full-screen output
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${TARGETDIR}/share/misc --disable-overwrite \
-		--enable-termcap --disable-database --enable-getcap \
-		--enable-colorfgbg --enable-bsdpad --disable-home-terminfo \
+		--enable-termcap --enable-bsdpad --enable-getcap \
+		--enable-colorfgbg --disable-home-terminfo \
 		--includedir=${TARGETDIR}/include/ncurses \
-		--with-profile --with-shared --without-debug \
+		--with-shared \
 		--without-curses-h --with-termlib --program-prefix= \
-		--enable-safe-sprintf --disable-root-environ \
+		--enable-rpath --disable-root-environ \
 		--with-manpage-format=gzip --srcdir=../
 
 # needed by devel/py-ncurses port
 .if defined(WITH_TRACE)
 CONFIGURE_ARGS+=	--with-trace
 .endif
 
-LDFLAGS+=	-rpath ${TARGETDIR}/lib
+CONFIGURE_ENV=	gnat_exists="no"
 
-CONFIGURE_ENV=	gnat_exists="no" \
-		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${TARGETDIR}/lib" \
-		LDFLAGS="${LDFLAGS}"
-
 USE_LDCONFIG=	yes
 NO_FILTER_SHLIBS=yes
 
 WIDEC_WRKSRC=	${WRKSRC}/build.widec
 NOWIDEC_WRKSRC=	${WRKSRC}/build.nowidec
 WIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/widec
 NOWIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/nowidec
 EXAMPLES_TARGETS=	NOWIDEC
 
 CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
 BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
 INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \
 		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,}
 
 MANCOMPRESSED=	yes
 MAN1=	captoinfo.1m clear.1 infocmp.1m infotocap.1m reset.1 tack.1 \
 	tic.1m toe.1m tput.1 tset.1
 MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
 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
 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
 
 .include <bsd.port.pre.mk>
 
 MAN3!=	${CAT} ${FILESDIR}/man3
 
-.if ${OSVERSION} >= 400000
-MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile
 .endif
 
 .if ${OSVERSION} < 503000
 WITHOUT_WIDEC=	yes
-PLIST_SUB+=	WIDEC="@comment "
+.endif
+
+.if !defined(WITHOUT_PROFILE) && !defined(NO_PROFILE) && !defined(NOPROFILE)
+CONFIGURE_ARGS+=--with-profile
+PLIST_SUB+=	PROFILE=""
 .else
+CONFIGURE_ARGS+=--without-profile
+PLIST_SUB+=	PROFILE="@comment "
+.endif
+
+.if !defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--without-debug
+PLIST_SUB+=	DEBUG="@comment "
+.else
+CONFIGURE_ARGS+=--with-debug
+PLIST_SUB+=	DEBUG=""
+.endif
+
+.if !defined(WITHOUT_TERMINFO)
+CONFIGURE_ARGS+=--with-hashed-db
+PLIST_SUB+=	TERMINFO=""
+.else # termcap only, easier for updating ncurses in base
+CONFIGURE_ARGS+=--disable-database
+PLIST_SUB+=	TERMINFO="@comment "
+.endif
+
+.if !defined(WITHOUT_WIDEC)
 PLIST_SUB+=	WIDEC=""
 EXAMPLES_TARGETS+=	WIDEC
+.else
+PLIST_SUB+=	WIDEC="@comment "
 .endif
 
 post-extract:
 	@${MKDIR} ${WIDEC_WRKSRC}
 	@${MKDIR} ${NOWIDEC_WRKSRC}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,$$(INSTALL_PROG) ncurses-config,@INSTALL_SCRIPT@ ncurses-config,' ${WRKSRC}/misc/Makefile.in
+
 post-configure:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} CONFIGURE_WRKSRC=${WIDEC_WRKSRC} \
 	    CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-widec" \
 	    do-configure
 .endif
 .for d in test c++
 .if !defined(WITHOUT_WIDEC)
 	${CP} ${WRKSRC}/${d}/* ${WIDEC_WRKSRC}/${d}/
 .endif
 	${CP} ${WRKSRC}/${d}/* ${NOWIDEC_WRKSRC}/${d}/
 .endfor
 
 post-build:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} BUILD_WRKSRC=${WIDEC_WRKSRC} do-build
 .endif
 
 post-install:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} INSTALL_WRKSRC=${WIDEC_WRKSRC} do-install
 .endif
 
-	${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
-		${TARGETDIR}/share/misc/terminfo
-
 .for i in ${EXAMPLES_TARGETS}
 	${MKDIR} ${${i}_EXAMPLESDIR}/c++
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${${i}_WRKSRC}/test/${f} ${${i}_EXAMPLESDIR}
 .endfor
 	${INSTALL_SCRIPT} ${${i}_WRKSRC}/test/tracemunch ${${i}_EXAMPLESDIR}
 .for f in ${EXAMPLES_CPP}
 	${INSTALL_DATA} ${${i}_WRKSRC}/c++/${f} ${${i}_EXAMPLESDIR}/c++
 .endfor
 .endfor
+
+.if !defined(WITHOUT_TERMINFO)
+	${FIND} ${PREFIX}/share/misc -name "*.terminfo" -print0	|	\
+		${XARGS} -0 ${PREFIX}/bin/tic
+.endif
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 . for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 . endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/ncurses/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/devel/ncurses/pkg-plist
===================================================================
--- head/devel/ncurses/pkg-plist	(revision 181465)
+++ head/devel/ncurses/pkg-plist	(revision 181466)
@@ -1,183 +1,205 @@
 bin/clear
 bin/infocmp
 bin/reset
 bin/tack
 bin/tput
 bin/tset
+%%TERMINFO%%bin/tic
+%%TERMINFO%%bin/toe
+%%TERMINFO%%bin/infotocap
+%%TERMINFO%%bin/captoinfo
+%%TERMINFO%%bin/ncurses5-config
+%%WIDEC%%%%TERMINFO%%bin/ncursesw5-config
 include/ncurses/cursesapp.h
 include/ncurses/cursesf.h
 include/ncurses/cursesm.h
 include/ncurses/cursesp.h
 include/ncurses/cursesw.h
 include/ncurses/cursslk.h
 include/ncurses/eti.h
 include/ncurses/etip.h
 include/ncurses/form.h
 include/ncurses/menu.h
 include/ncurses/ncurses.h
 include/ncurses/ncurses_dll.h
 include/ncurses/panel.h
 include/ncurses/term.h
 include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
 lib/libform.so.5
 lib/libform.so.%%PORTVERSION%%
-lib/libform_p.a
+%%DEBUG%%lib/libform_g.a
+%%PROFILE%%lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
 lib/libmenu.so.5
 lib/libmenu.so.%%PORTVERSION%%
-lib/libmenu_p.a
+%%DEBUG%%lib/libmenu_g.a
+%%PROFILE%%lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
 lib/libncurses.so.5
 lib/libncurses.so.%%PORTVERSION%%
-lib/libncurses_p.a
+%%DEBUG%%lib/libncurses_g.a
+%%PROFILE%%lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
 lib/libpanel.so.5
 lib/libpanel.so.%%PORTVERSION%%
-lib/libpanel_p.a
+%%DEBUG%%lib/libpanel_g.a
+%%PROFILE%%lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
 lib/libtinfo.so.5
 lib/libtinfo.so.%%PORTVERSION%%
-lib/libtinfo_p.a
+%%DEBUG%%lib/libtinfo_g.a
+%%PROFILE%%lib/libtinfo_p.a
 %%WIDEC%%lib/libformw.a
 %%WIDEC%%lib/libformw.so
 %%WIDEC%%lib/libformw.so.5
 %%WIDEC%%lib/libformw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libformw_p.a
+%%WIDEC%%%%DEBUG%%lib/libformw_g.a
+%%WIDEC%%%%PROFILE%%lib/libformw_p.a
 %%WIDEC%%lib/libmenuw.a
 %%WIDEC%%lib/libmenuw.so
 %%WIDEC%%lib/libmenuw.so.5
 %%WIDEC%%lib/libmenuw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libmenuw_p.a
+%%WIDEC%%%%DEBUG%%lib/libmenuw_g.a
+%%WIDEC%%%%PROFILE%%lib/libmenuw_p.a
 %%WIDEC%%lib/libncurses++w.a
 %%WIDEC%%lib/libncursesw.a
 %%WIDEC%%lib/libncursesw.so
 %%WIDEC%%lib/libncursesw.so.5
 %%WIDEC%%lib/libncursesw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libncursesw_p.a
+%%WIDEC%%%%DEBUG%%lib/libncursesw_g.a
+%%WIDEC%%%%PROFILE%%lib/libncursesw_p.a
 %%WIDEC%%lib/libpanelw.a
 %%WIDEC%%lib/libpanelw.so
 %%WIDEC%%lib/libpanelw.so.5
 %%WIDEC%%lib/libpanelw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libpanelw_p.a
+%%WIDEC%%%%DEBUG%%lib/libpanelw_g.a
+%%WIDEC%%%%PROFILE%%lib/libpanelw_p.a
 %%WIDEC%%lib/libtinfow.a
 %%WIDEC%%lib/libtinfow.so
 %%WIDEC%%lib/libtinfow.so.5
 %%WIDEC%%lib/libtinfow.so.%%PORTVERSION%%
-%%WIDEC%%lib/libtinfow_p.a
-share/misc/terminfo
+%%WIDEC%%%%DEBUG%%lib/libtinfow_g.a
+%%WIDEC%%%%PROFILE%%lib/libtinfow_p.a
+%%TERMINFO%%share/misc/tabset/std
+%%TERMINFO%%share/misc/tabset/stdcrt
+%%TERMINFO%%share/misc/tabset/vt100
+%%TERMINFO%%share/misc/tabset/vt300
+%%TERMINFO%%share/misc/terminfo.db
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/Makefile
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/README
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/blue.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.6
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/Makefile
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/NEWS
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/PROBLEMS
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/README-first
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/demo.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/etip.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/internal.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.dat
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ditto.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/dots.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/filter.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firework.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firstlast.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.6
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hanoi.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hashtest.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/knight.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/lrtest.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ncurses.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/newdemo.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/railroad.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/rain.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tclock.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/test.priv.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testaddch.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testcurs.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testscanw.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tracemunch
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/view.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/worm.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/xmas.c
 %%NOWIDEC_EXAMPLESDIR%%/Makefile
 %%NOWIDEC_EXAMPLESDIR%%/README
 %%NOWIDEC_EXAMPLESDIR%%/blue.c
 %%NOWIDEC_EXAMPLESDIR%%/bs.6
 %%NOWIDEC_EXAMPLESDIR%%/bs.c
 %%NOWIDEC_EXAMPLESDIR%%/c++/Makefile
 %%NOWIDEC_EXAMPLESDIR%%/c++/NEWS
 %%NOWIDEC_EXAMPLESDIR%%/c++/PROBLEMS
 %%NOWIDEC_EXAMPLESDIR%%/c++/README-first
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/demo.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/etip.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/internal.h
 %%NOWIDEC_EXAMPLESDIR%%/cardfile.c
 %%NOWIDEC_EXAMPLESDIR%%/cardfile.dat
 %%NOWIDEC_EXAMPLESDIR%%/ditto.c
 %%NOWIDEC_EXAMPLESDIR%%/dots.c
 %%NOWIDEC_EXAMPLESDIR%%/filter.c
 %%NOWIDEC_EXAMPLESDIR%%/firework.c
 %%NOWIDEC_EXAMPLESDIR%%/firstlast.c
 %%NOWIDEC_EXAMPLESDIR%%/gdc.6
 %%NOWIDEC_EXAMPLESDIR%%/gdc.c
 %%NOWIDEC_EXAMPLESDIR%%/hanoi.c
 %%NOWIDEC_EXAMPLESDIR%%/hashtest.c
 %%NOWIDEC_EXAMPLESDIR%%/knight.c
 %%NOWIDEC_EXAMPLESDIR%%/lrtest.c
 %%NOWIDEC_EXAMPLESDIR%%/ncurses.c
 %%NOWIDEC_EXAMPLESDIR%%/newdemo.c
 %%NOWIDEC_EXAMPLESDIR%%/railroad.c
 %%NOWIDEC_EXAMPLESDIR%%/rain.c
 %%NOWIDEC_EXAMPLESDIR%%/tclock.c
 %%NOWIDEC_EXAMPLESDIR%%/test.priv.h
 %%NOWIDEC_EXAMPLESDIR%%/testaddch.c
 %%NOWIDEC_EXAMPLESDIR%%/testcurs.c
 %%NOWIDEC_EXAMPLESDIR%%/testscanw.c
 %%NOWIDEC_EXAMPLESDIR%%/tracemunch
 %%NOWIDEC_EXAMPLESDIR%%/view.c
 %%NOWIDEC_EXAMPLESDIR%%/worm.c
 %%NOWIDEC_EXAMPLESDIR%%/xmas.c
+%%TERMINFO%%@exec find %D/share/misc -name "*.terminfo" -print0	| xargs -0 %D/bin/tic
 %%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%/c++
 %%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%
 @dirrm %%NOWIDEC_EXAMPLESDIR%%/c++
 @dirrm %%NOWIDEC_EXAMPLESDIR%%
 @dirrm %%EXAMPLESDIR%%
+%%TERMINFO%%@dirrmtry share/misc/tabset
 @dirrm include/ncurses

Property changes on: head/devel/ncurses/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/devel/ncurses-devel/Makefile
===================================================================
--- head/devel/ncurses-devel/Makefile	(revision 181465)
+++ head/devel/ncurses-devel/Makefile	(revision 181466)
@@ -1,144 +1,173 @@
 # New ports collection makefile for:	ncurses
 # Date created:				23 September 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ncurses
 PORTVERSION=	5.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rafan@FreeBSD.org
 COMMENT=	Library for terminal-independent, full-screen output
 
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../configure
 CONFIGURE_ARGS=	--datadir=${TARGETDIR}/share/misc --disable-overwrite \
-		--enable-termcap --disable-database --enable-getcap \
-		--enable-colorfgbg --enable-bsdpad --disable-home-terminfo \
+		--enable-termcap --enable-bsdpad --enable-getcap \
+		--enable-colorfgbg --disable-home-terminfo \
 		--includedir=${TARGETDIR}/include/ncurses \
-		--with-profile --with-shared --without-debug \
+		--with-shared \
 		--without-curses-h --with-termlib --program-prefix= \
-		--enable-safe-sprintf --disable-root-environ \
+		--enable-rpath --disable-root-environ \
 		--with-manpage-format=gzip --srcdir=../
 
 # needed by devel/py-ncurses port
 .if defined(WITH_TRACE)
 CONFIGURE_ARGS+=	--with-trace
 .endif
 
-LDFLAGS+=	-rpath ${TARGETDIR}/lib
+CONFIGURE_ENV=	gnat_exists="no"
 
-CONFIGURE_ENV=	gnat_exists="no" \
-		ac_cv_path_LDCONFIG="${LDCONFIG} -m ${TARGETDIR}/lib" \
-		LDFLAGS="${LDFLAGS}"
-
 USE_LDCONFIG=	yes
 NO_FILTER_SHLIBS=yes
 
 WIDEC_WRKSRC=	${WRKSRC}/build.widec
 NOWIDEC_WRKSRC=	${WRKSRC}/build.nowidec
 WIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/widec
 NOWIDEC_EXAMPLESDIR=	${EXAMPLESDIR}/nowidec
 EXAMPLES_TARGETS=	NOWIDEC
 
 CONFIGURE_WRKSRC=	${NOWIDEC_WRKSRC}
 BUILD_WRKSRC=	${NOWIDEC_WRKSRC}
 INSTALL_WRKSRC=	${NOWIDEC_WRKSRC}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \
 		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,}
 
 MANCOMPRESSED=	yes
 MAN1=	captoinfo.1m clear.1 infocmp.1m infotocap.1m reset.1 tack.1 \
 	tic.1m toe.1m tput.1 tset.1
 MAN5=	term.5 terminfo.5
 MAN7=	term.7
 
 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
 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
 
 .include <bsd.port.pre.mk>
 
 MAN3!=	${CAT} ${FILESDIR}/man3
 
-.if ${OSVERSION} >= 400000
-MANUAL_PACKAGE_BUILD=	conflicts with system ncurses
+.if ${OSVERSION} < 500000
+BROKEN=		does not compile
 .endif
 
 .if ${OSVERSION} < 503000
 WITHOUT_WIDEC=	yes
-PLIST_SUB+=	WIDEC="@comment "
+.endif
+
+.if !defined(WITHOUT_PROFILE) && !defined(NO_PROFILE) && !defined(NOPROFILE)
+CONFIGURE_ARGS+=--with-profile
+PLIST_SUB+=	PROFILE=""
 .else
+CONFIGURE_ARGS+=--without-profile
+PLIST_SUB+=	PROFILE="@comment "
+.endif
+
+.if !defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--without-debug
+PLIST_SUB+=	DEBUG="@comment "
+.else
+CONFIGURE_ARGS+=--with-debug
+PLIST_SUB+=	DEBUG=""
+.endif
+
+.if !defined(WITHOUT_TERMINFO)
+CONFIGURE_ARGS+=--with-hashed-db
+PLIST_SUB+=	TERMINFO=""
+.else # termcap only, easier for updating ncurses in base
+CONFIGURE_ARGS+=--disable-database
+PLIST_SUB+=	TERMINFO="@comment "
+.endif
+
+.if !defined(WITHOUT_WIDEC)
 PLIST_SUB+=	WIDEC=""
 EXAMPLES_TARGETS+=	WIDEC
+.else
+PLIST_SUB+=	WIDEC="@comment "
 .endif
 
 post-extract:
 	@${MKDIR} ${WIDEC_WRKSRC}
 	@${MKDIR} ${NOWIDEC_WRKSRC}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,$$(INSTALL_PROG) ncurses-config,@INSTALL_SCRIPT@ ncurses-config,' ${WRKSRC}/misc/Makefile.in
+
 post-configure:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} CONFIGURE_WRKSRC=${WIDEC_WRKSRC} \
 	    CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-widec" \
 	    do-configure
 .endif
 .for d in test c++
 .if !defined(WITHOUT_WIDEC)
 	${CP} ${WRKSRC}/${d}/* ${WIDEC_WRKSRC}/${d}/
 .endif
 	${CP} ${WRKSRC}/${d}/* ${NOWIDEC_WRKSRC}/${d}/
 .endfor
 
 post-build:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} BUILD_WRKSRC=${WIDEC_WRKSRC} do-build
 .endif
 
 post-install:
 .if !defined(WITHOUT_WIDEC)
 	${MAKE} INSTALL_WRKSRC=${WIDEC_WRKSRC} do-install
 .endif
 
-	${INSTALL_DATA} ${WRKSRC}/misc/terminfo.src \
-		${TARGETDIR}/share/misc/terminfo
-
 .for i in ${EXAMPLES_TARGETS}
 	${MKDIR} ${${i}_EXAMPLESDIR}/c++
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${${i}_WRKSRC}/test/${f} ${${i}_EXAMPLESDIR}
 .endfor
 	${INSTALL_SCRIPT} ${${i}_WRKSRC}/test/tracemunch ${${i}_EXAMPLESDIR}
 .for f in ${EXAMPLES_CPP}
 	${INSTALL_DATA} ${${i}_WRKSRC}/c++/${f} ${${i}_EXAMPLESDIR}/c++
 .endfor
 .endfor
+
+.if !defined(WITHOUT_TERMINFO)
+	${FIND} ${PREFIX}/share/misc -name "*.terminfo" -print0	|	\
+		${XARGS} -0 ${PREFIX}/bin/tic
+.endif
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 . for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 . endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/ncurses-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/devel/ncurses-devel/pkg-plist
===================================================================
--- head/devel/ncurses-devel/pkg-plist	(revision 181465)
+++ head/devel/ncurses-devel/pkg-plist	(revision 181466)
@@ -1,183 +1,205 @@
 bin/clear
 bin/infocmp
 bin/reset
 bin/tack
 bin/tput
 bin/tset
+%%TERMINFO%%bin/tic
+%%TERMINFO%%bin/toe
+%%TERMINFO%%bin/infotocap
+%%TERMINFO%%bin/captoinfo
+%%TERMINFO%%bin/ncurses5-config
+%%WIDEC%%%%TERMINFO%%bin/ncursesw5-config
 include/ncurses/cursesapp.h
 include/ncurses/cursesf.h
 include/ncurses/cursesm.h
 include/ncurses/cursesp.h
 include/ncurses/cursesw.h
 include/ncurses/cursslk.h
 include/ncurses/eti.h
 include/ncurses/etip.h
 include/ncurses/form.h
 include/ncurses/menu.h
 include/ncurses/ncurses.h
 include/ncurses/ncurses_dll.h
 include/ncurses/panel.h
 include/ncurses/term.h
 include/ncurses/termcap.h
 include/ncurses/unctrl.h
 lib/libform.a
 lib/libform.so
 lib/libform.so.5
 lib/libform.so.%%PORTVERSION%%
-lib/libform_p.a
+%%DEBUG%%lib/libform_g.a
+%%PROFILE%%lib/libform_p.a
 lib/libmenu.a
 lib/libmenu.so
 lib/libmenu.so.5
 lib/libmenu.so.%%PORTVERSION%%
-lib/libmenu_p.a
+%%DEBUG%%lib/libmenu_g.a
+%%PROFILE%%lib/libmenu_p.a
 lib/libncurses++.a
 lib/libncurses.a
 lib/libncurses.so
 lib/libncurses.so.5
 lib/libncurses.so.%%PORTVERSION%%
-lib/libncurses_p.a
+%%DEBUG%%lib/libncurses_g.a
+%%PROFILE%%lib/libncurses_p.a
 lib/libpanel.a
 lib/libpanel.so
 lib/libpanel.so.5
 lib/libpanel.so.%%PORTVERSION%%
-lib/libpanel_p.a
+%%DEBUG%%lib/libpanel_g.a
+%%PROFILE%%lib/libpanel_p.a
 lib/libtinfo.a
 lib/libtinfo.so
 lib/libtinfo.so.5
 lib/libtinfo.so.%%PORTVERSION%%
-lib/libtinfo_p.a
+%%DEBUG%%lib/libtinfo_g.a
+%%PROFILE%%lib/libtinfo_p.a
 %%WIDEC%%lib/libformw.a
 %%WIDEC%%lib/libformw.so
 %%WIDEC%%lib/libformw.so.5
 %%WIDEC%%lib/libformw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libformw_p.a
+%%WIDEC%%%%DEBUG%%lib/libformw_g.a
+%%WIDEC%%%%PROFILE%%lib/libformw_p.a
 %%WIDEC%%lib/libmenuw.a
 %%WIDEC%%lib/libmenuw.so
 %%WIDEC%%lib/libmenuw.so.5
 %%WIDEC%%lib/libmenuw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libmenuw_p.a
+%%WIDEC%%%%DEBUG%%lib/libmenuw_g.a
+%%WIDEC%%%%PROFILE%%lib/libmenuw_p.a
 %%WIDEC%%lib/libncurses++w.a
 %%WIDEC%%lib/libncursesw.a
 %%WIDEC%%lib/libncursesw.so
 %%WIDEC%%lib/libncursesw.so.5
 %%WIDEC%%lib/libncursesw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libncursesw_p.a
+%%WIDEC%%%%DEBUG%%lib/libncursesw_g.a
+%%WIDEC%%%%PROFILE%%lib/libncursesw_p.a
 %%WIDEC%%lib/libpanelw.a
 %%WIDEC%%lib/libpanelw.so
 %%WIDEC%%lib/libpanelw.so.5
 %%WIDEC%%lib/libpanelw.so.%%PORTVERSION%%
-%%WIDEC%%lib/libpanelw_p.a
+%%WIDEC%%%%DEBUG%%lib/libpanelw_g.a
+%%WIDEC%%%%PROFILE%%lib/libpanelw_p.a
 %%WIDEC%%lib/libtinfow.a
 %%WIDEC%%lib/libtinfow.so
 %%WIDEC%%lib/libtinfow.so.5
 %%WIDEC%%lib/libtinfow.so.%%PORTVERSION%%
-%%WIDEC%%lib/libtinfow_p.a
-share/misc/terminfo
+%%WIDEC%%%%DEBUG%%lib/libtinfow_g.a
+%%WIDEC%%%%PROFILE%%lib/libtinfow_p.a
+%%TERMINFO%%share/misc/tabset/std
+%%TERMINFO%%share/misc/tabset/stdcrt
+%%TERMINFO%%share/misc/tabset/vt100
+%%TERMINFO%%share/misc/tabset/vt300
+%%TERMINFO%%share/misc/terminfo.db
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/Makefile
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/README
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/blue.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.6
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/bs.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/Makefile
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/NEWS
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/PROBLEMS
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/README-first
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesapp.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesf.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesm.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesp.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursesw.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/cursslk.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/demo.cc
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/etip.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/c++/internal.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/cardfile.dat
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ditto.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/dots.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/filter.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firework.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/firstlast.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.6
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/gdc.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hanoi.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/hashtest.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/knight.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/lrtest.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/ncurses.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/newdemo.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/railroad.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/rain.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tclock.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/test.priv.h
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testaddch.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testcurs.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/testscanw.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/tracemunch
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/view.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/worm.c
 %%WIDEC%%%%WIDEC_EXAMPLESDIR%%/xmas.c
 %%NOWIDEC_EXAMPLESDIR%%/Makefile
 %%NOWIDEC_EXAMPLESDIR%%/README
 %%NOWIDEC_EXAMPLESDIR%%/blue.c
 %%NOWIDEC_EXAMPLESDIR%%/bs.6
 %%NOWIDEC_EXAMPLESDIR%%/bs.c
 %%NOWIDEC_EXAMPLESDIR%%/c++/Makefile
 %%NOWIDEC_EXAMPLESDIR%%/c++/NEWS
 %%NOWIDEC_EXAMPLESDIR%%/c++/PROBLEMS
 %%NOWIDEC_EXAMPLESDIR%%/c++/README-first
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesapp.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesf.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesm.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesmain.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesp.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursesw.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/cursslk.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/demo.cc
 %%NOWIDEC_EXAMPLESDIR%%/c++/etip.h
 %%NOWIDEC_EXAMPLESDIR%%/c++/internal.h
 %%NOWIDEC_EXAMPLESDIR%%/cardfile.c
 %%NOWIDEC_EXAMPLESDIR%%/cardfile.dat
 %%NOWIDEC_EXAMPLESDIR%%/ditto.c
 %%NOWIDEC_EXAMPLESDIR%%/dots.c
 %%NOWIDEC_EXAMPLESDIR%%/filter.c
 %%NOWIDEC_EXAMPLESDIR%%/firework.c
 %%NOWIDEC_EXAMPLESDIR%%/firstlast.c
 %%NOWIDEC_EXAMPLESDIR%%/gdc.6
 %%NOWIDEC_EXAMPLESDIR%%/gdc.c
 %%NOWIDEC_EXAMPLESDIR%%/hanoi.c
 %%NOWIDEC_EXAMPLESDIR%%/hashtest.c
 %%NOWIDEC_EXAMPLESDIR%%/knight.c
 %%NOWIDEC_EXAMPLESDIR%%/lrtest.c
 %%NOWIDEC_EXAMPLESDIR%%/ncurses.c
 %%NOWIDEC_EXAMPLESDIR%%/newdemo.c
 %%NOWIDEC_EXAMPLESDIR%%/railroad.c
 %%NOWIDEC_EXAMPLESDIR%%/rain.c
 %%NOWIDEC_EXAMPLESDIR%%/tclock.c
 %%NOWIDEC_EXAMPLESDIR%%/test.priv.h
 %%NOWIDEC_EXAMPLESDIR%%/testaddch.c
 %%NOWIDEC_EXAMPLESDIR%%/testcurs.c
 %%NOWIDEC_EXAMPLESDIR%%/testscanw.c
 %%NOWIDEC_EXAMPLESDIR%%/tracemunch
 %%NOWIDEC_EXAMPLESDIR%%/view.c
 %%NOWIDEC_EXAMPLESDIR%%/worm.c
 %%NOWIDEC_EXAMPLESDIR%%/xmas.c
+%%TERMINFO%%@exec find %D/share/misc -name "*.terminfo" -print0	| xargs -0 %D/bin/tic
 %%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%/c++
 %%WIDEC%%@dirrm %%WIDEC_EXAMPLESDIR%%
 @dirrm %%NOWIDEC_EXAMPLESDIR%%/c++
 @dirrm %%NOWIDEC_EXAMPLESDIR%%
 @dirrm %%EXAMPLESDIR%%
+%%TERMINFO%%@dirrmtry share/misc/tabset
 @dirrm include/ncurses

Property changes on: head/devel/ncurses-devel/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property