update: BLT2.1 --> BLT2.4c

also
  LIB_DEPENDS: tk41 --> tk80
  MAINTAINER:  lukin@okbmei.msk.su --> kjc@csl.sony.co.jp

Reviewed by: itojun@itojun.org

5 files changed, 175 insertions, 117 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index ac1c7a23217f..f6f3dc46d5e4 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -1,25 +1,26 @@
 # New ports collection makefile for:	blt
-# Version required:	2.1
-# Date created:		3 August 1996
-# Whom:			lukin <lukin@okbmei.msk.su>
+# Version required:	2.4c
+# Date created:		9 July 1998
+# Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.15 1997/11/22 01:11:34 asami Exp $
+# $Id: Makefile,v 1.16 1997/11/22 11:22:00 asami Exp $
 #
 
-DISTNAME=	blt-2.1
-CATEGORIES=	x11 tk41
-MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/devel/
-DISTFILES=	BLT2.1.tar.gz
+DISTNAME=	BLT2.4c
+PKGNAME=	blt-2.4c
+CATEGORIES=	x11 tk80
+MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/
 
-MAINTAINER=	lukin@okbmei.msk.su
+MAINTAINER=	kjc@csl.sony.co.jp
 
-LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
-WRKSRC=		${WRKDIR}/blt2.1
+WRKSRC=		${WRKDIR}/blt2.4c
 GNU_CONFIGURE=	yes
 MANN=		BLT.n barchart.n bgexec.n bitmap.n bltdebug.n busy.n \
-		dragdrop.n graph.n htext.n spline.n table.n tile.n \
-		vector.n watch.n winop.n
+		dragdrop.n eps.n graph.n htext.n hierbox.n spline.n \
+		stripchart.n table.n tabset.n tile.n vector.n watch.n winop.n \
+		beep.n cutbuffer.n
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-toolkits/blt/distinfo b/x11-toolkits/blt/distinfo
index 98c550b5dfd4..3bb70764d76f 100644
--- a/x11-toolkits/blt/distinfo
+++ b/x11-toolkits/blt/distinfo
@@ -1 +1 @@
-MD5 (BLT2.1.tar.gz) = 9e41a8884592ca0b42f4a026440919d3
+MD5 (BLT2.4c.tar.gz) = 99ee974420680eecc859ac7593717f12
diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa
index 82f201ac3045..0d98e779c47d 100644
--- a/x11-toolkits/blt/files/patch-aa
+++ b/x11-toolkits/blt/files/patch-aa
@@ -1,94 +1,54 @@
---- configure.orig	Sun Apr 21 07:47:32 1996
-+++ configure	Sat Aug  3 18:59:02 1996
-@@ -1460,7 +1460,7 @@
+--- configure.orig	Tue Jul  7 19:00:28 1998
++++ configure	Thu Jul  9 13:35:07 1998
+@@ -2298,6 +2298,9 @@
+  $blt_ckcmd_tcl_home \
+  $blt_ckcmd_tcl_home/lib \
+  $blt_cv_tcl_lib \
++ /usr/local/lib/tcl8.0 \
++ /usr/local/lib/tcl7.6 \
++ /usr/local/lib/tcl7.5 \
+  /usr/local/tcl/lib \
+  /usr/local/tcl/tcl8.0/lib \
+  /usr/local/tcl/tcl7.6/lib \
+@@ -2337,6 +2340,9 @@
+  $blt_ckcmd_tcl_home \
+  $blt_ckcmd_tcl_home/lib \
+  $blt_cv_tk_lib \
++ /usr/local/lib/tk8.0 \
++ /usr/local/lib/tk4.2 \
++ /usr/local/lib/tk4.1 \
+  /usr/local/tcl/lib \
+  /usr/local/tcl/tk8.0/lib \
+  /usr/local/tcl/tk4.2/lib \
+@@ -2432,6 +2438,13 @@
+ tclLibDir=${TCL_PREFIX}/lib
+ tkLibDir=${TK_PREFIX}/lib
  
- if test "$prefix" = "NONE"; then 
-     if test -z "$PREFIX" ; then
--	prefix=/usr/local/blt
-+	prefix=/usr/local
-     else
- 	prefix=$PREFIX
-     fi
-@@ -2100,7 +2100,7 @@
- guesses="$TCLINCDIR \
-      $TCL_LIBRARY/../../include \
-      /usr/local/itcl/include \
--     /usr/local/tcl/tcl7.5/include /usr/local/tcl/tcl7.4/include \
-+     /usr/local/include/tcl7.5 /usr/local/tcl/tcl7.4/include \
-      /usr/local/tcl/tcl7.3/include /usr/local/tcl/tcl7.2/include \
-      /usr/local/tcl/tcl7.1/include /usr/local/tcl/tcl7.0/include \
-      $PWD/../itcl2.0/tcl7.4 \
-@@ -2165,8 +2165,8 @@
- 	blt_path_tcl_lib="$dir/itcl"
- 	break
-     fi
--    libnames=`echo $dir/libtcl*`
--    if test "$libnames" != "$dir/libtcl*" ; then
-+    libnames=`echo $dir/libtcl75*`
-+    if test "$libnames" != "$dir/libtcl75*" ; then
- 	blt_path_tcl_lib=$dir
- 	break
-     fi
-@@ -2180,8 +2180,8 @@
-   *-sunos4*)
-      ;;
-   *) 
--     if test -r $TCLLIBDIR/tclConfig.sh; then
--	 . $TCLLIBDIR/tclConfig.sh
-+     if test -r $TCLLIBDIR/tcl7.5/tclConfig.sh; then
-+	 . $TCLLIBDIR/tcl7.5/tclConfig.sh
-      fi
-      ;;
- esac
-@@ -2192,9 +2192,7 @@
-     TCLLIBDIR="__Edit_${saveFile}__"
-     echo "$ac_t""no" 1>&6
- fi
--if test "$TCLLIBDIR" != "/usr/lib" ; then
--    TCLLIBSW="-L$TCLLIBDIR -ltcl${TCL_VERSION}"
--fi
-+TCLLIBSW=${TCL_LIB_SPEC}
- 
- 
- 
-@@ -2208,7 +2206,7 @@
-      $TKINCDIR \
-      /usr/local/itcl/include \
-      /usr/local/tcl/include \
--     /usr/local/tcl/tk4.1/include \
-+     /usr/local/include/tk4.1 \
-      /usr/local/tcl/tk4.0/include \
-      /usr/local/tcl/tk3.6/include \
-      /usr/local/tcl/tk3.5/include \
-@@ -2299,8 +2297,8 @@
-   *-sunos4*)
-      ;;
-   *) 
--     if test -r $TKLIBDIR/tkConfig.sh; then
--	 . $TKLIBDIR/tkConfig.sh
-+     if test -r $TKLIBDIR/tk4.1/tkConfig.sh; then
-+	 . $TKLIBDIR/tk4.1/tkConfig.sh
-      fi
-      ;;
- esac
-@@ -2312,10 +2310,7 @@
-     echo "$ac_t""no" 1>&6
- fi
++case $target in
++  *-freebsd*)
++    tclIncSpec="-I${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
++    tkIncSpec="-I${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++    ;;
++esac
++
+ itclLibSpec=""
+ itclIncSpec=""
+ itclSuffix=""
+@@ -2448,7 +2461,7 @@
+ tkLibSpec=${TK_LIB_SPEC}
  
--if test "$TKLIBDIR" != "/usr/lib" ; then
--    TKLIBSW="-L$TKLIBDIR -ltk${TK_VERSION}"
--fi
--
-+TKLIBSW=${TK_LIB_SPEC}
- 
-  
- 
-@@ -2634,6 +2629,8 @@
-   *-freebsd*|*-386bsd*|*-netbsd*)
-     SHLIB_CCFLAGS="-fpic"
-     SHLIB_LDFLAGS="-Bshareable"
-+    SHLIB_LOADER="ld"
-+    SHLIB_SUFFIX=".so.${blt_cv_major_version}.${blt_cv_minor_version}"
+ case $target in
+-  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
++  *-freebsd*|*-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
+     tclLib="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${itclSuffix}"
+     tkLib="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${itclSuffix}"
      ;;
-   *-linux*)
-     if eval "test \"`echo '$''{'blt_cv_sys_elf'+set}'`\" = set"; then
+@@ -3164,7 +3177,7 @@
+       SHLIB_CFLAGS="-fpic"
+       SHLIB_LD="ld"
+       SHLIB_LD_FLAGS="-Bshareable -x"
+-      SHLIB_SUFFIX=".so"
++      SHLIB_SUFFIX=".so.${bltMajor}.${bltMinor}"
+     fi
+     ;;
+ 
diff --git a/x11-toolkits/blt/pkg-descr b/x11-toolkits/blt/pkg-descr
index ebc222ab1953..671581ed1d33 100644
--- a/x11-toolkits/blt/pkg-descr
+++ b/x11-toolkits/blt/pkg-descr
@@ -1,4 +1,4 @@
-This is version 2.1 of the BLT library.  BLT is an extension to the Tk
+This is version 2.4c 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 8277f93f846c..24b8ff035ebd 100644
--- a/x11-toolkits/blt/pkg-plist
+++ b/x11-toolkits/blt/pkg-plist
@@ -1,16 +1,106 @@
-lib/blt2.1/dd_protocols/dd-color.tcl
-lib/blt2.1/dd_protocols/dd-file.tcl
-lib/blt2.1/dd_protocols/dd-number.tcl
-lib/blt2.1/dd_protocols/dd-text.tcl
-lib/blt2.1/dd_protocols/tclIndex
-lib/blt2.1/bltGraph.pro
-lib/blt2.1/bltGraph.tcl
-lib/blt2.1/tclIndex
 bin/bltwish
+bin/bltwish2.4
+include/blt.h
 lib/libBLT.a
-lib/libBLT.so.2.1
+lib/libBLT.so.2.4
 @exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
+lib/blt2.4/bltCanvEps.pro
+lib/blt2.4/bltGraph.pro
+lib/blt2.4/bltGraph.tcl
+lib/blt2.4/bltHier.tcl
+lib/blt2.4/bltTabset.tcl
+lib/blt2.4/pkgIndex.tcl
+lib/blt2.4/tclIndex
+lib/blt2.4/dd_protocols/dd-color.tcl
+lib/blt2.4/dd_protocols/dd-file.tcl
+lib/blt2.4/dd_protocols/dd-number.tcl
+lib/blt2.4/dd_protocols/dd-text.tcl
+lib/blt2.4/dd_protocols/tclIndex
+lib/blt2.4/demos/barchart
+lib/blt2.4/demos/barchart2
+lib/blt2.4/demos/barchart2.tcl
+lib/blt2.4/demos/barchart3
+lib/blt2.4/demos/barchart4
+lib/blt2.4/demos/barchart5
+lib/blt2.4/demos/bgexec
+lib/blt2.4/demos/bgexec2
+lib/blt2.4/demos/bitmap
+lib/blt2.4/demos/bltDemo.tcl
+lib/blt2.4/demos/bltGrPs.tcl
+lib/blt2.4/demos/busy
+lib/blt2.4/demos/calendar
+lib/blt2.4/demos/dragdrop.tcl
+lib/blt2.4/demos/dragdrop2.tcl
+lib/blt2.4/demos/eps
+lib/blt2.4/demos/form
+lib/blt2.4/demos/graph
+lib/blt2.4/demos/graph1.tcl
+lib/blt2.4/demos/graph2
+lib/blt2.4/demos/graph2.tcl
+lib/blt2.4/demos/graph3
+lib/blt2.4/demos/graph3.tcl
+lib/blt2.4/demos/graph4
+lib/blt2.4/demos/graph5
+lib/blt2.4/demos/graph5.tcl
+lib/blt2.4/demos/graph6
+lib/blt2.4/demos/graph7
+lib/blt2.4/demos/hier
+lib/blt2.4/demos/hier2
+lib/blt2.4/demos/hier3
+lib/blt2.4/demos/hier4
+lib/blt2.4/demos/htext
+lib/blt2.4/demos/htext.txt
+lib/blt2.4/demos/page.tcl
+lib/blt2.4/demos/patterns.tcl
+lib/blt2.4/demos/spline
+lib/blt2.4/demos/stripchart
+lib/blt2.4/demos/tabset
+lib/blt2.4/demos/tabset2
+lib/blt2.4/demos/tabset3
+lib/blt2.4/demos/tabset4
+lib/blt2.4/demos/bitmaps/eyes.bm
+lib/blt2.4/demos/bitmaps/face
+lib/blt2.4/demos/bitmaps/fc_left
+lib/blt2.4/demos/bitmaps/fc_left1
+lib/blt2.4/demos/bitmaps/fc_left1m
+lib/blt2.4/demos/bitmaps/fc_leftm
+lib/blt2.4/demos/bitmaps/fc_mid
+lib/blt2.4/demos/bitmaps/fc_midm
+lib/blt2.4/demos/bitmaps/fc_right
+lib/blt2.4/demos/bitmaps/fc_right1
+lib/blt2.4/demos/bitmaps/fc_right1m
+lib/blt2.4/demos/bitmaps/fc_rightm
+lib/blt2.4/demos/bitmaps/greenback
+lib/blt2.4/demos/bitmaps/hobbes.xbm
+lib/blt2.4/demos/bitmaps/hobbes_mask.xbm
+lib/blt2.4/demos/bitmaps/sharky.bm
+lib/blt2.4/demos/bitmaps/xbob.bm
+lib/blt2.4/demos/images/buckskin.gif
+lib/blt2.4/demos/images/chalk.gif
+lib/blt2.4/demos/images/clouds.gif
+lib/blt2.4/demos/images/corrugated_metal.gif
+lib/blt2.4/demos/images/folder.gif
+lib/blt2.4/demos/images/mini-book1.gif
+lib/blt2.4/demos/images/mini-book2.gif
+lib/blt2.4/demos/images/mini-display.gif
+lib/blt2.4/demos/images/mini-doc.gif
+lib/blt2.4/demos/images/mini-filemgr.gif
+lib/blt2.4/demos/images/mini-ofolder.gif
+lib/blt2.4/demos/images/mini-windows.gif
+lib/blt2.4/demos/images/ofolder.gif
+lib/blt2.4/demos/images/qv100.t.gif
+lib/blt2.4/demos/images/rain.gif
+lib/blt2.4/demos/images/smblue_rock.gif
+lib/blt2.4/demos/images/stopsign.gif
+lib/blt2.4/demos/images/tan_paper.gif
+lib/blt2.4/demos/images/tan_paper2.gif
+lib/blt2.4/demos/images/txtrflag.gif
+lib/blt2.4/demos/images/out.ps
+@dirrm lib/blt2.4/demos/images
+@dirrm lib/blt2.4/demos/bitmaps
+@dirrm lib/blt2.4/demos
+@dirrm lib/blt2.4/dd_protocols
+@dirrm lib/blt2.4
 man/mann/BLT.n.gz
 man/mann/barchart.n.gz
 man/mann/bgexec.n.gz
@@ -18,12 +108,19 @@ man/mann/bitmap.n.gz
 man/mann/bltdebug.n.gz
 man/mann/busy.n.gz
 man/mann/dragdrop.n.gz
+man/mann/eps.n.gz
 man/mann/graph.n.gz
 man/mann/htext.n.gz
+man/mann/hierbox.n.gz
 man/mann/spline.n.gz
+man/mann/stripchart.n.gz
 man/mann/table.n.gz
+man/mann/tabset.n.gz
 man/mann/tile.n.gz
 man/mann/vector.n.gz
 man/mann/watch.n.gz
 man/mann/winop.n.gz
-include/blt.h
+man/mann/beep.n.gz
+man/mann/cutbuffer.n.gz
+
+