Update to version 1.4.3

PR: 24850
Submitted by: MAINTAINER

5 files changed, 33 insertions, 42 deletions

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index d6ff2057c73e..5c74f8c67522 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libslang
-PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
 DISTNAME=	slang-${PORTVERSION}
@@ -17,7 +16,6 @@ MAINTAINER=	xaa+ports@madison-gurkha.com
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-#WRKSRC=		${WRKDIR}/slang
 
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install install-elf
diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo
index 4095b3f6c479..72f433b525f1 100644
--- a/devel/libslang/distinfo
+++ b/devel/libslang/distinfo
@@ -1 +1 @@
-MD5 (slang-1.4.2.tar.bz2) = 9dcc099578608b4ec12836ed4e2f0c0a
+MD5 (slang-1.4.3.tar.bz2) = 3ccadbb4fbd8154049f4c73dab899d92
diff --git a/devel/libslang/files/patch-aa b/devel/libslang/files/patch-aa
index 6527bcf36932..fa14c0c591da 100644
--- a/devel/libslang/files/patch-aa
+++ b/devel/libslang/files/patch-aa
@@ -1,32 +1,26 @@
---- configure.orig	Sun Aug 20 11:20:18 2000
-+++ configure	Sat Jan  6 09:57:40 2001
-@@ -1753,14 +1753,13 @@
- fi
- 
+--- ./configure.orig	Sat Feb  3 22:08:12 2001
++++ configure	Sun Feb  4 21:07:52 2001
+@@ -1833,8 +1833,8 @@
+ #define HAVE_DLFCN_H 1
+ EOF
  
--echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:1758: checking for dlopen in -ldl" >&5
-+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-+echo "configure:1758: checking for dlopen" >&5
+-  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1838: checking for dlopen in -ldl" >&5
++  echo $ac_n "checking for dlopenl""... $ac_c" 1>&6
++echo "configure:1838: checking for dlopen" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1766 "configure"
- #include "confdefs.h"
-@@ -1818,7 +1817,7 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+@@ -1869,7 +1869,7 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    
--		DYNAMIC_LINK_LIB="-ldl"
-+		DYNAMIC_LINK_LIB=""
- 		cat >> confdefs.h <<\EOF
- #define HAVE_DLFCN_H 1
+-    DYNAMIC_LINK_LIB="-ldl"
++    DYNAMIC_LINK_LIB=""
+     cat >> confdefs.h <<\EOF
+ #define HAVE_DLOPEN 1
  EOF
-@@ -1906,6 +1905,19 @@
+@@ -2046,6 +2046,19 @@
        IEEE_CFLAGS="-ieee_with_no_inexact"
      fi
      ;;
@@ -46,10 +40,10 @@
    * )
      IEEE_CFLAGS=""
  esac
-@@ -2231,16 +2243,8 @@
+@@ -2408,16 +2421,8 @@
  
  echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
- echo "configure:2234: checking SLANG_VERSION" >&5
+ echo "configure:2411: checking SLANG_VERSION" >&5
 -slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
 -               awk '{ print $3 }'`
 -slang_major_version=`echo $slang_version |
@@ -61,7 +55,7 @@
 -
 -slang_minor_version="$slang_minor_version.$slang_mminor_version"
 +slang_major_version=1
-+slang_minor_version=4
++slang_miner_version=4
  slang_version="$slang_major_version.$slang_minor_version"
  echo "$ac_t""$slang_version" 1>&6
  
diff --git a/devel/libslang/files/patch-ae b/devel/libslang/files/patch-ae
index 189d47c34383..80bbaeca8f17 100644
--- a/devel/libslang/files/patch-ae
+++ b/devel/libslang/files/patch-ae
@@ -4,8 +4,8 @@
  exec_prefix = @exec_prefix@
  install_lib_dir = @libdir@
  install_include_dir = @includedir@
--install_doc_dir = $(prefix)/doc/slang/@slang_version@
-+install_doc_dir = $(prefix)/share/doc/slang/@slang_version@
+-install_doc_dir = $(prefix)/doc/slang
++install_doc_dir = $(prefix)/share/doc/slang
  DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
  #---------------------------------------------------------------------------
  # Misc commands (safe to leave these untouched)
diff --git a/devel/libslang/pkg-plist b/devel/libslang/pkg-plist
index 7121a3394668..5c20fad21a5a 100644
--- a/devel/libslang/pkg-plist
+++ b/devel/libslang/pkg-plist
@@ -3,15 +3,14 @@ include/slcurses.h
 lib/libslang.a
 lib/libslang.so
 lib/libslang.so.1.4
-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
+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
 @dirrm share/doc/slang