3 files changed, 125 insertions, 181 deletions

diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index de50f605b177..3895101b6262 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -5,81 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bwidget
-PORTVERSION=		1.3.1
-CATEGORIES=		x11-toolkits
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+PORTNAME=	bwidget
+PORTVERSION=	1.4.1
+CATEGORIES=	x11-toolkits
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcllib
-DISTNAME=		BWidget-${PORTVERSION}
+DISTNAME=	BWidget-${PORTVERSION}
 
-MAINTAINER=		ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.ORG
 
-NO_BUILD=		yes
-PLIST_SUB+=		PORTVERSION=${PORTVERSION}
-
-BWIDGET_SOURCES = \
-	arrow.tcl \
-	bitmap.tcl \
-	button.tcl \
-	buttonbox.tcl \
-	color.tcl \
-	combobox.tcl \
-	dialog.tcl \
-	dragsite.tcl \
-	dropsite.tcl \
-	dynhelp.tcl \
-	entry.tcl \
-	font.tcl \
-	init.tcl \
-	label.tcl \
-	labelentry.tcl \
-	labelframe.tcl \
-	listbox.tcl \
-	mainframe.tcl \
-	messagedlg.tcl \
-	notebook.tcl \
-	pagesmgr.tcl \
-	panedw.tcl \
-	passwddlg.tcl \
-	pkgIndex.tcl \
-	progressbar.tcl \
-	progressdlg.tcl \
-	scrollframe.tcl \
-	scrollview.tcl \
-	scrollw.tcl \
-	separator.tcl \
-	spinbox.tcl \
-	titleframe.tcl \
-	tree.tcl \
-	utils.tcl \
-	widget.tcl \
-	xpm2image.tcl
-
-PKGLIBDIR = ${PREFIX}/lib/${PORTNAME}${PORTVERSION}
-DOCDIR =    ${PREFIX}/share/doc/${PORTNAME}${PORTVERSION}
+NO_BUILD=	yes
 
 do-install:
-	@${ECHO_MSG} "Installing script files in $(PKGLIBDIR)"
-	@$(MKDIR) $(PKGLIBDIR)
-	@for i in $(BWIDGET_SOURCES) ; do \
-	    $(INSTALL_DATA) $(WRKSRC)/$$i $(PKGLIBDIR) ; \
-	done;
-	@${ECHO_MSG} "Installing language files in $(PKGLIBDIR)/lang"
-	@$(MKDIR) $(PKGLIBDIR)/lang
-	@for i in $(WRKSRC)/lang/*.rc ; do \
-	    $(INSTALL_DATA) $$i $(PKGLIBDIR)/lang ; \
-	done;
-	@${ECHO_MSG} "Installing image files in $(PKGLIBDIR)/images"
-	@$(MKDIR) $(PKGLIBDIR)/images
-	@for i in $(WRKSRC)/images/*.gif $(WRKSRC)/images/*.xbm ; do \
-	    $(INSTALL_DATA) $$i $(PKGLIBDIR)/images ; \
-	done;
+	@$(MKDIR) ${PREFIX}/lib/bwidget
+	${INSTALL_DATA} ${WRKSRC}/*.tcl ${PREFIX}/lib/bwidget
+	${CP} -R ${WRKSRC}/lang ${PREFIX}/lib/bwidget
+	${CP} -R ${WRKSRC}/images ${PREFIX}/lib/bwidget
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "Installing html documentation in $(DOCDIR)"
-	@$(MKDIR) $(DOCDIR)
-	@for i in $(WRKSRC)/BWman/*.html $(WRKSRC)/BWman/*.htm ; do \
-	    $(INSTALL_DATA) $$i $(DOCDIR) ; \
-	done;
+	@$(MKDIR) $(DOCSDIR)
+	${INSTALL_DATA} ${WRKSRC}/BWman/*.htm* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/bwidget/distinfo b/x11-toolkits/bwidget/distinfo
index 877c22eb4ced..516ead203532 100644
--- a/x11-toolkits/bwidget/distinfo
+++ b/x11-toolkits/bwidget/distinfo
@@ -1 +1 @@
-MD5 (BWidget-1.3.1.tar.gz) = 4f1e1d068a4e9619a20c33fcae3ce920
+MD5 (BWidget-1.4.1.tar.gz) = 4cdff468030e56f592f9a2852f417b8c
diff --git a/x11-toolkits/bwidget/pkg-plist b/x11-toolkits/bwidget/pkg-plist
index 1ae53c4df8df..fa9a954add35 100644
--- a/x11-toolkits/bwidget/pkg-plist
+++ b/x11-toolkits/bwidget/pkg-plist
@@ -1,111 +1,111 @@
-lib/bwidget%%PORTVERSION%%/arrow.tcl
-lib/bwidget%%PORTVERSION%%/bitmap.tcl
-lib/bwidget%%PORTVERSION%%/button.tcl
-lib/bwidget%%PORTVERSION%%/buttonbox.tcl
-lib/bwidget%%PORTVERSION%%/color.tcl
-lib/bwidget%%PORTVERSION%%/combobox.tcl
-lib/bwidget%%PORTVERSION%%/dialog.tcl
-lib/bwidget%%PORTVERSION%%/dragsite.tcl
-lib/bwidget%%PORTVERSION%%/dropsite.tcl
-lib/bwidget%%PORTVERSION%%/dynhelp.tcl
-lib/bwidget%%PORTVERSION%%/entry.tcl
-lib/bwidget%%PORTVERSION%%/font.tcl
-lib/bwidget%%PORTVERSION%%/images/bold.gif
-lib/bwidget%%PORTVERSION%%/images/copy.gif
-lib/bwidget%%PORTVERSION%%/images/cut.gif
-lib/bwidget%%PORTVERSION%%/images/dragfile.gif
-lib/bwidget%%PORTVERSION%%/images/dragicon.gif
-lib/bwidget%%PORTVERSION%%/images/error.gif
-lib/bwidget%%PORTVERSION%%/images/file.gif
-lib/bwidget%%PORTVERSION%%/images/folder.gif
-lib/bwidget%%PORTVERSION%%/images/hourglass.gif
-lib/bwidget%%PORTVERSION%%/images/info.gif
-lib/bwidget%%PORTVERSION%%/images/italic.gif
-lib/bwidget%%PORTVERSION%%/images/minus.xbm
-lib/bwidget%%PORTVERSION%%/images/new.gif
-lib/bwidget%%PORTVERSION%%/images/opcopy.xbm
-lib/bwidget%%PORTVERSION%%/images/open.gif
-lib/bwidget%%PORTVERSION%%/images/openfold.gif
-lib/bwidget%%PORTVERSION%%/images/oplink.xbm
-lib/bwidget%%PORTVERSION%%/images/opmove.xbm
-lib/bwidget%%PORTVERSION%%/images/overstrike.gif
-lib/bwidget%%PORTVERSION%%/images/palette.gif
-lib/bwidget%%PORTVERSION%%/images/passwd.gif
-lib/bwidget%%PORTVERSION%%/images/paste.gif
-lib/bwidget%%PORTVERSION%%/images/plus.xbm
-lib/bwidget%%PORTVERSION%%/images/print.gif
-lib/bwidget%%PORTVERSION%%/images/question.gif
-lib/bwidget%%PORTVERSION%%/images/redo.gif
-lib/bwidget%%PORTVERSION%%/images/save.gif
-lib/bwidget%%PORTVERSION%%/images/target.xbm
-lib/bwidget%%PORTVERSION%%/images/underline.gif
-lib/bwidget%%PORTVERSION%%/images/undo.gif
-lib/bwidget%%PORTVERSION%%/images/warning.gif
-lib/bwidget%%PORTVERSION%%/init.tcl
-lib/bwidget%%PORTVERSION%%/label.tcl
-lib/bwidget%%PORTVERSION%%/labelentry.tcl
-lib/bwidget%%PORTVERSION%%/labelframe.tcl
-lib/bwidget%%PORTVERSION%%/lang/de.rc
-lib/bwidget%%PORTVERSION%%/lang/en.rc
-lib/bwidget%%PORTVERSION%%/lang/es.rc
-lib/bwidget%%PORTVERSION%%/lang/fr.rc
-lib/bwidget%%PORTVERSION%%/listbox.tcl
-lib/bwidget%%PORTVERSION%%/mainframe.tcl
-lib/bwidget%%PORTVERSION%%/messagedlg.tcl
-lib/bwidget%%PORTVERSION%%/notebook.tcl
-lib/bwidget%%PORTVERSION%%/pagesmgr.tcl
-lib/bwidget%%PORTVERSION%%/panedw.tcl
-lib/bwidget%%PORTVERSION%%/passwddlg.tcl
-lib/bwidget%%PORTVERSION%%/progressbar.tcl
-lib/bwidget%%PORTVERSION%%/progressdlg.tcl
-lib/bwidget%%PORTVERSION%%/scrollframe.tcl
-lib/bwidget%%PORTVERSION%%/scrollview.tcl
-lib/bwidget%%PORTVERSION%%/scrollw.tcl
-lib/bwidget%%PORTVERSION%%/separator.tcl
-lib/bwidget%%PORTVERSION%%/spinbox.tcl
-lib/bwidget%%PORTVERSION%%/titleframe.tcl
-lib/bwidget%%PORTVERSION%%/tree.tcl
-lib/bwidget%%PORTVERSION%%/utils.tcl
-lib/bwidget%%PORTVERSION%%/widget.tcl
-lib/bwidget%%PORTVERSION%%/xpm2image.tcl
-lib/bwidget%%PORTVERSION%%/pkgIndex.tcl
-@dirrm lib/bwidget%%PORTVERSION%%/images
-@dirrm lib/bwidget%%PORTVERSION%%/lang
-@dirrm lib/bwidget%%PORTVERSION%%
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ArrowButton.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/BWidget.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Button.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ButtonBox.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ComboBox.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Dialog.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/DragSite.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/DropSite.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/DynamicHelp.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Entry.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Label.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/LabelEntry.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/LabelFrame.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ListBox.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/MainFrame.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/MessageDlg.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/NoteBook.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/PagesManager.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/PanedWindow.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/PasswdDlg.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ProgressBar.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ProgressDlg.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ScrollView.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ScrollableFrame.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/ScrolledWindow.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/SelectColor.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/SelectFont.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Separator.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/SpinBox.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/TitleFrame.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Tree.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/Widget.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/contents.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/index.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/navtree.html
-%%PORTDOCS%%share/doc/bwidget%%PORTVERSION%%/options.htm
-%%PORTDOCS%%@dirrm share/doc/bwidget%%PORTVERSION%%
+lib/bwidget/arrow.tcl
+lib/bwidget/bitmap.tcl
+lib/bwidget/button.tcl
+lib/bwidget/buttonbox.tcl
+lib/bwidget/color.tcl
+lib/bwidget/combobox.tcl
+lib/bwidget/dialog.tcl
+lib/bwidget/dragsite.tcl
+lib/bwidget/dropsite.tcl
+lib/bwidget/dynhelp.tcl
+lib/bwidget/entry.tcl
+lib/bwidget/font.tcl
+lib/bwidget/images/bold.gif
+lib/bwidget/images/copy.gif
+lib/bwidget/images/cut.gif
+lib/bwidget/images/dragfile.gif
+lib/bwidget/images/dragicon.gif
+lib/bwidget/images/error.gif
+lib/bwidget/images/file.gif
+lib/bwidget/images/folder.gif
+lib/bwidget/images/hourglass.gif
+lib/bwidget/images/info.gif
+lib/bwidget/images/italic.gif
+lib/bwidget/images/minus.xbm
+lib/bwidget/images/new.gif
+lib/bwidget/images/opcopy.xbm
+lib/bwidget/images/open.gif
+lib/bwidget/images/openfold.gif
+lib/bwidget/images/oplink.xbm
+lib/bwidget/images/opmove.xbm
+lib/bwidget/images/overstrike.gif
+lib/bwidget/images/palette.gif
+lib/bwidget/images/passwd.gif
+lib/bwidget/images/paste.gif
+lib/bwidget/images/plus.xbm
+lib/bwidget/images/print.gif
+lib/bwidget/images/question.gif
+lib/bwidget/images/redo.gif
+lib/bwidget/images/save.gif
+lib/bwidget/images/target.xbm
+lib/bwidget/images/underline.gif
+lib/bwidget/images/undo.gif
+lib/bwidget/images/warning.gif
+lib/bwidget/init.tcl
+lib/bwidget/label.tcl
+lib/bwidget/labelentry.tcl
+lib/bwidget/labelframe.tcl
+lib/bwidget/lang/de.rc
+lib/bwidget/lang/en.rc
+lib/bwidget/lang/es.rc
+lib/bwidget/lang/fr.rc
+lib/bwidget/listbox.tcl
+lib/bwidget/mainframe.tcl
+lib/bwidget/messagedlg.tcl
+lib/bwidget/notebook.tcl
+lib/bwidget/pagesmgr.tcl
+lib/bwidget/panedw.tcl
+lib/bwidget/passwddlg.tcl
+lib/bwidget/pkgIndex.tcl
+lib/bwidget/progressbar.tcl
+lib/bwidget/progressdlg.tcl
+lib/bwidget/scrollframe.tcl
+lib/bwidget/scrollview.tcl
+lib/bwidget/scrollw.tcl
+lib/bwidget/separator.tcl
+lib/bwidget/spinbox.tcl
+lib/bwidget/titleframe.tcl
+lib/bwidget/tree.tcl
+lib/bwidget/utils.tcl
+lib/bwidget/widget.tcl
+lib/bwidget/xpm2image.tcl
+@dirrm lib/bwidget/images
+@dirrm lib/bwidget/lang
+@dirrm lib/bwidget
+%%PORTDOCS%%%%DOCSDIR%%/ArrowButton.html
+%%PORTDOCS%%%%DOCSDIR%%/BWidget.html
+%%PORTDOCS%%%%DOCSDIR%%/Button.html
+%%PORTDOCS%%%%DOCSDIR%%/ButtonBox.html
+%%PORTDOCS%%%%DOCSDIR%%/ComboBox.html
+%%PORTDOCS%%%%DOCSDIR%%/Dialog.html
+%%PORTDOCS%%%%DOCSDIR%%/DragSite.html
+%%PORTDOCS%%%%DOCSDIR%%/DropSite.html
+%%PORTDOCS%%%%DOCSDIR%%/DynamicHelp.html
+%%PORTDOCS%%%%DOCSDIR%%/Entry.html
+%%PORTDOCS%%%%DOCSDIR%%/Label.html
+%%PORTDOCS%%%%DOCSDIR%%/LabelEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/LabelFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/ListBox.html
+%%PORTDOCS%%%%DOCSDIR%%/MainFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/MessageDlg.html
+%%PORTDOCS%%%%DOCSDIR%%/NoteBook.html
+%%PORTDOCS%%%%DOCSDIR%%/PagesManager.html
+%%PORTDOCS%%%%DOCSDIR%%/PanedWindow.html
+%%PORTDOCS%%%%DOCSDIR%%/PasswdDlg.html
+%%PORTDOCS%%%%DOCSDIR%%/ProgressBar.html
+%%PORTDOCS%%%%DOCSDIR%%/ProgressDlg.html
+%%PORTDOCS%%%%DOCSDIR%%/ScrollView.html
+%%PORTDOCS%%%%DOCSDIR%%/ScrollableFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/ScrolledWindow.html
+%%PORTDOCS%%%%DOCSDIR%%/SelectColor.html
+%%PORTDOCS%%%%DOCSDIR%%/SelectFont.html
+%%PORTDOCS%%%%DOCSDIR%%/Separator.html
+%%PORTDOCS%%%%DOCSDIR%%/SpinBox.html
+%%PORTDOCS%%%%DOCSDIR%%/TitleFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/Tree.html
+%%PORTDOCS%%%%DOCSDIR%%/Widget.html
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/navtree.html
+%%PORTDOCS%%%%DOCSDIR%%/options.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%