4 files changed, 42 insertions, 47 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 133b52a351f7..802f5fa37598 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    S-Lang library
-# Version required:     1.3.10
+# Version required:     1.4.0
 # Date created:         11 July 1996
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slang-1.3.10
-PKGNAME=	libslang-1.3.10
+DISTNAME=	slang-1.4.0
+PKGNAME=	libslang-1.4.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.3/
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
 
 MAINTAINER=	xaa+ports@timewasters.nl
 
diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo
index 609c1c6a44e5..04cf840e509d 100644
--- a/devel/libslang/distinfo
+++ b/devel/libslang/distinfo
@@ -1 +1 @@
-MD5 (slang-1.3.10.tar.bz2) = 884d276a366cd634583ed3190ae737a3
+MD5 (slang-1.4.0.tar.bz2) = 2d450be2e24a035e4bac2ed185b8c09c
diff --git a/devel/libslang/files/patch-aa b/devel/libslang/files/patch-aa
index 14078aca6cc8..024cb5ccd1cb 100644
--- a/devel/libslang/files/patch-aa
+++ b/devel/libslang/files/patch-aa
@@ -1,9 +1,29 @@
---- configure.orig	Sun Nov 14 07:20:57 1999
-+++ configure	Thu Dec 23 11:26:42 1999
-@@ -2152,33 +2152,24 @@
+--- configure.orig	Sun Jan  9 20:38:14 2000
++++ configure	Wed Feb  9 16:18:35 2000
+@@ -1865,6 +1865,19 @@
+       ELF_LINK_CMD="\$(ELF_LINK)\$(ELFLIB_MAJOR)"
+     fi
+     ;;
++  *freebsd* )
++    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="\$(CFLAGS) -fPIC"
++      ELF_LINK="ld -Bshareable -x"
++      ELF_LINK_CMD="\$(ELF_LINK)"
++    fi
++    ;;
+   * )
+     echo "Note: ELF compiler for host_os=$host_os may be wrong"
+     ELF_CC="\$(CC)"
+@@ -2181,16 +2194,8 @@
  
  echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
- echo "configure:2155: checking SLANG_VERSION" >&5
+ echo "configure:2184: checking SLANG_VERSION" >&5
 -slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
 -               awk '{ print $3 }'`
 -slang_major_version=`echo $slang_version |
@@ -14,34 +34,8 @@
 - 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
++slang_minor_version=4
+ slang_version="$slang_major_version.$slang_minor_version"
  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/pkg-plist b/devel/libslang/pkg-plist
index d2122daaeb36..7ce3c9932f3a 100644
--- a/devel/libslang/pkg-plist
+++ b/devel/libslang/pkg-plist
@@ -5,14 +5,15 @@ lib/libslang.so
 lib/libslang.so.1.3
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-share/doc/slang/COPYING
-share/doc/slang/COPYING.ART
-share/doc/slang/COPYING.GPL
-share/doc/slang/COPYRIGHT
-share/doc/slang/changes.txt
-share/doc/slang/cref.txt
-share/doc/slang/cslang.txt
-share/doc/slang/slang.txt
-share/doc/slang/slangdoc.html
-share/doc/slang/slangfun.txt
+share/doc/slang/1.4/COPYING
+share/doc/slang/1.4/COPYING.ART
+share/doc/slang/1.4/COPYING.GPL
+share/doc/slang/1.4/COPYRIGHT
+share/doc/slang/1.4/changes.txt
+share/doc/slang/1.4/cref.txt
+share/doc/slang/1.4/cslang.txt
+share/doc/slang/1.4/slang.txt
+share/doc/slang/1.4/slangdoc.html
+share/doc/slang/1.4/slangfun.txt
+@dirrm share/doc/slang/1.4
 @dirrm share/doc/slang