4 files changed, 117 insertions, 68 deletions

diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 216bfbff48b6..045ece82dac1 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	iwidgets
-PORTVERSION=	3.0.0
-CATEGORIES=	x11-toolkits tk82
-MASTER_SITES=	ftp://ftp.tcltk.com/pub/itcl/
-DISTNAME=	itcl3.0.1
+PORTVERSION=	3.2
+CATEGORIES=	x11-toolkits tk83
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=incrtcl
+DISTNAME=	itcl3.2
 
-MAINTAINER=	dmlb@ragnet.demon.co.uk
+MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		itcl30.1:${PORTSDIR}/lang/itcl \
-		itk30.1:${PORTSDIR}/x11-toolkits/itk
+LIB_DEPENDS=	itk32.1:${PORTSDIR}/x11-toolkits/itk
 
-WRKSRC=		${WRKDIR}/itcl3.0.1/iwidgets3.0.0/unix
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2 --with-itk=${PREFIX}/lib/itk3.0
-CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - ./itcl3.2/iwidgets\*
+NO_BUILD=	yes
 
 MANN=		buttonbox.n calendar.n canvasprintbox.n canvasprintdialog.n \
 		checkbox.n combobox.n dateentry.n datefield.n dialog.n \
@@ -36,4 +33,19 @@ MANN=		buttonbox.n calendar.n canvasprintbox.n canvasprintdialog.n \
 		spinint.n spinner.n spintime.n tabnotebook.n tabset.n \
 		timeentry.n timefield.n toolbar.n watch.n
 
+# Install both versions of iwidgets, but only the
+# latest version of man-pages:
+do-install:
+.for d in iwidgets3.0.0 iwidgets2.2.0
+	${MKDIR} ${PREFIX}/lib/$d/scripts/ ${PREFIX}/lib/$d/demos/images/
+	${INSTALL_DATA} ${WRKSRC}/$d/generic/* ${PREFIX}/lib/$d/scripts/
+	${INSTALL_DATA} ${WRKSRC}/$d/*.tcl ${PREFIX}/lib/$d/
+# Everything, but the html:
+	${INSTALL_DATA} `${GREP} -Fl 'package require' ${WRKSRC}/$d/demos/*` \
+		${WRKSRC}/$d/demos/*.* ${PREFIX}/lib/$d/demos/
+	${INSTALL_DATA} ${WRKSRC}/$d/demos/images/* \
+		${PREFIX}/lib/$d/demos/images/
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/iwidgets3.0.0/doc/*.n ${PREFIX}/man/mann/
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/iwidgets/distinfo b/x11-toolkits/iwidgets/distinfo
index 882cd787f4df..03382bd74335 100644
--- a/x11-toolkits/iwidgets/distinfo
+++ b/x11-toolkits/iwidgets/distinfo
@@ -1 +1 @@
-MD5 (itcl3.0.1.tar.gz) = 0cf1802a7ea69670503dc69c7951a015
+MD5 (itcl3.2.tar.gz) = b41ed909969eaa5f0a06ab698393760f
diff --git a/x11-toolkits/iwidgets/pkg-descr b/x11-toolkits/iwidgets/pkg-descr
index ba9ae7271549..8be623af6f59 100644
--- a/x11-toolkits/iwidgets/pkg-descr
+++ b/x11-toolkits/iwidgets/pkg-descr
@@ -1,3 +1,6 @@
-This package contains [incr Widgets] version 3.0.0.  [incr Widgets] is
-a companion to [incr Tk] and provides a widget set, with many improved
-widgets.  The [incr Widgets] collection is also known as ``iwidgets''.
+This  package contains  [incr Widgets]  version 3.0.0  and 2.2.0.  [incr
+Widgets] is  a companion to  [incr Tk] and  provides a widget  set, with
+many improved  widgets. The [incr  Widgets] collection is also  known as
+``iwidgets''.
+
+WWW:	http://sourceforge.net/projects/incrtcl/
diff --git a/x11-toolkits/iwidgets/pkg-plist b/x11-toolkits/iwidgets/pkg-plist
index 3f04ce1d59b5..1b9162aba80e 100644
--- a/x11-toolkits/iwidgets/pkg-plist
+++ b/x11-toolkits/iwidgets/pkg-plist
@@ -32,6 +32,7 @@ lib/iwidgets3.0.0/scripts/promptdialog.itk
 lib/iwidgets3.0.0/scripts/pushbutton.itk
 lib/iwidgets3.0.0/scripts/radiobox.itk
 lib/iwidgets3.0.0/scripts/regexpfield.itk
+lib/iwidgets3.0.0/scripts/scopedobject.tcl
 lib/iwidgets3.0.0/scripts/scrolledcanvas.itk
 lib/iwidgets3.0.0/scripts/scrolledframe.itk
 lib/iwidgets3.0.0/scripts/scrolledhtml.itk
@@ -79,57 +80,6 @@ lib/iwidgets3.0.0/demos/images/ruler.gif
 lib/iwidgets3.0.0/demos/images/save.gif
 lib/iwidgets3.0.0/demos/images/select.gif
 lib/iwidgets3.0.0/demos/images/text.xbm
-lib/iwidgets3.0.0/demos/html/buttonbox.n.html
-lib/iwidgets3.0.0/demos/html/calendar.n.html
-lib/iwidgets3.0.0/demos/html/canvasprintbox.n.html
-lib/iwidgets3.0.0/demos/html/canvasprintdialog.n.html
-lib/iwidgets3.0.0/demos/html/checkbox.n.html
-lib/iwidgets3.0.0/demos/html/combobox.n.html
-lib/iwidgets3.0.0/demos/html/dateentry.n.html
-lib/iwidgets3.0.0/demos/html/datefield.n.html
-lib/iwidgets3.0.0/demos/html/dialog.n.html
-lib/iwidgets3.0.0/demos/html/dialogshell.n.html
-lib/iwidgets3.0.0/demos/html/disjointlistbox.n.html
-lib/iwidgets3.0.0/demos/html/entryfield.n.html
-lib/iwidgets3.0.0/demos/html/extfileselectionbox.n.html
-lib/iwidgets3.0.0/demos/html/extfileselectiondialog.n.html
-lib/iwidgets3.0.0/demos/html/feedback.n.html
-lib/iwidgets3.0.0/demos/html/fileselectionbox.n.html
-lib/iwidgets3.0.0/demos/html/fileselectiondialog.n.html
-lib/iwidgets3.0.0/demos/html/finddialog.n.html
-lib/iwidgets3.0.0/demos/html/hierarchy.n.html
-lib/iwidgets3.0.0/demos/html/hyperhelp.n.html
-lib/iwidgets3.0.0/demos/html/labeledframe.n.html
-lib/iwidgets3.0.0/demos/html/labeledwidget.n.html
-lib/iwidgets3.0.0/demos/html/mainwindow.n.html
-lib/iwidgets3.0.0/demos/html/menubar.n.html
-lib/iwidgets3.0.0/demos/html/messagebox.n.html
-lib/iwidgets3.0.0/demos/html/messagedialog.n.html
-lib/iwidgets3.0.0/demos/html/notebook.n.html
-lib/iwidgets3.0.0/demos/html/optionmenu.n.html
-lib/iwidgets3.0.0/demos/html/panedwindow.n.html
-lib/iwidgets3.0.0/demos/html/promptdialog.n.html
-lib/iwidgets3.0.0/demos/html/pushbutton.n.html
-lib/iwidgets3.0.0/demos/html/radiobox.n.html
-lib/iwidgets3.0.0/demos/html/scopedobject.n.html
-lib/iwidgets3.0.0/demos/html/scrolledcanvas.n.html
-lib/iwidgets3.0.0/demos/html/scrolledframe.n.html
-lib/iwidgets3.0.0/demos/html/scrolledhtml.n.html
-lib/iwidgets3.0.0/demos/html/scrolledlistbox.n.html
-lib/iwidgets3.0.0/demos/html/scrolledtext.n.html
-lib/iwidgets3.0.0/demos/html/selectionbox.n.html
-lib/iwidgets3.0.0/demos/html/selectiondialog.n.html
-lib/iwidgets3.0.0/demos/html/shell.n.html
-lib/iwidgets3.0.0/demos/html/spindate.n.html
-lib/iwidgets3.0.0/demos/html/spinint.n.html
-lib/iwidgets3.0.0/demos/html/spinner.n.html
-lib/iwidgets3.0.0/demos/html/spintime.n.html
-lib/iwidgets3.0.0/demos/html/tabnotebook.n.html
-lib/iwidgets3.0.0/demos/html/tabset.n.html
-lib/iwidgets3.0.0/demos/html/timeentry.n.html
-lib/iwidgets3.0.0/demos/html/timefield.n.html
-lib/iwidgets3.0.0/demos/html/toolbar.n.html
-lib/iwidgets3.0.0/demos/html/watch.n.html
 lib/iwidgets3.0.0/demos/buttonbox
 lib/iwidgets3.0.0/demos/calendar
 lib/iwidgets3.0.0/demos/canvasprintbox
@@ -186,6 +136,90 @@ lib/iwidgets3.0.0/demos/toolbar
 lib/iwidgets3.0.0/demos/watch
 @dirrm lib/iwidgets3.0.0/scripts
 @dirrm lib/iwidgets3.0.0/demos/images
-@dirrm lib/iwidgets3.0.0/demos/html
 @dirrm lib/iwidgets3.0.0/demos
 @dirrm lib/iwidgets3.0.0
+lib/iwidgets2.2.0/demos/dialogshell
+lib/iwidgets2.2.0/demos/buttonbox
+lib/iwidgets2.2.0/demos/catalog
+lib/iwidgets2.2.0/demos/dialog
+lib/iwidgets2.2.0/demos/canvasprintdialog
+lib/iwidgets2.2.0/demos/combobox
+lib/iwidgets2.2.0/demos/demo.html
+lib/iwidgets2.2.0/demos/iwidgets.gif
+lib/iwidgets2.2.0/demos/entryfield
+lib/iwidgets2.2.0/demos/feedback
+lib/iwidgets2.2.0/demos/fileselectiondialog
+lib/iwidgets2.2.0/demos/fileselectionbox
+lib/iwidgets2.2.0/demos/hyperhelp
+lib/iwidgets2.2.0/demos/scrolledcanvas
+lib/iwidgets2.2.0/demos/labeledwidget
+lib/iwidgets2.2.0/demos/menubar
+lib/iwidgets2.2.0/demos/messagedialog
+lib/iwidgets2.2.0/demos/notebook
+lib/iwidgets2.2.0/demos/optionmenu
+lib/iwidgets2.2.0/demos/panedwindow
+lib/iwidgets2.2.0/demos/promptdialog
+lib/iwidgets2.2.0/demos/pushbutton
+lib/iwidgets2.2.0/demos/spinint
+lib/iwidgets2.2.0/demos/radiobox
+lib/iwidgets2.2.0/demos/scrolledlistbox
+lib/iwidgets2.2.0/demos/scrolledframe
+lib/iwidgets2.2.0/demos/scrolledhtml
+lib/iwidgets2.2.0/demos/selectiondialog
+lib/iwidgets2.2.0/demos/scrolledtext
+lib/iwidgets2.2.0/demos/selectionbox
+lib/iwidgets2.2.0/demos/tabnotebook
+lib/iwidgets2.2.0/demos/spindate
+lib/iwidgets2.2.0/demos/spinner
+lib/iwidgets2.2.0/demos/spintime
+lib/iwidgets2.2.0/demos/toolbar
+lib/iwidgets2.2.0/demos/tabset
+lib/iwidgets2.2.0/demos/images/mag.gif
+lib/iwidgets2.2.0/demos/images/poly.gif
+lib/iwidgets2.2.0/demos/images/ruler.gif
+lib/iwidgets2.2.0/demos/images/select.gif
+lib/iwidgets2.2.0/pkgIndex.tcl
+lib/iwidgets2.2.0/iwidgets.tcl
+lib/iwidgets2.2.0/scripts/canvasprintbox.itk
+lib/iwidgets2.2.0/scripts/buttonbox.itk
+lib/iwidgets2.2.0/scripts/fileselectiondialog.itk
+lib/iwidgets2.2.0/scripts/canvasprintdialog.itk
+lib/iwidgets2.2.0/scripts/colors.itk
+lib/iwidgets2.2.0/scripts/combobox.itk
+lib/iwidgets2.2.0/scripts/dialog.itk
+lib/iwidgets2.2.0/scripts/dialogshell.itk
+lib/iwidgets2.2.0/scripts/entryfield.itk
+lib/iwidgets2.2.0/scripts/feedback.itk
+lib/iwidgets2.2.0/scripts/fileselectionbox.itk
+lib/iwidgets2.2.0/scripts/labeledwidget.itk
+lib/iwidgets2.2.0/scripts/hyperhelp.itk
+lib/iwidgets2.2.0/scripts/messagedialog.itk
+lib/iwidgets2.2.0/scripts/menubar.itk
+lib/iwidgets2.2.0/scripts/panedwindow.itk
+lib/iwidgets2.2.0/scripts/notebook.itk
+lib/iwidgets2.2.0/scripts/optionmenu.itk
+lib/iwidgets2.2.0/scripts/pane.itk
+lib/iwidgets2.2.0/scripts/scrolledlistbox.itk
+lib/iwidgets2.2.0/scripts/promptdialog.itk
+lib/iwidgets2.2.0/scripts/pushbutton.itk
+lib/iwidgets2.2.0/scripts/radiobox.itk
+lib/iwidgets2.2.0/scripts/scrolledcanvas.itk
+lib/iwidgets2.2.0/scripts/scrolledframe.itk
+lib/iwidgets2.2.0/scripts/scrolledhtml.itk
+lib/iwidgets2.2.0/scripts/selectiondialog.itk
+lib/iwidgets2.2.0/scripts/scrolledtext.itk
+lib/iwidgets2.2.0/scripts/selectionbox.itk
+lib/iwidgets2.2.0/scripts/spindate.itk
+lib/iwidgets2.2.0/scripts/shell.itk
+lib/iwidgets2.2.0/scripts/tabnotebook.itk
+lib/iwidgets2.2.0/scripts/spinint.itk
+lib/iwidgets2.2.0/scripts/spinner.itk
+lib/iwidgets2.2.0/scripts/spintime.itk
+lib/iwidgets2.2.0/scripts/toolbar.itk
+lib/iwidgets2.2.0/scripts/tabset.itk
+lib/iwidgets2.2.0/scripts/tclIndex
+lib/iwidgets2.2.0/scripts/unknownimage.gif
+@dirrm lib/iwidgets2.2.0/scripts
+@dirrm lib/iwidgets2.2.0/demos/images
+@dirrm lib/iwidgets2.2.0/demos
+@dirrm lib/iwidgets2.2.0