Update to version 1.3.10.

PR:		15735
Submitted by:	maintainer

4 files changed, 55 insertions, 67 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 82addade7b83..133b52a351f7 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:    S-Lang library
-# Version required:     0.99-38
+# Version required:     1.3.10
 # Date created:         11 July 1996
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slang1.2.2
-PKGNAME=	libslang-1.2.2
+DISTNAME=	slang-1.3.10
+PKGNAME=	libslang-1.3.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.2/
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.3/
 
-MAINTAINER=	xaa@xaa.iae.nl
+MAINTAINER=	xaa+ports@timewasters.nl
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/slang
+#WRKSRC=		${WRKDIR}/slang
 
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install install-elf
diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo
index 96c3a56f3417..609c1c6a44e5 100644
--- a/devel/libslang/distinfo
+++ b/devel/libslang/distinfo
@@ -1 +1 @@
-MD5 (slang1.2.2.tar.gz) = f0b71a8f9c6f2ccef07eaaa4068b3d1e
+MD5 (slang-1.3.10.tar.bz2) = 884d276a366cd634583ed3190ae737a3
diff --git a/devel/libslang/files/patch-aa b/devel/libslang/files/patch-aa
index 5660d068dff3..14078aca6cc8 100644
--- a/devel/libslang/files/patch-aa
+++ b/devel/libslang/files/patch-aa
@@ -1,11 +1,47 @@
---- src/sltermin.c.orig	Sun Jul 26 15:57:36 1998
-+++ src/sltermin.c	Sun Jul 26 15:58:06 1998
-@@ -273,7 +273,7 @@
-      {
- 	tidir = Terminfo_Dirs[i];
- 	if ((tidir != NULL)
--	    && (sizeof (file) > strlen (tidir) + 2 + strlen (term)))
-+	    && (sizeof (file) > strlen (tidir) + 3 + strlen (term)))
- 	  {
- 	     sprintf (file, "%s/%c/%s", tidir, *term, term);
- 	     if (NULL != (fp = open_terminfo (file, ti)))
+--- configure.orig	Sun Nov 14 07:20:57 1999
++++ configure	Thu Dec 23 11:26:42 1999
+@@ -2152,33 +2152,24 @@
+ 
+ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
+ echo "configure:2155: checking SLANG_VERSION" >&5
+-slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
+-               awk '{ print $3 }'`
+-slang_major_version=`echo $slang_version |
+- awk '{ print int($1/10000) }'`
+-slang_minor_version=`echo $slang_version $slang_major_version |
+- awk '{ print int(($1 - $2*10000)/100) }'`
+-slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
+- awk '{ print ($1 - $2*10000 - $3*100) }'`
+-
+-slang_minor_version="$slang_minor_version.$slang_mminor_version"
+-slang_version="$slang_major_version.$slang_minor_version"
++slang_major_version=1
++slang_minor_version=3
+ echo "$ac_t""$slang_version" 1>&6
+ 
+ 
+ 
+ 
+ 
+-if test "$GCC" = yes; then
+-  ELF_CC="gcc"
+-  ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC"
+-  ELF_LINK="gcc -shared -Wl,-soname#"
+-  ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
++if [ $PORTOBJFORMAT = elf ]; then
++ELF_CC="\$(CC)"
++ELF_CFLAGS="\$(CFLAGS) -fPIC"
++ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
++ELF_LINK_CMD="\$(ELF_LINK)"
+ else
+-  ELF_CC="cc"
+-  ELF_CFLAGS="-K pic"
+-  ELF_LINK="ld -G -z text"
+-  ELF_LINK_CMD="\$(ELF_LINK)"
++ELF_CC="\$(CC)"
++ELF_CFLAGS="\$(CFLAGS) -fPIC"
++ELF_LINK="ld -Bshareable -x"
++ELF_LINK_CMD="\$(ELF_LINK)"
+ fi
+ 
+ 
diff --git a/devel/libslang/files/patch-ad b/devel/libslang/files/patch-ad
index ef8ddd3c7960..81f024ae10dd 100644
--- a/devel/libslang/files/patch-ad
+++ b/devel/libslang/files/patch-ad
@@ -1,52 +1,3 @@
---- configure.orig	Fri Apr 24 01:16:57 1998
-+++ configure	Tue Sep 22 16:11:04 1998
-@@ -1489,35 +1489,25 @@
- 
- echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
- echo "configure:1492: checking SLANG_VERSION" >&5
--slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
--               awk '{ print $3 }'`
--slang_major_version=`echo $slang_version |
-- awk '{ print int($1/10000) }'`
--slang_minor_version=`echo $slang_version $slang_major_version |
-- awk '{ print int(($1 - $2*10000)/100) }'`
--slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
-- awk '{ print ($1 - $2*10000 - $3*100) }'`
--
--slang_minor_version=$slang_minor_version.$slang_mminor_version
-+slang_major_version=1
-+slang_minor_version=3
- echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6
- 
- 
- 
- 
- 
--if test "$GCC" = yes; then
--  ELF_CC="gcc"
--  ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC"
--  ELF_LINK="gcc -shared -Wl,-soname#"
--  ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
-+if [ $PORTOBJFORMAT = elf ]; then
-+ELF_CC="\$(CC)"
-+ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
-+ELF_LINK_CMD="\$(ELF_LINK)"
- else
--  ELF_CC="cc"
--  ELF_CFLAGS="-K pic"
--  ELF_LINK="ld -G -z text"
--  ELF_LINK_CMD="\$(ELF_LINK)"
-+ELF_CC="\$(CC)"
-+ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+ELF_LINK="ld -Bshareable -x"
-+ELF_LINK_CMD="\$(ELF_LINK)"
- fi
--
--
- 
- 
- 
 --- src/Makefile.in	Fri Apr 24 01:17:04 1998
 +++ /tmp/Makefile.in	Tue Sep 22 15:45:26 1998
 @@ -68,7 +68,11 @@