- Convert to USES+=tk

- Convert to OPTIONSng (DOCS, EXAMPLES)
- STAGE-clean

2 files changed, 26 insertions, 99 deletions

diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index 436e94565269..245fd4010200 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -8,18 +8,24 @@ CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.6.1.a1
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Application Development Environment For the TCL/TK language
+COMMENT=	Application Development Environment for Tcl/Tk
 
 LICENSE=	GPLv2
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 NO_BUILD=	yes
 
-USE_TK=		yes
+USES+=		tk:84
 USE_DOS2UNIX=	configure
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${PREFIX}
 
-NO_STAGE=	yes
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|wish8.5|${WISH:T}| ; \
@@ -28,28 +34,28 @@ post-patch:
 		's|require -exact Tk|require Tk|' ${WRKSRC}/lib/tkcon.tcl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/lib/vtcl
+	${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vtcl
 .for data in ChangeLog README vtcl.tcl
-	${INSTALL_DATA} ${WRKSRC}/${data} ${PREFIX}/lib/vtcl
+	${INSTALL_DATA} ${WRKSRC}/${data} ${STAGEDIR}${PREFIX}/lib/vtcl
 .endfor
-	@${MKDIR} ${PREFIX}/lib/vtcl/images
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vtcl/images
 .for sufx in gif ppm xbm xpm
-	${INSTALL_DATA} ${WRKSRC}/images/*.${sufx} ${PREFIX}/lib/vtcl/images
+	${INSTALL_DATA} ${WRKSRC}/images/*.${sufx} ${STAGEDIR}${PREFIX}/lib/vtcl/images
 .endfor
-	@${MKDIR} ${PREFIX}/lib/vtcl/images/edit
-	${INSTALL_DATA} ${WRKSRC}/images/edit/*.gif ${PREFIX}/lib/vtcl/images/edit
-	@${MKDIR} ${PREFIX}/lib/vtcl/lib
-	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${PREFIX}/lib/vtcl/lib)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vtcl/images/edit
+	${INSTALL_DATA} ${WRKSRC}/images/edit/*.gif ${STAGEDIR}${PREFIX}/lib/vtcl/images/edit
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vtcl/lib
+	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/vtcl/lib)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/sample
-	@(cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/sample)
-	@${MKDIR} ${EXAMPLESDIR}/demo
-	@(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/demo)
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample
+	@(cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/sample)
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/demo
+	@(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/demo)
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/vtcl/pkg-plist b/devel/vtcl/pkg-plist
index e3ccba82d761..5399857c8b77 100644
--- a/devel/vtcl/pkg-plist
+++ b/devel/vtcl/pkg-plist
@@ -368,85 +368,6 @@ lib/vtcl/lib/var.tcl
 lib/vtcl/lib/vtclib.tcl
 lib/vtcl/lib/widget.tcl
 lib/vtcl/vtcl.tcl
-%%PORTDOCS%%%%DOCSDIR%%/combobox.html
-%%PORTDOCS%%%%DOCSDIR%%/mclistbox.html
-%%PORTDOCS%%%%DOCSDIR%%/progressbar.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/about.ttd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/bitmapbutton_test.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/bitmapbutton_compound.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/combo.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/draw.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/ex1_cmpd.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/grid.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/images/free.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/images/line.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/images/oval.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/images/rect.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/megawidget.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/simple.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tclet-combo.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tclet-draw.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tclet-grid.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tclet-simple.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tclets.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/test_megawidget.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/button.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/canvas.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/check_and_radio.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/compound_container.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/compound_container_2.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/entry.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/frame.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/horizontal_panedwindow.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/label.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/labelframe.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/listbox.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/menubutton.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/message.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/modal.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/ok.gif
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/scales.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/scrollbar.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/simple_topevel.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/simple_topevel_menubar.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/spinbox.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/text.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/unmanaged_frame.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/core/vertical_panedwindow.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview/databaseview_compound.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview/databaseview_project.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview/databaseview_test.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview/readme.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview/test.mk
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/imagelist/imagelist.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/imagelist/imagelist_project.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/imagelist/imagelist_test.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/imagelist/readme.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/listviewer/listviewer_compound.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/listviewer/listviewer_project.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/tutorial/megawidgets/listviewer/listviewer_test.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/visual-text.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo/visual-text.ttd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/User_Compound.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/hierarchy.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/notebook.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/notebook_recurse.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/panedwindow.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample/sampleBLT.tcl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sample
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial/megawidgets/listviewer
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial/megawidgets/imagelist
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial/megawidgets/databaseview
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial/megawidgets
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial/core
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/tutorial
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/vtcl/lib/ttd
 @dirrm lib/vtcl/lib/bwidget/lang
 @dirrm lib/vtcl/lib/bwidget/images