- Update to 5.6 snapshot 20070623

- Respect NOPORTEXAMPLES
- Use PORTEXAMPLES to make pkg-plist smaller
- Some style changes

3 files changed, 40 insertions, 116 deletions

diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile
index fae09729689d..ed022ae58fff 100644
--- a/devel/ncurses-devel/Makefile
+++ b/devel/ncurses-devel/Makefile
@@ -25,7 +25,8 @@ CONFLICTS=	ncurses-[0-9]*
 
 PATCHES=	20061223 20061230 20070106 20070113 20070120 20070127 20070128 \
 		20070203 20070210 20070217 20070224 20070303 20070310 20070311 \
-		20070317 20070324 20070331 20070407 20070414
+		20070317 20070324 20070331 20070407 20070414 20070421 20070428 \
+		20070505 20070512 20070526 20070602 20070609 20070612 20070623
 
 RELEASE=	5.6
 
@@ -69,6 +70,7 @@ PLIST_SUB+=	PORTVERSION=${RELEASE} \
 		NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,}
 
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
 DOCS=	ANNOUNCE INSTALL NEWS README TO-DO doc/html/announce.html \
 	doc/hackguide.doc doc/html/hackguide.html \
@@ -139,9 +141,9 @@ post-configure:
 	    do-configure
 .endif
 .for d in test c++
-.if !defined(WITHOUT_WIDEC)
+. if !defined(WITHOUT_WIDEC)
 	${CP} ${WRKSRC}/${d}/* ${WIDEC_WRKSRC}/${d}/
-.endif
+. endif
 	${CP} ${WRKSRC}/${d}/* ${NOWIDEC_WRKSRC}/${d}/
 .endfor
 
@@ -155,16 +157,18 @@ post-install:
 	${MAKE} INSTALL_WRKSRC=${WIDEC_WRKSRC} do-install
 .endif
 
-.for i in ${EXAMPLES_TARGETS}
+.if !defined(NOPORTEXAMPLES)
+. for i in ${EXAMPLES_TARGETS}
 	${MKDIR} ${${i}_EXAMPLESDIR}/c++
-.for f in ${EXAMPLES}
+.  for f in ${EXAMPLES}
 	${INSTALL_DATA} ${${i}_WRKSRC}/test/${f} ${${i}_EXAMPLESDIR}
-.endfor
+.  endfor
 	${INSTALL_SCRIPT} ${${i}_WRKSRC}/test/tracemunch ${${i}_EXAMPLESDIR}
-.for f in ${EXAMPLES_CPP}
+.  for f in ${EXAMPLES_CPP}
 	${INSTALL_DATA} ${${i}_WRKSRC}/c++/${f} ${${i}_EXAMPLESDIR}/c++
-.endfor
-.endfor
+.  endfor
+. endfor
+.endif
 
 .if !defined(WITHOUT_TERMINFO)
 	${FIND} ${PREFIX}/share/misc -name "*.terminfo" -print0	|	\
diff --git a/devel/ncurses-devel/distinfo b/devel/ncurses-devel/distinfo
index b61ebd1f0525..367474647cad 100644
--- a/devel/ncurses-devel/distinfo
+++ b/devel/ncurses-devel/distinfo
@@ -58,3 +58,30 @@ SIZE (ncurses/ncurses-5.6-20070407.patch.gz) = 17132
 MD5 (ncurses/ncurses-5.6-20070414.patch.gz) = a7c45c4168114b1b6d38ab0483f632d0
 SHA256 (ncurses/ncurses-5.6-20070414.patch.gz) = 3fa9cb93b6526569daa75444aff4607c768699d0068906102af80e8ab6cab604
 SIZE (ncurses/ncurses-5.6-20070414.patch.gz) = 4251
+MD5 (ncurses/ncurses-5.6-20070421.patch.gz) = a2d1811774cd8a6961e7622800e19a48
+SHA256 (ncurses/ncurses-5.6-20070421.patch.gz) = 18a36750d05c0f92971d13c4fcdd8b49e5e229c73197c63dba0bcbbe501b86fd
+SIZE (ncurses/ncurses-5.6-20070421.patch.gz) = 34518
+MD5 (ncurses/ncurses-5.6-20070428.patch.gz) = d04b5b3308fecbfbde377a516482030f
+SHA256 (ncurses/ncurses-5.6-20070428.patch.gz) = ba3633854515eba62d4f0c6615762b590b50014896a3b3f2f07d708eb7cfbf74
+SIZE (ncurses/ncurses-5.6-20070428.patch.gz) = 45165
+MD5 (ncurses/ncurses-5.6-20070505.patch.gz) = a78cdbba64f79a9bb0308d841d69186d
+SHA256 (ncurses/ncurses-5.6-20070505.patch.gz) = 054e74cfbd87abab0c96fbfaa01d2bc2da7aa4904d3a3ebf2c90d18adee6a63e
+SIZE (ncurses/ncurses-5.6-20070505.patch.gz) = 78985
+MD5 (ncurses/ncurses-5.6-20070512.patch.gz) = ebff82d723b5f54eb6d70b11a8c31007
+SHA256 (ncurses/ncurses-5.6-20070512.patch.gz) = 181e14316c28d6eb79e33f37d7fac3fcd527311523790dd7f4ecde431895a969
+SIZE (ncurses/ncurses-5.6-20070512.patch.gz) = 9421
+MD5 (ncurses/ncurses-5.6-20070526.patch.gz) = 4463da0d0a679f53cd2d65dc9d8fdab9
+SHA256 (ncurses/ncurses-5.6-20070526.patch.gz) = ecb507bf0990c2fa570a9cc0db4a5ff60e68f44f9d20354f4103b6efc22aa525
+SIZE (ncurses/ncurses-5.6-20070526.patch.gz) = 6548
+MD5 (ncurses/ncurses-5.6-20070602.patch.gz) = 469110380c4b936f632ec47258431b28
+SHA256 (ncurses/ncurses-5.6-20070602.patch.gz) = 8e6e47d21271085c617ff78ec3148d464b4a3e8e7920c9f6aa0b300cd1412e8b
+SIZE (ncurses/ncurses-5.6-20070602.patch.gz) = 46143
+MD5 (ncurses/ncurses-5.6-20070609.patch.gz) = 5a1c49a175c217c5026f94b335392e5e
+SHA256 (ncurses/ncurses-5.6-20070609.patch.gz) = 966e804832299cb89c9817cff9e2ec32a6ea6752290a3334ac13e7e497054a1d
+SIZE (ncurses/ncurses-5.6-20070609.patch.gz) = 28739
+MD5 (ncurses/ncurses-5.6-20070612.patch.gz) = 86dc837b0958e1c8dc3638278a4699af
+SHA256 (ncurses/ncurses-5.6-20070612.patch.gz) = f65285241157ff9370ca3eae0009fdedc4e04198bde7d0fc5d7cbac05e2f769d
+SIZE (ncurses/ncurses-5.6-20070612.patch.gz) = 5321
+MD5 (ncurses/ncurses-5.6-20070623.patch.gz) = fb9e6f253fbf166867e17c27b81dca1d
+SHA256 (ncurses/ncurses-5.6-20070623.patch.gz) = 4b71ddaf6288739138bb23e6c17ab170473ca49cc7c5a94c2c8ee224486710ee
+SIZE (ncurses/ncurses-5.6-20070623.patch.gz) = 8076
diff --git a/devel/ncurses-devel/pkg-plist b/devel/ncurses-devel/pkg-plist
index c51c2bfe2248..e1a5cff692a5 100644
--- a/devel/ncurses-devel/pkg-plist
+++ b/devel/ncurses-devel/pkg-plist
@@ -96,113 +96,6 @@ lib/libtinfo.so.%%PORTVERSION%%
 %%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