upgrade BLT2.4m to BLT2.4s

5 files changed, 47 insertions, 33 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index a08bd0cfdd54..a9f618352b66 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	blt
-PORTVERSION= 	2.4m
+PORTVERSION= 	2.4s
 CATEGORIES=	x11-toolkits tk82
-MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/ \
+MASTER_SITES=	ftp://ftp.tcltk.com/aa004735/pub/blt/ \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
 DISTNAME=	BLT${PORTVERSION}
 
@@ -16,17 +16,19 @@ MAINTAINER=	kjc@csl.sony.co.jp
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-WRKSRC=		${WRKDIR}/blt2.4m
+WRKSRC=		${WRKDIR}/blt2.4s
 GNU_CONFIGURE=	yes
 MANN=		BLT.n barchart.n beep.n bgexec.n bitmap.n \
 		bltdebug.n busy.n cutbuffer.n dragdrop.n eps.n \
-		graph.n hierbox.n htext.n spline.n stripchart.n \
-		table.n tabset.n tile.n vector.n watch.n winop.n
+		graph.n hierbox.n hiertable.n htext.n spline.n \
+		stripchart.n table.n tabset.n tile.n vector.n \
+		watch.n winop.n
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	${LN} -sf libBLT24.so.2 ${PREFIX}/lib/libBLT24.so
+	${LN} -sf libBLTlite24.so.2 ${PREFIX}/lib/libBLTlite24.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/blt/distinfo b/x11-toolkits/blt/distinfo
index 5d61f332276a..c40e940efdac 100644
--- a/x11-toolkits/blt/distinfo
+++ b/x11-toolkits/blt/distinfo
@@ -1 +1 @@
-MD5 (BLT2.4m.tar.gz) = 4c7040b1863024101cbf1f7cc958bdb4
+MD5 (BLT2.4s.tar.gz) = 0e60397d6098d2904cff7a16551f7f2f
diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa
index 673d23f1460c..9bab2567b8ef 100644
--- a/x11-toolkits/blt/files/patch-aa
+++ b/x11-toolkits/blt/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Nov  4 04:57:32 1999
-+++ configure	Thu Nov  4 18:03:55 1999
-@@ -1093,7 +1093,7 @@
+--- configure.orig	Fri Jun  9 14:59:47 2000
++++ configure	Fri Jun  9 14:59:40 2000
+@@ -1140,7 +1140,7 @@
  #
  #  1. command line (--with-cflags)
  #  2. cached variable ($blt_cv_prog_cflags)
@@ -9,7 +9,7 @@
  #  4. otherwise, default to "-O"
  #
  echo $ac_n "checking default compiler flags""... $ac_c" 1>&6
-@@ -1103,7 +1103,7 @@
+@@ -1150,7 +1150,7 @@
  elif test "x${blt_cv_prog_cflags}" != "x" ; then
    CFLAGS=${blt_cv_prog_cflags}
  elif test "${BLT_HAVE_GCC}" = "yes" ; then
@@ -18,43 +18,32 @@
  else
    CFLAGS=-O
  fi
-@@ -2443,6 +2443,9 @@
+@@ -2572,6 +2572,7 @@
    if test "x$tclConfigFile" = "x" ; then
      for dir in \
       `ls -dr /usr/local/tcl/tcl[7-9].[0-9]* 2>/dev/null` \
-+     /usr/local/lib/tcl8.2 \
-+     /usr/local/lib/tcl8.1 \
-+     /usr/local/lib/tcl8.0 \
++     `ls -dr /usr/local/lib/tcl[7-9].[0-9]* 2>/dev/null` \
       /usr/local/tcl \
       /usr/local \
       /usr
-@@ -2543,6 +2546,9 @@
+@@ -2672,6 +2673,7 @@
    if test "x$tkConfigFile" = "x" ; then
      for dir in \
       `ls -dr /usr/local/tcl/tcl[7-9].[0-9]* 2>/dev/null` \
-+     /usr/local/lib/tk8.2 \
-+     /usr/local/lib/tk8.1 \
-+     /usr/local/lib/tk8.0 \
++     `ls -dr /usr/local/lib/tk[7-9].[0-9]* 2>/dev/null` \
       /usr/local/tcl \
       /usr/local \
       ${x_libraries} \
-@@ -2602,7 +2608,14 @@
- TK_LIB_DIR=${TK_PREFIX}/lib
+@@ -2776,7 +2778,7 @@
+ fi
  
  case $target in
--  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+  *-freebsd*)
-+    TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_VERSION}
-+    TK_INC_DIR=${TK_PREFIX}/include/tk${TK_VERSION}
-+    ;;
-+esac
-+
-+case $target in
-+  *-freebsd*|*-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
-     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+-  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
++  *-sunos4*|*-*-netbsd|NetBSD-*|*-*-freebsd*|OpenBSD-*)
+     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
-@@ -3348,7 +3361,13 @@
+@@ -3559,7 +3561,13 @@
      if test "$test_ok" = yes; then
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
diff --git a/x11-toolkits/blt/pkg-descr b/x11-toolkits/blt/pkg-descr
index c02dbad02e72..63fded177f36 100644
--- a/x11-toolkits/blt/pkg-descr
+++ b/x11-toolkits/blt/pkg-descr
@@ -1,4 +1,4 @@
-This is version 2.4m of the BLT library.  BLT is an extension to the Tk
+This is version 2.4s of the BLT library.  BLT is an extension to the Tk
 toolkit, adding new widgets, geometry managers, and miscellaneous
 commands.  It does not require any patching of the Tcl or Tk source
 files.
diff --git a/x11-toolkits/blt/pkg-plist b/x11-toolkits/blt/pkg-plist
index db3c6782f17f..8def7b7b1824 100644
--- a/x11-toolkits/blt/pkg-plist
+++ b/x11-toolkits/blt/pkg-plist
@@ -1,18 +1,32 @@
+bin/bltsh
+bin/bltsh24
 bin/bltwish
 bin/bltwish24
 include/blt.h
+include/bltChain.h
+include/bltTree.h
+include/bltVector.h
 lib/libBLT.a
 lib/libBLT24.a
 lib/libBLT24.so
 lib/libBLT24.so.2
+lib/libBLTlite.a
+lib/libBLTlite24.a
+lib/libBLTlite24.so
+lib/libBLTlite24.so.2
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/blt2.4/NEWS
+lib/blt2.4/PROBLEMS
+lib/blt2.4/README
 lib/blt2.4/bltCanvEps.pro
 lib/blt2.4/bltDnd.tcl
 lib/blt2.4/bltDragdrop.tcl
 lib/blt2.4/bltGraph.pro
 lib/blt2.4/bltGraph.tcl
 lib/blt2.4/bltHierbox.tcl
+lib/blt2.4/bltHiertable.tcl
+lib/blt2.4/bltTabnotebook.tcl
 lib/blt2.4/bltTabset.tcl
 lib/blt2.4/dd_protocols/dd-color.tcl
 lib/blt2.4/dd_protocols/dd-file.tcl
@@ -74,6 +88,8 @@ lib/blt2.4/demos/bitmaps/hobbes_mask.xbm
 lib/blt2.4/demos/bitmaps/sharky.xbm
 lib/blt2.4/demos/bitmaps/xbob.xbm
 lib/blt2.4/demos/busy1.tcl
+lib/blt2.4/demos/busy2.tcl
+lib/blt2.4/demos/dnd1.tcl
 lib/blt2.4/demos/dragdrop1.tcl
 lib/blt2.4/demos/dragdrop2.tcl
 lib/blt2.4/demos/eps.tcl
@@ -88,6 +104,8 @@ lib/blt2.4/demos/hierbox1.tcl
 lib/blt2.4/demos/hierbox2.tcl
 lib/blt2.4/demos/hierbox3.tcl
 lib/blt2.4/demos/hierbox4.tcl
+lib/blt2.4/demos/hiertable1.tcl
+lib/blt2.4/demos/hiertable2.tcl
 lib/blt2.4/demos/htext.txt
 lib/blt2.4/demos/htext1.tcl
 lib/blt2.4/demos/images/blt98.gif
@@ -135,11 +153,16 @@ lib/blt2.4/demos/scripts/stipples.tcl
 lib/blt2.4/demos/scripts/xcolors.tcl
 lib/blt2.4/demos/spline.tcl
 lib/blt2.4/demos/stripchart1.tcl
+lib/blt2.4/demos/tabnotebook1.tcl
+lib/blt2.4/demos/tabnotebook2.tcl
+lib/blt2.4/demos/tabnotebook3.tcl
 lib/blt2.4/demos/tabset1.tcl
 lib/blt2.4/demos/tabset2.tcl
 lib/blt2.4/demos/tabset3.tcl
 lib/blt2.4/demos/tabset4.tcl
 lib/blt2.4/demos/winop1.tcl
+lib/blt2.4/htresize.xbm
+lib/blt2.4/htresize_m.xbm
 lib/blt2.4/pkgIndex.tcl
 lib/blt2.4/tclIndex
 @dirrm lib/blt2.4/demos/scripts