Update libslang to 1.3.7. The changes are too numerous to mention,

mostly bug fixes though.

5 files changed, 30 insertions, 31 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index bfa5d241a60..62787dd8d6b 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.12 1999/06/03 08:15:16 agc Exp $
+# $NetBSD: Makefile,v 1.13 1999/06/17 22:57:23 mjl Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
-DISTNAME=       slang1.2.2
-PKGNAME=        libslang-1.2.2
+DISTNAME=       slang-1.3.7
+PKGNAME=        libslang-1.3.7
 CATEGORIES=	devel
-MASTER_SITES=   ftp://space.mit.edu/pub/davis/slang/v1.2/
+MASTER_SITES=   ftp://space.mit.edu/pub/davis/slang/v1.3/ \
+		http://gd.tuwien.ac.at/editors/davis/slang/v1.3/
 
 MAINTAINER=     packages@netbsd.org
 HOMEPAGE=	http://space.mit.edu/~davis/slang.html
 
 GNU_CONFIGURE=  yes
 USE_LIBTOOL=	yes
-WRKSRC=         ${WRKDIR}/slang
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/files/md5 b/devel/libslang/files/md5
index 6104b0972a8..ca73063740f 100644
--- a/devel/libslang/files/md5
+++ b/devel/libslang/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:21:24 agc Exp $
+$NetBSD: md5,v 1.4 1999/06/17 22:57:24 mjl Exp $
 
-MD5 (slang1.2.2.tar.gz) = f0b71a8f9c6f2ccef07eaaa4068b3d1e
+MD5 (slang-1.3.7.tar.gz) = daea2a2b5f013ada6dc292273fc300b3
diff --git a/devel/libslang/patches/patch-aa b/devel/libslang/patches/patch-aa
index b3e1d1daeb3..f24fd432797 100644
--- a/devel/libslang/patches/patch-aa
+++ b/devel/libslang/patches/patch-aa
@@ -1,21 +1,20 @@
-$NetBSD: patch-aa,v 1.7 1999/06/03 08:17:10 agc Exp $
+$NetBSD: patch-aa,v 1.8 1999/06/17 22:57:24 mjl Exp $
 
---- src/Makefile.in.orig	Fri Apr 24 02:17:04 1998
-+++ src/Makefile.in	Tue Nov 24 10:07:20 1998
+--- src/Makefile.in.orig	Mon Jun  7 01:35:06 1999
++++ src/Makefile.in	Thu Jun 17 00:51:43 1999
 @@ -2,9 +2,9 @@
  #---------------------------------------------------------------------------
  # ANSI C compiler
  #---------------------------------------------------------------------------
 -CC              = @CC@
--CFLAGS 		= @CFLAGS@
--LDFLAGS		= @LDFLAGS@
-+CC		= $(LIBTOOL) @CC@
-+CFLAGS		= @CFLAGS@
++CC              = $(LIBTOOL) @CC@
+ CFLAGS 		= @CFLAGS@
+-LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
 +LDFLAGS		= $(EXECLIBS)
- #---------------------------------------------------------------------------
- # ELF specific (Linux)
- #---------------------------------------------------------------------------
-@@ -17,7 +17,7 @@
+ #-----------------------------------------------------------------------------
+ # System library that contains functions for dynamic linking (-ldl)
+ #-----------------------------------------------------------------------------
+@@ -22,7 +22,7 @@
  # Set these values to ABSOLUTE path names
  #---------------------------------------------------------------------------
  SRCDIR = @SRCDIR@# Location of sources
@@ -24,7 +23,7 @@ $NetBSD: patch-aa,v 1.7 1999/06/03 08:17:10 agc Exp $
  ELFDIR = @ELFDIR@# Location of elf objects
  
  #---------------------------------------------------------------------------
-@@ -57,13 +57,13 @@
+@@ -62,13 +62,13 @@
  ELF_MINOR_VERSION	= @slang_minor_version@#
  
  CONFIG_H		= config.h
@@ -40,16 +39,16 @@ $NetBSD: patch-aa,v 1.7 1999/06/03 08:17:10 agc Exp $
  OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
  
  ELFLIB = lib$(THIS_LIB).so#
-@@ -72,7 +72,7 @@
+@@ -77,7 +77,7 @@
  
  ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
  
--EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB)
+-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)
 +EXECLIBS = libslang.la $(TCAPLIB)
  EXECDEPS = $(OBJDIR_NORMAL_LIB)
  
  OFILES = @PROGRAM_OFILES@
-@@ -85,13 +85,13 @@
+@@ -92,13 +92,13 @@
  #---------------------------------------------------------------------------
  # Rules
  #---------------------------------------------------------------------------
@@ -62,11 +61,11 @@ $NetBSD: patch-aa,v 1.7 1999/06/03 08:17:10 agc Exp $
 -	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 -	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 +	cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
-+		-rpath $(PREFIX)/lib -version-info 1:2
++		-rpath $(PREFIX)/lib -version-info 1:3
  	@echo ""
  	@echo $(NORMAL_LIB) created in $(OBJDIR)
  
-@@ -115,9 +115,7 @@
+@@ -122,9 +122,7 @@
  #---------------------------------------------------------------------------
  install: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
  	@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
diff --git a/devel/libslang/patches/patch-ab b/devel/libslang/patches/patch-ab
index 30d2a754e7a..df9da734f2a 100644
--- a/devel/libslang/patches/patch-ab
+++ b/devel/libslang/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1998/10/04 15:30:51 tv Exp $
+$NetBSD: patch-ab,v 1.5 1999/06/17 22:57:24 mjl Exp $
 
---- configure.orig	Sun Oct  4 09:26:00 1998
-+++ configure	Sun Oct  4 09:26:17 1998
-@@ -1386,17 +1386,6 @@
+--- configure.orig	Mon Jun  7 01:34:53 1999
++++ configure	Thu Jun 17 00:54:16 1999
+@@ -1840,17 +1840,6 @@
  
  TERMCAP=-ltermcap
  
 -echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
--echo "configure:1391: checking for Terminfo" >&5
+-echo "configure:1845: checking for Terminfo" >&5
 -for terminfo_dir in $JD_Terminfo_Dirs
 -do
 -   if test -d $terminfo_dir 
diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST
index dbeb19ca6e3..473a103aed7 100644
--- a/devel/libslang/pkg/PLIST
+++ b/devel/libslang/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 1998/07/16 13:36:47 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 1999/06/17 22:57:25 mjl Exp $
 lib/libslang.a
-lib/libslang.so.1.2
+lib/libslang.so.1.3
 include/slcurses.h
 include/slang.h