- Fix pkg-plist if manpages/demos are to be installed

3 files changed, 48 insertions, 44 deletions

diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index be67f327aaad..b20f698fad26 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -78,7 +78,7 @@ MAN1=	tclsh.1
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
-	ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
+	ChnlStack.3 Class.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \
 	CrtCloseHdlr.3 	CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \
 	CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \
 	DetachPids.3 DictObj.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 \
@@ -86,30 +86,32 @@ MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	ExprLong.3 ExprLongObj.3 FileSystem.3 FindExec.3 GetCwd.3 \
 	GetHostName.3 GetIndex.3 GetInt.3 GetTime.3 GetOpnFl.3 GetStdChan.3 \
 	GetVersion.3 Hash.3 Init.3 InitStubs.3 IntObj.3 Interp.3 Limit.3 \
-	LinkVar.3 ListObj.3 Namespace.3 Notifier.3 Object.3 ObjectType.3 \
-	OpenFileChnl.3 OpenTcp.3 Panic.3 ParseCmd.3 PkgRequire.3 Preserve.3 \
-	PrintDbl.3 RecEvalObj.3 RecordEval.3 RegConfig.3 RegExp.3 SaveResult.3 \
-	SetChanErr.3 SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Signal.3 \
-	Sleep.3 SourceRCFile.3 SplitList.3 SplitPath.3 StdChannels.3 \
-	StaticPkg.3 StrMatch.3 StringObj.3 SubstObj.3 TCL_MEM_DEBUG.3 \
-	Tcl_Main.3 Thread.3 ToUpper.3 TraceCmd.3 TraceVar.3 Translate.3 \
-	UniCharIsAlpha.3 UpVar.3 Utf.3 WrongNumArgs.3
+	LinkVar.3 ListObj.3 Method.3 Namespace.3 Notifier.3 NRE.3 Object.3 \
+	ObjectType.3 OpenFileChnl.3 OpenTcp.3 Panic.3 ParseArgs.3 ParseCmd.3 \
+	PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 \
+	RegConfig.3 RegExp.3 SaveResult.3 SetChanErr.3 SetErrno.3 SetRecLmt.3 \
+	SetResult.3 SetVar.3 Signal.3 Sleep.3 SourceRCFile.3 SplitList.3 \
+	SplitPath.3 StdChannels.3 StaticPkg.3 StrMatch.3 StringObj.3 \
+	SubstObj.3 TCL_MEM_DEBUG.3 Tcl_Main.3 TclZlib.3 Thread.3 ToUpper.3 \
+	TraceCmd.3 TraceVar.3 Translate.3 UniCharIsAlpha.3 UpVar.3 Utf.3 \
+	WrongNumArgs.3
 
 MANN=	Tcl.n after.n append.n apply.n array.n bgerror.n binary.n break.n \
-	case.n catch.n cd.n chan.n clock.n close.n concat.n continue.n dde.n \
-	dict.n encoding.n eof.n error.n eval.n exec.n exit.n expr.n fblocked.n \
-	fconfigure.n fcopy.n file.n fileevent.n filename.n flush.n for.n \
-	foreach.n format.n gets.n glob.n global.n history.n http.n if.n incr.n \
-	info.n interp.n join.n lappend.n lassign.n library.n lindex.n \
-	linsert.n list.n llength.n load.n lrange.n lrepeat.n lreplace.n \
-	lreverse.n lsearch.n lset.n lsort.n mathfunc.n mathop.n memory.n \
-	msgcat.n namespace.n open.n package.n packagens.n pid.n pkgMkIndex.n \
-	platform.n platform_shell.n proc.n puts.n pwd.n re_syntax.n read.n \
-	refchan.n regexp.n registry.n regsub.n rename.n \
-	return.n safe.n scan.n seek.n set.n socket.n source.n split.n string.n \
-	subst.n switch.n tcltest.n tclvars.n tell.n time.n tm.n trace.n \
-	unknown.n unload.n unset.n update.n uplevel.n upvar.n variable.n vwait.n \
-	while.n
+	case.n catch.n cd.n chan.n class.n clock.n close.n concat.n continue.n \
+	copy.n dde.n define.n dict.n encoding.n eof.n error.n eval.n exec.n \
+	exit.n expr.n fblocked.n fconfigure.n fcopy.n file.n fileevent.n \
+	filename.n flush.n for.n foreach.n format.n gets.n glob.n global.n \
+	history.n http.n if.n incr.n info.n interp.n join.n lappend.n \
+	lassign.n library.n lindex.n linsert.n list.n llength.n load.n \
+	lrange.n lrepeat.n lreplace.n lreverse.n lsearch.n lset.n lsort.n \
+	mathfunc.n mathop.n memory.n msgcat.n my.n namespace.n next.n object.n \
+	open.n package.n packagens.n pid.n pkgMkIndex.n platform.n \
+	platform_shell.n prefix.n proc.n puts.n pwd.n re_syntax.n read.n \
+	refchan.n regexp.n registry.n regsub.n rename.n return.n safe.n scan.n \
+	seek.n self.n set.n socket.n source.n split.n string.n subst.n \
+	switch.n tcltest.n tclvars.n tell.n throw.n time.n tm.n trace.n \
+	transchan.n try.n unknown.n unload.n unset.n update.n uplevel.n \
+	upvar.n variable.n vwait.n while.n zlib.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $3,$4,"\\"}' unix/mkLinks
 MLINKS=	Access.3 Tcl_Access.3 \
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 1b955d597031..0bfec0d0b2ce 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -87,10 +87,10 @@ PLIST_SUB+=	INSTMAN=''
 MAN1=	wish.1
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
-	CoordToWin.3 CrtCmHdlr.3 CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 \
-	CrtItemType.3 CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 \
-	DrawFocHlt.3 EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 \
-	GetAnchor.3 GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 \
+	CoordToWin.3 CrtConsoleChan.3 CrtCmHdlr.3 CrtErrHdlr.3 CrtGenHdlr.3 \
+	CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 CrtSelHdlr.3 CrtWindow.3 \
+	DeleteImg.3 DrawFocHlt.3 EventHndlr.3 FindPhoto.3 FontId.3 FreeXId.3 \
+	GeomReq.3 GetAnchor.3 GetBitmap.3 GetCapStyl.3 GetClrmap.3 GetColor.3 \
 	GetCursor.3 GetDash.3 GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.3 \
 	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
 	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
@@ -103,20 +103,21 @@ MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	Tk_Init.3 Tk_Main.3 TkInitStubs.3 WindowId.3 ttk_Geometry.3 \
 	ttk_Theme.3
 
-MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
-	chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
-	cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \
-	font.n frame.n getOpenFile.n grab.n grid.n keysyms.n image.n label.n \
-	labelframe.n listbox.n loadTk.n lower.n menu.n menubar.n menubutton.n \
-	message.n messageBox.n option.n optionMenu.n options.n pack-old.n \
-	pack.n panedwindow.n palette.n photo.n place.n popup.n radiobutton.n \
-	raise.n scale.n scrollbar.n selection.n send.n spinbox.n text.n tk.n \
-	tkerror.n tkvars.n tkwait.n toplevel.n winfo.n wm.n \
-	ttk_button.n ttk_checkbutton.n ttk_combobox.n ttk_entry.n ttk_frame.n \
-	ttk_image.n ttk_intro.n ttk_label.n ttk_labelframe.n ttk_menubutton.n \
-	ttk_notebook.n ttk_panedwindow.n ttk_progressbar.n ttk_radiobutton.n \
-	ttk_scrollbar.n ttk_separator.n ttk_sizegrip.n ttk_style.n \
-	ttk_treeview.n ttk_widget.n
+MANN=	bell.n bind.n bindtags.n bitmap.n button.n busy.n canvas.n \
+	checkbutton.n chooseColor.n chooseDirectory.n clipboard.n colors.n \
+	console.n cursors.n destroy.n dialog.n entry.n event.n focus.n \
+	focusNext.n font.n fontchooser.n frame.n getOpenFile.n grab.n grid.n \
+	keysyms.n image.n label.n labelframe.n listbox.n loadTk.n lower.n \
+	menu.n menubar.n menubutton.n message.n messageBox.n option.n \
+	optionMenu.n options.n pack-old.n pack.n panedwindow.n palette.n \
+	photo.n place.n popup.n radiobutton.n raise.n scale.n scrollbar.n \
+	selection.n send.n spinbox.n text.n tk.n tkerror.n tkvars.n tkwait.n \
+	toplevel.n winfo.n wm.n ttk_button.n ttk_checkbutton.n ttk_combobox.n \
+	ttk_entry.n ttk_frame.n ttk_image.n ttk_intro.n ttk_label.n \
+	ttk_labelframe.n ttk_menubutton.n ttk_notebook.n ttk_panedwindow.n \
+	ttk_progressbar.n ttk_radiobutton.n ttk_scrollbar.n ttk_separator.n \
+	ttk_scale.n ttk_sizegrip.n ttk_spinbox.n ttk_style.n ttk_treeview.n \
+	ttk_vsapi.n ttk_widget.n
 
 # MLINKS generated via  awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
 MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
@@ -427,9 +428,9 @@ post-patch:
 .endif
 
 post-configure:
-	${REINPLACE_CMD} \
-		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
-		${WRKSRC}/tkConfig.sh
+#	${REINPLACE_CMD} \
+#		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
+#		${WRKSRC}/tkConfig.sh
 	${REINPLACE_CMD} -e 's|-Wl,--rpath -Wl,/usr/local/lib||g' ${WRKSRC}/Makefile
 
 .if defined(BUILDING_TK_THREADS)
diff --git a/x11-toolkits/tk86/pkg-plist b/x11-toolkits/tk86/pkg-plist
index 5539b76f583e..8ed069120bdd 100644
--- a/x11-toolkits/tk86/pkg-plist
+++ b/x11-toolkits/tk86/pkg-plist
@@ -64,6 +64,7 @@ lib/tk%%TK_VER%%/console.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/entry3.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/filebox.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/floor.tcl
+%%DEMOS%%lib/tk%%TK_VER%%/demos/fontchoose.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/form.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/goldberg.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/hello