1 files changed, 46 insertions, 37 deletions

diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index ea60aa091b03..7054b60f3fd3 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -1,52 +1,61 @@
-# New ports collection makefile for:	itk
-# Date created:		Aug 17 1996
-# Whom:			chuckr
+# New ports collection makefile for:    itk
+# Date created:         Aug 17 1996
+# Whom:                 chuckr
 #
 # $FreeBSD$
 #
 
 PORTNAME=	iwidgets
-PORTVERSION=	3.2
-CATEGORIES=	x11-toolkits tk83
+PORTVERSION=	4.0.1
+CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
-DISTNAME=	itcl3.2
+DISTNAME=	iwidgets${PORTVERSION}
+DISTFILES=	itcl3.2.1_src.tgz ${PORTNAME}${PORTVERSION}.tar.gz
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	[incr Widgets] (A.K.A. "iwidgets")
+MAINTAINER=	pauls@utdallas.edu
+COMMENT=	Iwidgets - [incr Widgets]
 
-LIB_DEPENDS=	itk32.1:${PORTSDIR}/x11-toolkits/itk
+LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
+		tk84:${PORTSDIR}/x11-toolkits/tk84 \
+		itk32.1:${PORTSDIR}/x11-toolkits/itk
 
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - ./itcl3.2/iwidgets\*
 NO_BUILD=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+		--with-tk=${LOCALBASE}/lib/tk8.4 \
+		--with-itcl=${WRKDIR}/itcl3.2.1
+SUB_LIST=	IWIDGETS=${DISTNAME}
+SUB_FILES=	pkg-message
+PLIST_SUB=	IWIDGETS=${DISTNAME}
 
-MANN=		buttonbox.n calendar.n canvasprintbox.n canvasprintdialog.n \
-		checkbox.n combobox.n dateentry.n datefield.n dialog.n \
-		dialogshell.n disjointlistbox.n entryfield.n \
-		extfileselectionbox.n extfileselectiondialog.n feedback.n \
-		fileselectionbox.n fileselectiondialog.n finddialog.n \
-		hierarchy.n hyperhelp.n labeledframe.n labeledwidget.n \
-		mainwindow.n menubar.n messagebox.n messagedialog.n \
-		notebook.n optionmenu.n panedwindow.n promptdialog.n \
-		pushbutton.n radiobox.n scopedobject.n scrolledcanvas.n \
-		scrolledframe.n scrolledhtml.n shell.n scrolledlistbox.n \
-		scrolledtext.n selectionbox.n selectiondialog.n spindate.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/
+PORTDOCS=	CHANGES ChangeLog README iwidgets.ps
+
+MANN=	iwidgets_buttonbox.n iwidgets_calendar.n iwidgets_canvasprintbox.n iwidgets_canvasprintdialog.n \
+	iwidgets_checkbox.n iwidgets_combobox.n iwidgets_dateentry.n iwidgets_datefield.n iwidgets_dialog.n \
+	iwidgets_dialogshell.n iwidgets_disjointlistbox.n iwidgets_entryfield.n iwidgets_extbutton.n \
+	iwidgets_extfileselectionbox.n iwidgets_extfileselectiondialog.n iwidgets_feedback.n \
+	iwidgets_fileselectionbox.n iwidgets_fileselectiondialog.n iwidgets_finddialog.n iwidgets_hierarchy.n \
+	iwidgets_hyperhelp.n iwidgets_labeledframe.n iwidgets_labeledwidget.n iwidgets_mainwindow.n \
+	iwidgets_menubar.n iwidgets_messagebox.n iwidgets_messagedialog.n iwidgets_notebook.n \
+	iwidgets_optionmenu.n iwidgets_panedwindow.n iwidgets_promptdialog.n iwidgets_pushbutton.n \
+	iwidgets_radiobox.n iwidgets_scopedobject.n iwidgets_scrolledcanvas.n iwidgets_scrolledframe.n \
+	iwidgets_scrolledhtml.n iwidgets_scrolledlistbox.n iwidgets_scrolledtext.n iwidgets_selectionbox.n \
+	iwidgets_selectiondialog.n iwidgets_shell.n iwidgets_spindate.n iwidgets_spinint.n iwidgets_spinner.n \
+	iwidgets_spintime.n iwidgets_tabnotebook.n iwidgets_tabset.n iwidgets_timeentry.n iwidgets_timefield.n \
+	iwidgets_toolbar.n iwidgets_watch.n
+
+post-install:
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/iwidgets.ps ${DOCSDIR}
+.for f in CHANGES ChangeLog README
+	${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/iwidgets3.0.0/doc/*.n ${PREFIX}/man/mann/
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>