4 files changed, 41 insertions, 41 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 4739dbbfc479..f45931f301c8 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,11 +3,11 @@
 # Date created:		22 September 1998
 # Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.23 1998/10/20 01:24:32 steve Exp $
+# $Id: Makefile,v 1.24 1998/11/14 09:43:29 asami Exp $
 #
 
-DISTNAME=	BLT2.4f
-PKGNAME=	blt-2.4f
+DISTNAME=	BLT2.4h
+PKGNAME=	blt-2.4h
 CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/
 
@@ -15,7 +15,7 @@ MAINTAINER=	kjc@csl.sony.co.jp
 
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
-WRKSRC=		${WRKDIR}/blt2.4f
+WRKSRC=		${WRKDIR}/blt2.4h
 GNU_CONFIGURE=	yes
 MANN=		BLT.n barchart.n bgexec.n bitmap.n bltdebug.n busy.n \
 		dragdrop.n eps.n graph.n htext.n hierbox.n spline.n \
@@ -31,7 +31,7 @@ SO_VERSION=	2.4
 .endif
 
 post-install:
-	${LN} -sf libBLT.so.${SO_VERSION} ${PREFIX}/lib/libBLT.so
+        ${LN} -sf libBLT24.so.${SO_VERSION} ${PREFIX}/lib/libBLT24.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 e8a7ebfe19ff..eac90d8886d1 100644
--- a/x11-toolkits/blt/distinfo
+++ b/x11-toolkits/blt/distinfo
@@ -1 +1 @@
-MD5 (BLT2.4f.tar.gz) = 7dc2f8b0a9c1dad5cee1c68f4b68dc18
+MD5 (BLT2.4h.tar.gz) = b4cceb1851b8f04fccac99caeaa36245
diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa
index 4425ca13a96b..142c8d8f9da5 100644
--- a/x11-toolkits/blt/files/patch-aa
+++ b/x11-toolkits/blt/files/patch-aa
@@ -1,26 +1,26 @@
---- configure.orig	Tue Aug 18 21:10:09 1998
-+++ configure	Tue Oct 20 22:42:43 1998
-@@ -2298,6 +2298,9 @@
-  $blt_ckcmd_tcl_home \
-  $blt_ckcmd_tcl_home/lib \
+--- configure.orig	Fri Mar  5 08:21:28 1999
++++ configure	Mon Apr 12 14:21:22 1999
+@@ -2301,6 +2301,9 @@
   $blt_cv_tcl_lib \
+  $prefix/lib \
+  $exec_prefix/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 \
+@@ -2340,6 +2343,9 @@
   $blt_cv_tk_lib \
+  $prefix/lib \
+  $exec_prefix/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 @@
+@@ -2433,6 +2439,13 @@
  tclLibDir=${TCL_PREFIX}/lib
  tkLibDir=${TK_PREFIX}/lib
  
@@ -34,7 +34,7 @@
  itclLibSpec=""
  itclIncSpec=""
  itclSuffix=""
-@@ -2448,7 +2461,7 @@
+@@ -2451,7 +2464,7 @@
  tkLibSpec=${TK_LIB_SPEC}
  
  case $target in
@@ -43,12 +43,11 @@
      tclLib="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${itclSuffix}"
      tkLib="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}${itclSuffix}"
      ;;
-@@ -3169,8 +3182,13 @@
+@@ -3170,7 +3183,13 @@
      if test "$test_ok" = yes; then
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
 -      SHLIB_LD_FLAGS="-Bshareable -x"
--      SHLIB_SUFFIX=".so"
 +      if test `objformat` = "elf"; then
 +        SHLIB_LD_FLAGS="-Bshareable -x -soname \$@"
 +        SHLIB_SUFFIX=".so.${bltMajor}"
diff --git a/x11-toolkits/blt/pkg-plist b/x11-toolkits/blt/pkg-plist
index bf321c1b8709..6b49a2d8cbe2 100644
--- a/x11-toolkits/blt/pkg-plist
+++ b/x11-toolkits/blt/pkg-plist
@@ -1,9 +1,10 @@
 bin/bltwish
-bin/bltwish2.4
+bin/bltwish24
 include/blt.h
 lib/libBLT.a
-lib/libBLT.so
-lib/libBLT.so.2.4
+lib/libBLT24.a
+lib/libBLT24.so
+lib/libBLT24.so.2.4
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/blt2.4/bltCanvEps.pro
@@ -19,48 +20,48 @@ 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.tcl
+lib/blt2.4/demos/_bgtest.tcl
+lib/blt2.4/demos/_demo.tcl
+lib/blt2.4/demos/_graph1.tcl
+lib/blt2.4/demos/_graph2.tcl
+lib/blt2.4/demos/_graph3.tcl
+lib/blt2.4/demos/_graph5.tcl
+lib/blt2.4/demos/_patterns.tcl
+lib/blt2.4/demos/_ps.tcl
+lib/blt2.4/demos/barchart1
 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/bg-test3.tcl
-lib/blt2.4/demos/bgexec
+lib/blt2.4/demos/bgexec1
 lib/blt2.4/demos/bgexec2
 lib/blt2.4/demos/bgexec3
 lib/blt2.4/demos/bgexec4
 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/busy1
 lib/blt2.4/demos/calendar
-lib/blt2.4/demos/dragdrop.tcl
-lib/blt2.4/demos/dragdrop2.tcl
+lib/blt2.4/demos/dragdrop1
+lib/blt2.4/demos/dragdrop2
 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/graph1
 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/hier1
 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/htext1
 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/stripchart1
+lib/blt2.4/demos/tabset1
 lib/blt2.4/demos/tabset2
 lib/blt2.4/demos/tabset3
 lib/blt2.4/demos/tabset4
@@ -94,6 +95,7 @@ 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/out.ps
 lib/blt2.4/demos/images/qv100.t.gif
 lib/blt2.4/demos/images/rain.gif
 lib/blt2.4/demos/images/smblue_rock.gif
@@ -101,7 +103,6 @@ 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