2 files changed, 61 insertions, 21 deletions

diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index c2f75f8e5a10..98dd76b0c9ef 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	iwidgets${PORTVERSION}
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Iwidgets - [incr Widgets]
 
-LIB_DEPENDS=	itk:${PORTSDIR}/x11-toolkits/itk
+LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
 
 NO_BUILD=	yes
 HAS_CONFIGURE=	yes
@@ -23,23 +23,11 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 SUB_LIST=	IWIDGETS=${DISTNAME}
 SUB_FILES=	pkg-message
 PLIST_SUB=	IWIDGETS=${DISTNAME}
-NO_STAGE=	yes
+MAKE_ARGS+=	INSTALL_ROOT=${STAGEDIR}
 
 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
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's,^MKINSTALLDIRS =.*,MKINSTALLDIRS=${MKDIR},' \
@@ -50,14 +38,14 @@ post-patch:
 		-e 's,@ITCL_VERSION@,3.3,g' ${WRKSRC}/Makefile.in
 
 post-install:
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/iwidgets.ps ${DOCSDIR}
+	${RM} -f ${STAGEDIR}${PREFIX}/lib/iwidgets
+	${LN} -s ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/iwidgets
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/iwidgets.ps ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES ChangeLog README
-	${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/iwidgets/pkg-plist b/x11-toolkits/iwidgets/pkg-plist
index 8e14a21eb7f2..24ae71b3e69d 100644
--- a/x11-toolkits/iwidgets/pkg-plist
+++ b/x11-toolkits/iwidgets/pkg-plist
@@ -190,6 +190,58 @@ lib/%%IWIDGETS%%/scripts/toolbar.itk
 lib/%%IWIDGETS%%/scripts/unknownimage.gif
 lib/%%IWIDGETS%%/scripts/watch.itk
 lib/iwidgets
+man/mann/iwidgets_buttonbox.n.gz
+man/mann/iwidgets_calendar.n.gz
+man/mann/iwidgets_canvasprintbox.n.gz
+man/mann/iwidgets_canvasprintdialog.n.gz
+man/mann/iwidgets_checkbox.n.gz
+man/mann/iwidgets_combobox.n.gz
+man/mann/iwidgets_dateentry.n.gz
+man/mann/iwidgets_datefield.n.gz
+man/mann/iwidgets_dialog.n.gz
+man/mann/iwidgets_dialogshell.n.gz
+man/mann/iwidgets_disjointlistbox.n.gz
+man/mann/iwidgets_entryfield.n.gz
+man/mann/iwidgets_extbutton.n.gz
+man/mann/iwidgets_extfileselectionbox.n.gz
+man/mann/iwidgets_extfileselectiondialog.n.gz
+man/mann/iwidgets_feedback.n.gz
+man/mann/iwidgets_fileselectionbox.n.gz
+man/mann/iwidgets_fileselectiondialog.n.gz
+man/mann/iwidgets_finddialog.n.gz
+man/mann/iwidgets_hierarchy.n.gz
+man/mann/iwidgets_hyperhelp.n.gz
+man/mann/iwidgets_labeledframe.n.gz
+man/mann/iwidgets_labeledwidget.n.gz
+man/mann/iwidgets_mainwindow.n.gz
+man/mann/iwidgets_menubar.n.gz
+man/mann/iwidgets_messagebox.n.gz
+man/mann/iwidgets_messagedialog.n.gz
+man/mann/iwidgets_notebook.n.gz
+man/mann/iwidgets_optionmenu.n.gz
+man/mann/iwidgets_panedwindow.n.gz
+man/mann/iwidgets_promptdialog.n.gz
+man/mann/iwidgets_pushbutton.n.gz
+man/mann/iwidgets_radiobox.n.gz
+man/mann/iwidgets_scopedobject.n.gz
+man/mann/iwidgets_scrolledcanvas.n.gz
+man/mann/iwidgets_scrolledframe.n.gz
+man/mann/iwidgets_scrolledhtml.n.gz
+man/mann/iwidgets_scrolledlistbox.n.gz
+man/mann/iwidgets_scrolledtext.n.gz
+man/mann/iwidgets_selectionbox.n.gz
+man/mann/iwidgets_selectiondialog.n.gz
+man/mann/iwidgets_shell.n.gz
+man/mann/iwidgets_spindate.n.gz
+man/mann/iwidgets_spinint.n.gz
+man/mann/iwidgets_spinner.n.gz
+man/mann/iwidgets_spintime.n.gz
+man/mann/iwidgets_tabnotebook.n.gz
+man/mann/iwidgets_tabset.n.gz
+man/mann/iwidgets_timeentry.n.gz
+man/mann/iwidgets_timefield.n.gz
+man/mann/iwidgets_toolbar.n.gz
+man/mann/iwidgets_watch.n.gz
 @dirrm lib/%%IWIDGETS%%/scripts
 @dirrm lib/%%IWIDGETS%%/demos/images
 @dirrm lib/%%IWIDGETS%%/demos/html