6 files changed, 91 insertions, 79 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 5d79c6853e24..83ec4eb73e64 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -1,22 +1,27 @@
 # New ports collection makefile for:	blt
-# Version required:	1.7
-# Date created:		14 December 1994
-# Whom:			wollman
+# Version required:	2.1
+# Date created:		3 August 1996
+# Whom:			lukin
 #
-# $Id: Makefile,v 1.5 1995/06/24 11:42:19 asami Exp $
+# $Id: Makefile,v 1.1 1996/07/07 00:21:03 lukin Exp $
 #
 
-DISTNAME=	blt-1.7
+DISTNAME=	blt-2.1
 CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/alcatel/extensions/
-DISTFILES=	BLT-1.7.tar.gz
+MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/NEW/
+DISTFILES=	BLT2.1.tar.gz
+WRKSRC=		${WRKDIR}/blt2.1
 
-LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
+MAINTAINER=	lukin@okbmei.msk.su
+
+LIB_DEPENDS=	tcl75\\.:${PORTSDIR}/lang/tcl75 \
+		tk41\\.:${PORTSDIR}/x11/tk41
 
 GNU_CONFIGURE=	yes
-ALL_TARGET=	all sharedlib
+ALL_TARGET=	all
 
 post-install:
 	ldconfig -m ${PREFIX}/lib
+	gzip -9nf ${PREFIX}/man/mann/BLT.n ${PREFIX}/man/mann/barchart.n ${PREFIX}/man/mann/bgexec.n ${PREFIX}/man/mann/bitmap.n ${PREFIX}/man/mann/bltdebug.n ${PREFIX}/man/mann/busy.n ${PREFIX}/man/mann/dragdrop.n ${PREFIX}/man/mann/graph.n ${PREFIX}/man/mann/htext.n ${PREFIX}/man/mann/spline.n ${PREFIX}/man/mann/table.n ${PREFIX}/man/mann/tile.n ${PREFIX}/man/mann/vector.n ${PREFIX}/man/mann/watch.n ${PREFIX}/man/mann/winop.n
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/blt/distinfo b/x11-toolkits/blt/distinfo
index 86ecc0917883..98c550b5dfd4 100644
--- a/x11-toolkits/blt/distinfo
+++ b/x11-toolkits/blt/distinfo
@@ -1 +1 @@
-MD5 (BLT-1.7.tar.gz) = a8779569c62e6ac8f2a4a34c6158a4e1
+MD5 (BLT2.1.tar.gz) = 9e41a8884592ca0b42f4a026440919d3
diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa
index 6f501337d1fb..8118e44967c9 100644
--- a/x11-toolkits/blt/files/patch-aa
+++ b/x11-toolkits/blt/files/patch-aa
@@ -1,41 +1,44 @@
-*** configure.orig	Wed Dec 14 15:17:42 1994
---- configure	Wed Dec 14 15:22:42 1994
-***************
-*** 183,187 ****
-  # -----------------------------------------------------------------------
-  if test -z "$prefix" ; then
-!     prefix=/usr/local/blt
-  fi
-  
---- 183,187 ----
-  # -----------------------------------------------------------------------
-  if test -z "$prefix" ; then
-!     prefix=/usr/local
-  fi
-  
-***************
-*** 1114,1117 ****
---- 1114,1123 ----
-          SHLIB_SUFFIX='.so.$(MAJOR_VERSION)'
-          ;;
-+       FreeBSD*)
-+ 	SHLIB_CCFLAGS="-fpic"
-+ 	SHLIB_LDFLAGS="-Bshareable"
-+ 	SHLIB_LOADER="ld"
-+ 	SHLIB_SUFFIX='.so.$(MAJOR_VERSION).$(MINOR_VERSION)'
-+ 	;;
-        *)
-  	echo "Don't know how to make shared libraries for $system"
-***************
-*** 1137,1141 ****
-  LIBDIR="$DESTDIR/lib"
-  MANDIR="$DESTDIR/man"
-! BLT_LIBRARY="$DESTDIR/library"
-  
-  
---- 1143,1147 ----
-  LIBDIR="$DESTDIR/lib"
-  MANDIR="$DESTDIR/man"
-! BLT_LIBRARY="$DESTDIR/lib/blt"
-  
+--- configure.orig	Sun Apr 21 07:47:32 1996
++++ configure	Sat Aug  3 18:59:02 1996
+@@ -1460,7 +1460,7 @@
+ 
+ if test "$prefix" = "NONE"; then 
+     if test -z "$PREFIX" ; then
+-	prefix=/usr/local/blt
++	prefix=/usr/local
+     else
+ 	prefix=$PREFIX
+     fi
+@@ -2192,9 +2192,8 @@
+     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
+ 
+ 
+ 
+@@ -2312,10 +2311,7 @@
+     echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$TKLIBDIR" != "/usr/lib" ; then
+-    TKLIBSW="-L$TKLIBDIR -ltk${TK_VERSION}"
+-fi
+-
++TKLIBSW=$TK_LIB_SPEC
+ 
   
+ 
+@@ -2634,6 +2630,8 @@
+   *-freebsd*|*-386bsd*|*-netbsd*)
+     SHLIB_CCFLAGS="-fpic"
+     SHLIB_LDFLAGS="-Bshareable"
++    SHLIB_LOADER="ld"
++    SHLIB_SUFFIX=".so.${blt_cv_major_version}.${blt_cv_minor_version}"
+     ;;
+   *-linux*)
+     if eval "test \"`echo '$''{'blt_cv_sys_elf'+set}'`\" = set"; then
diff --git a/x11-toolkits/blt/pkg-comment b/x11-toolkits/blt/pkg-comment
index 092452034150..501c2b1fb3a3 100644
--- a/x11-toolkits/blt/pkg-comment
+++ b/x11-toolkits/blt/pkg-comment
@@ -1 +1 @@
-BLT (Tk add-on), version 1.7 (with shared libs)
+A Tk extension, version 2.1 (with shared libs)
diff --git a/x11-toolkits/blt/pkg-descr b/x11-toolkits/blt/pkg-descr
index b52ea656014b..ebc222ab1953 100644
--- a/x11-toolkits/blt/pkg-descr
+++ b/x11-toolkits/blt/pkg-descr
@@ -1,7 +1,8 @@
-This package contains the binary release of BLT version 1.7, an add-on
-library for programs using Tk 3.6.  It includes widgets to implement
-drag and drop, barcharts and X-Y plots, and including generic Tk
-widgets inside a text object.
+This is version 2.1 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.
 
 NOTE: This kit requires as a pre-requisite the Tcl and Tk binary kits.
 This version uses FreeBSD shared libraries.
+
diff --git a/x11-toolkits/blt/pkg-plist b/x11-toolkits/blt/pkg-plist
index 287e9318faf4..946f63b8a43b 100644
--- a/x11-toolkits/blt/pkg-plist
+++ b/x11-toolkits/blt/pkg-plist
@@ -1,25 +1,28 @@
-@cwd /usr/local
-lib/blt/dd_protocols/dd-color.tcl
-lib/blt/dd_protocols/dd-file.tcl
-lib/blt/dd_protocols/dd-number.tcl
-lib/blt/dd_protocols/dd-text.tcl
-lib/blt/dd_protocols/tclIndex
-lib/blt/bltGraph.pro
-bin/blt_wish
+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
 lib/libBLT.a
-lib/libBLT.so.1.7
-@exec ldconfig -m %B
-man/mann/blt_barchart.n
-man/mann/blt_bell.n
-man/mann/blt_bgexec.n
-man/mann/blt_bitmap.n
-man/mann/blt_busy.n
-man/mann/blt_cutbuffer.n
-man/mann/blt_debug.n
-man/mann/blt_dragdrop.n
-man/mann/blt_graph.n
-man/mann/blt_htext.n
-man/mann/blt_intro.n
-man/mann/blt_table.n
-man/mann/blt_watch.n
-man/mann/blt_win.n
+lib/libBLT.so.2.1
+@exec /sbin/ldconfig -m %D/lib
+man/mann/BLT.n.gz
+man/mann/barchart.n.gz
+man/mann/bgexec.n.gz
+man/mann/bitmap.n.gz
+man/mann/bltdebug.n.gz
+man/mann/busy.n.gz
+man/mann/dragdrop.n.gz
+man/mann/graph.n.gz
+man/mann/htext.n.gz
+man/mann/spline.n.gz
+man/mann/table.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