Update libslang to 1.2.2. Make use of libtool.

5 files changed, 72 insertions, 100 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 1978f807915..aaf94855bb9 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,20 +1,18 @@
-# $NetBSD: Makefile,v 1.8 1998/07/15 11:44:46 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/07/15 14:15:59 tv Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
-DISTNAME=       slang0.99-38
-PKGNAME=        libslang-0.99.38
+DISTNAME=       slang1.2.2
+PKGNAME=        libslang-1.2.2
 CATEGORIES=	devel
 MASTER_SITES=   ftp://space.mit.edu/pub/davis/slang/
 
 MAINTAINER=     packages@netbsd.org
 
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
 GNU_CONFIGURE=  yes
-ALL_TARGET=     all elf
-INSTALL_TARGET= install install-elf
+MAKE_ENV=	LIBTOOL=${PREFIX}/bin/libtool
 WRKSRC=         ${WRKDIR}/slang
 
-post-install:
-	@rm -f ${PREFIX}/lib/libslang.so.99.3[348]
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/files/md5 b/devel/libslang/files/md5
index 7e25b5bcdb0..96c3a56f341 100644
--- a/devel/libslang/files/md5
+++ b/devel/libslang/files/md5
@@ -1 +1 @@
-MD5 (slang0.99-38.tar.gz) = d3419a30d2705b631b51deb9fe57aa65
+MD5 (slang1.2.2.tar.gz) = f0b71a8f9c6f2ccef07eaaa4068b3d1e
diff --git a/devel/libslang/patches/patch-aa b/devel/libslang/patches/patch-aa
index d62fab8b6ca..5fe8531a31b 100644
--- a/devel/libslang/patches/patch-aa
+++ b/devel/libslang/patches/patch-aa
@@ -1,76 +1,62 @@
-*** src/Makefile.in.orig	Tue Jan 21 20:21:34 1997
---- src/Makefile.in	Mon Jan 27 23:49:32 1997
-***************
-*** 2,16 ****
-  #---------------------------------------------------------------------------
-  # ANSI C compiler
-  #---------------------------------------------------------------------------
-! CC              = @CC@
-! CFLAGS 		= @CFLAGS@
-  LDFLAGS		= @LDFLAGS@
-  #---------------------------------------------------------------------------
-  # ELF specific (Linux)
-  #---------------------------------------------------------------------------
-! ELF_CC 		= gcc
-! ELF_CFLAGS	= -O2 -fno-strength-reduce -fPIC
-! ELF_LINK        = gcc -shared -Wl,-lm,-t,-soname#
-  #---------------------------------------------------------------------------
-  # Set these values to ABSOLUTE path names
-  #---------------------------------------------------------------------------
---- 2,16 ----
-  #---------------------------------------------------------------------------
-  # ANSI C compiler
-  #---------------------------------------------------------------------------
-! #CC              = @CC@
-! #CFLAGS          = @CFLAGS@
-  LDFLAGS		= @LDFLAGS@
-  #---------------------------------------------------------------------------
-  # ELF specific (Linux)
-  #---------------------------------------------------------------------------
-! ELF_CC          = $(CC)
-! ELF_CFLAGS      = $(CFLAGS) -DPIC -fpic
-! ELF_LINK        = ld -Bshareable
-  #---------------------------------------------------------------------------
-  # Set these values to ABSOLUTE path names
-  #---------------------------------------------------------------------------
-***************
-*** 93,103 ****
-  #	cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-  $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS)
-  	-$(RM) $(ELFDIR_ELF_LIB)
-! 	cd $(ELFDIR); $(ELF_LINK),$(ELFLIB_MAJOR) -o $(ELFLIB_MAJOR_MINOR) $(OFILES)
-! 	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
-- 	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
-  	@echo ""
-  $(OBJDIR) :
-  	-$(MKDIR) $(OBJDIR)
---- 93,101 ----
-  #	cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
-  $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS)
-  	-$(RM) $(ELFDIR_ELF_LIB)
-! 	cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
-  	@echo ""
-  $(OBJDIR) :
-  	-$(MKDIR) $(OBJDIR)
-***************
-*** 124,138 ****
-  install-elf: install elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB)
-  	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
-  	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
-- 	-$(RM) $(install_lib_dir)/$(ELFLIB)
-- 	-$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
-  	@echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
-  	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
-- 	@echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
-- 	-cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
-  	@echo ""
-  	@echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
-- 	@echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
-  	@echo ""
-  install-links:
-  	-$(RM) $(install_lib_dir)/$(ELFLIB)
---- 122,131 ----
+--- src/Makefile.in.orig	Wed Jul 15 09:23:28 1998
++++ src/Makefile.in	Wed Jul 15 09:45:35 1998
+@@ -2,9 +2,9 @@
+ #---------------------------------------------------------------------------
+ # ANSI C compiler
+ #---------------------------------------------------------------------------
+-CC              = @CC@
+-CFLAGS 		= @CFLAGS@
+-LDFLAGS		= @LDFLAGS@
++CC		= ${LIBTOOL} cc
++CFLAGS		= -O2
++LDFLAGS		= libslang.la -ltermcap
+ #---------------------------------------------------------------------------
+ # ELF specific (Linux)
+ #---------------------------------------------------------------------------
+@@ -17,7 +17,7 @@
+ # Set these values to ABSOLUTE path names
+ #---------------------------------------------------------------------------
+ SRCDIR = @SRCDIR@# Location of sources
+-OBJDIR = @OBJDIR@# Location of objects
++OBJDIR = .# Location of objects
+ ELFDIR = @ELFDIR@# Location of elf objects
+ 
+ #---------------------------------------------------------------------------
+@@ -57,13 +57,13 @@
+ ELF_MINOR_VERSION	= @slang_minor_version@#
+ 
+ CONFIG_H		= config.h
+-ALL_CFLAGS		= $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
++CFLAGS			+= -Dunix $(THIS_LIB_DEFINES)
+ ALL_ELF_CFLAGS		= $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
+ COMPILE_CMD		= $(CC) -c $(ALL_CFLAGS)
+ ELFCOMPILE_CMD		= $(ELF_CC) -c $(ALL_ELF_CFLAGS)
+ ELF_LINK_CMD		= @ELF_LINK_CMD@
+ 
+-NORMAL_LIB = lib$(THIS_LIB).a
++NORMAL_LIB = lib$(THIS_LIB).la
+ OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
+ 
+ ELFLIB = lib$(THIS_LIB).so#
+@@ -90,8 +90,8 @@
+ 
+ $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+ 	-$(RM) $(OBJDIR_NORMAL_LIB)
+-	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
+ 	@echo ""
+ 	@echo $(NORMAL_LIB) created in $(OBJDIR)
+ 
+@@ -115,9 +115,7 @@
+ #---------------------------------------------------------------------------
+ install: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB)
+ 	@echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir)
+-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
+-	$(RANLIB) $(install_lib_dir)/$(NORMAL_LIB)
+-	chmod 644 $(install_lib_dir)/$(NORMAL_LIB)
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir)
+ 	@echo installing slang.h and slcurses.h in $(install_include_dir)
+ 	$(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
+ 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
diff --git a/devel/libslang/patches/patch-ab b/devel/libslang/patches/patch-ab
deleted file mode 100644
index d4fb1166651..00000000000
--- a/devel/libslang/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-*** configure.bak	Tue Jan 21 09:58:15 1997
---- configure	Tue Jan 28 11:16:31 1997
-***************
-*** 1421,1426 ****
---- 1421,1427 ----
-  slang_major_version=`echo $slang_version |
-   awk '{ print $1 - 100 * '$slang_minor_version' }'`
-  echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6
-+ slang_minor_version=`echo $slang_minor_version | tr -d '.'`
-  
-  
-  
diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST
index 42e1db33e18..75d0ed3e2d3 100644
--- a/devel/libslang/pkg/PLIST
+++ b/devel/libslang/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 1998/07/15 11:44:46 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/15 14:16:00 tv Exp $
 lib/libslang.a
-lib/libslang.so.0.9938
-@exec rm -f %D/libslang.so.99.3[348]
+lib/libslang.la
+lib/libslang.so.1.2
 include/slcurses.h
 include/slang.h