Now with regression test + patch (attached).

Index: x11/bwidget/Makefile
===================================================================
RCS file: /cvs/ports/x11/bwidget/Makefile,v
retrieving revision 1.4
diff -N -u -p x11/bwidget/Makefile
--- x11/bwidget/Makefile        11 Mar 2009 21:40:01 -0000      1.4
+++ x11/bwidget/Makefile        12 Oct 2009 14:59:17 -0000
@@ -1,38 +1,52 @@
 # $OpenBSD: Makefile,v 1.4 2009/03/11 21:40:01 sthen Exp $

-PKG_ARCH=      *
+COMMENT =              high-level widget set for Tcl/Tk

-COMMENT=       high-level widget set for Tcl/Tk
+DISTNAME =             BWidget-1.9.0
+PKGNAME =              bwidget-1.9.0
+CATEGORIES =           x11
+HOMEPAGE =             http://sourceforge.net/projects/tcllib/
+MAINTAINER =           Stuart Cassoff <s...@users.sourceforge.net>

-V=             1.8.0
-DISTNAME=      BWidget-$V
-PKGNAME=       bwidget-$Vp1
-CATEGORIES=    x11
-
-HOMEPAGE=      http://sourceforge.net/projects/tcllib/
-
 # BSD style
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes

-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcllib/}
+MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=tcllib/}
+MODULES =              x11/tk
+RUN_DEPENDS =          ${MODTK_RUN_DEPENDS}
+REGRESS_FLAGS +=       TCLLIBPATH="${WRKSRC}"
+REGRESS_IS_INTERACTIVE =x11
+NO_BUILD =             Yes
+PKG_ARCH =             *

-MODULES=       x11/tk
+BW_LIB_DIR =           ${PREFIX}/lib/bwidget
+BW_DOC_DIR =           ${PREFIX}/share/doc/bwidget
+BW_EXA_DIR =           ${PREFIX}/share/examples/bwidget

-RUN_DEPENDS=   ${MODTK_RUN_DEPENDS}
+do-configure:
+       @${MODTCL_WISH_ADJ} ${WRKSRC}/demo/demo.tcl
+
+do-regress:
+       @env -i ${MAKE_ENV} ${ALL_REGRESS_FLAGS} \
+               ${MODTCL_BIN} ${WRKSRC}/tests/entry.test

-NO_BUILD=      Yes
-NO_REGRESS=    Yes
-
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/bwidget
-       cd ${WRKSRC} && tar cf - * | tar -C ${PREFIX}/lib/bwidget -xf -
-       cd ${PREFIX}/lib/bwidget && rm -rf BWman *.txt ChangeLog
-       chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/bwidget
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bwidget
-       ${INSTALL_DATA} ${WRKSRC}/BWman/* ${WRKSRC}/README.txt \
-               ${PREFIX}/share/doc/bwidget
+.for SRC GLOB DEST in \
+               .       *.tcl           ${BW_LIB_DIR}           \
+               lang    *.rc            ${BW_LIB_DIR}/lang      \
+               images  *.gif           ${BW_LIB_DIR}/images    \
+               images  *.xbm           ${BW_LIB_DIR}/images    \
+               BWman   *.htm*          ${BW_DOC_DIR}           \
+               .       README.txt      ${BW_DOC_DIR}           \
+               .       LICENSE.txt     ${BW_DOC_DIR}           \
+               demo    *.tcl           ${BW_EXA_DIR}           \
+               demo    *.xbm           ${BW_EXA_DIR}
+       ${INSTALL_DATA_DIR} ${DEST}
+       ${INSTALL_DATA} ${WRKSRC}/${SRC}/${GLOB} ${DEST}
+.endfor
+       chmod 555 ${BW_EXA_DIR}/demo.tcl

 .include <bsd.port.mk>
Index: x11/bwidget/distinfo
===================================================================
RCS file: /cvs/ports/x11/bwidget/distinfo,v
retrieving revision 1.1.1.1
diff -N -u -p x11/bwidget/distinfo
--- x11/bwidget/distinfo        22 Oct 2007 19:09:55 -0000      1.1.1.1
+++ x11/bwidget/distinfo        12 Oct 2009 14:59:17 -0000
@@ -1,5 +1,5 @@
-MD5 (BWidget-1.8.0.tar.gz) = vFkJicrlOanHj9o04S4nfg==
-RMD160 (BWidget-1.8.0.tar.gz) = sn++xuC9J80uW1ZB+ij9dQGYUGA=
-SHA1 (BWidget-1.8.0.tar.gz) = spdur6UD523sy7RWDfPR75a7g+A=
-SHA256 (BWidget-1.8.0.tar.gz) =
AJQDmklecGmcRMnjwn4xxmY0R6rlgaQ1CgQIIbqgZ+M=
-SIZE (BWidget-1.8.0.tar.gz) = 218530
+MD5 (BWidget-1.9.0.tar.gz) = 1NMfAnnIewJKo/kAqMv1SQ==
+RMD160 (BWidget-1.9.0.tar.gz) = 5Lub0ntm34SafRW5UQuAN02lNC0=
+SHA1 (BWidget-1.9.0.tar.gz) = wgfX+KDpgW6GE1JkHcxoGFQAOrQ=
+SHA256 (BWidget-1.9.0.tar.gz) =
MTXRx0hJTCpwmj9ktWackZat5+nQYtk3AwkhT1MsY34=
+SIZE (BWidget-1.9.0.tar.gz) = 228171
? x11/bwidget/patches
Index: x11/bwidget/pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/bwidget/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -N -u -p x11/bwidget/pkg/DESCR
--- x11/bwidget/pkg/DESCR       22 Oct 2007 19:09:55 -0000      1.1.1.1
+++ x11/bwidget/pkg/DESCR       12 Oct 2009 14:59:17 -0000
@@ -1,7 +1,3 @@
-The BWidget toolkit is a high-level widget set for Tcl/Tk built using
-native Tcl/Tk 8.x namespaces.
-
-The BWidgets have a professional look and feel as in other well known
-Toolkits (Tix or Incr Widgets), but the concept is radically different
-because everything is pure Tcl/Tk. No platform dependencies, and no
-compiling required. The code is 100% Pure Tcl/Tk.
+The BWidgets have a professional look and feel as in other well known
+Toolkits, but the concept is radically different because everything is
+pure Tcl/Tk.  No platform dependencies, and no compiling required.
Index: x11/bwidget/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/bwidget/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -N -u -p x11/bwidget/pkg/PLIST
--- x11/bwidget/pkg/PLIST       22 Oct 2007 19:09:55 -0000      1.1.1.1
+++ x11/bwidget/pkg/PLIST       12 Oct 2009 14:59:17 -0000
@@ -6,16 +6,6 @@ lib/bwidget/button.tcl
 lib/bwidget/buttonbox.tcl
 lib/bwidget/color.tcl
 lib/bwidget/combobox.tcl
-lib/bwidget/demo/
-lib/bwidget/demo/basic.tcl
-lib/bwidget/demo/bwidget.xbm
-lib/bwidget/demo/demo.tcl
-lib/bwidget/demo/dnd.tcl
-lib/bwidget/demo/manager.tcl
-lib/bwidget/demo/select.tcl
-lib/bwidget/demo/tmpldlg.tcl
-lib/bwidget/demo/tree.tcl
-lib/bwidget/demo/x1.xbm
 lib/bwidget/dialog.tcl
 lib/bwidget/dragsite.tcl
 lib/bwidget/dropsite.tcl
@@ -64,6 +54,9 @@ lib/bwidget/lang/de.rc
 lib/bwidget/lang/en.rc
 lib/bwidget/lang/es.rc
 lib/bwidget/lang/fr.rc
+lib/bwidget/lang/hu.rc
+lib/bwidget/lang/nl.rc
+lib/bwidget/lang/no.rc
 lib/bwidget/listbox.tcl
 lib/bwidget/mainframe.tcl
 lib/bwidget/messagedlg.tcl
@@ -81,8 +74,6 @@ lib/bwidget/scrollw.tcl
 lib/bwidget/separator.tcl
 lib/bwidget/spinbox.tcl
 lib/bwidget/statusbar.tcl
-lib/bwidget/tests/
-lib/bwidget/tests/entry.test
 lib/bwidget/titleframe.tcl
 lib/bwidget/tree.tcl
 lib/bwidget/utils.tcl
@@ -100,6 +91,7 @@ share/doc/bwidget/DragSite.html
 share/doc/bwidget/DropSite.html
 share/doc/bwidget/DynamicHelp.html
 share/doc/bwidget/Entry.html
+share/doc/bwidget/LICENSE.txt
 share/doc/bwidget/Label.html
 share/doc/bwidget/LabelEntry.html
 share/doc/bwidget/LabelFrame.html
@@ -129,3 +121,13 @@ share/doc/bwidget/contents.html
 share/doc/bwidget/index.html
 share/doc/bwidget/navtree.html
 share/doc/bwidget/options.htm
+share/examples/bwidget/
+share/examples/bwidget/basic.tcl
+share/examples/bwidget/bwidget.xbm
+share/examples/bwidget/demo.tcl
+share/examples/bwidget/dnd.tcl
+share/examples/bwidget/manager.tcl
+share/examples/bwidget/select.tcl
+share/examples/bwidget/tmpldlg.tcl
+share/examples/bwidget/tree.tcl
+share/examples/bwidget/x1.xbm
$OpenBSD$
--- tests/entry.test.orig       Mon Feb 28 13:06:41 2000
+++ tests/entry.test    Mon Oct 12 10:30:58 2009
@@ -1,7 +1,5 @@
-if { [lsearch [package names] tcltest] == -1 } {
        package require tcltest
        namespace import tcltest::*
-}
 lappend auto_path /home/ericm/bwidget
 package require BWidget
 
@@ -23,7 +21,7 @@ foreach test {
     {-command foo foo {} {}}
     {-disabledforeground blue blue non-existent \
            {unknown color name "non-existent"}}
-    {-editable false false shazbot {expected boolean value but got "shazbot"}}
+    {-editable 0 0 shazbot {expected boolean value but got "shazbot"}}
     {-exportselection yes 1 xyzzy {expected boolean value but got "xyzzy"}}
     {-fg #110022 #110022 bogus {unknown color name "bogus"}}
     {-font {Helvetica 12 italic} {Helvetica 12 italic} {} \
@@ -65,7 +63,7 @@ destroy .e
 
 test Entry-2.1 {Entry} {
     list [catch {Entry} msg] $msg
-} {1 {no value given for parameter "path" to "Entry"}}
+} {1 {wrong # args: should be "Entry path ..."}}
 test Entry-2.2 {Entry} {
     list [catch {Entry gorp} msg] $msg
 } {1 {bad window path name "gorp"}}

Reply via email to