Update to 1.4.2jp0.

PR:		ports/20977
Submitted by:	IWASHITA Yoji <shuna@pop16.odn.ne.jp>

5 files changed, 25 insertions, 29 deletions

diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index cce73b44d2a..b03fe1d545b 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -8,13 +8,12 @@
 PORTNAME=	libslang
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese devel
-MASTER_SITES=	http://www.actweb.ne.jp/k-yosino/ \
-		http://home.sprintmail.com/~kikutani/slang/
+MASTER_SITES=	http://www.actweb.ne.jp/k-yosino/
 DISTNAME=	slang-${VERSION}jp${JP_VERSION}
 
 MAINTAINER=	mega@minz.org
 
-VERSION=	1.4.1
+VERSION=	1.4.2
 JP_VERSION=	0
 
 GNU_CONFIGURE=	yes
diff --git a/japanese/libslang/distinfo b/japanese/libslang/distinfo
index b57e0f1da71..4befdc0e4b1 100644
--- a/japanese/libslang/distinfo
+++ b/japanese/libslang/distinfo
@@ -1 +1 @@
-MD5 (slang-1.4.1jp0.tar.gz) = a37bc3e6665286ed03e1abd479e7643e
+MD5 (slang-1.4.2jp0.tar.gz) = 9b7ec84155eec235bce4c8d406473eb2
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa
index 01c931a0430..b0cb3e0edc3 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Thu Apr 27 22:32:55 2000
-+++ configure	Tue Jul 18 10:58:01 2000
+--- configure.orig	Wed Aug 30 19:43:10 2000
++++ configure	Fri Sep  1 05:05:16 2000
 @@ -1760,7 +1760,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -18,15 +18,11 @@
  		cat >> confdefs.h <<\EOF
  #define HAVE_DLFCN_H 1
  EOF
-@@ -1866,11 +1866,19 @@
-     fi
-     ;;
-   * )
--    echo "Note: ELF compiler for host_os=$host_os may be wrong"
--    ELF_CC="\$(CC)"
--    ELF_CFLAGS="\$(CFLAGS) -fPIC"
--    ELF_LINK="\$(CC) -shared"
--    ELF_LINK_CMD="\$(ELF_LINK)"
+@@ -1887,6 +1887,21 @@
+        ELF_DEP_LIBS=
+      fi
+      ;;
++  *freebsd* )
 +    if [ "$PORTOBJFORMAT" = elf ]; then
 +      DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
 +      ELF_CC="\$(CC)"
@@ -40,11 +36,12 @@
 +      ELF_LINK="ld -Bshareable -x"
 +      ELF_LINK_CMD="\$(ELF_LINK)"
 +    fi
- esac
- 
- 
-@@ -2201,14 +2209,8 @@
- echo "configure:2202: checking SLANG_VERSION" >&5
++    ;;
+   * )
+     echo "Note: ELF compiler for host_os=$host_os may be wrong"
+     ELF_CC="\$(CC)"
+@@ -2233,14 +2248,8 @@
+ echo "configure:2234: checking SLANG_VERSION" >&5
  slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
                 awk '{ print $3 }'`
 -slang_major_version=`echo $slang_version |
@@ -56,11 +53,11 @@
 -
 -slang_minor_version="$slang_minor_version.$slang_mminor_version"
 +slang_major_version=2
-+slang_minor_version=3
++slang_minor_version=4
  slang_version="$slang_major_version.$slang_minor_version"
  echo "$ac_t""$slang_version" 1>&6
  
-@@ -2730,18 +2732,5 @@
+@@ -2765,18 +2774,5 @@
  
  
  echo ""
diff --git a/japanese/libslang/files/patch-ac b/japanese/libslang/files/patch-ac
index cf9db4c29ce..976b3f8ba6f 100644
--- a/japanese/libslang/files/patch-ac
+++ b/japanese/libslang/files/patch-ac
@@ -1,5 +1,5 @@
---- autoconf/Makefile.in.orig	Sun Nov 14 15:20:58 1999
-+++ autoconf/Makefile.in	Tue Jul 18 04:53:27 2000
+--- autoconf/Makefile.in.orig	Wed Aug 30 19:43:10 2000
++++ autoconf/Makefile.in	Fri Sep  1 04:03:02 2000
 @@ -10,7 +10,7 @@
  	cd src; $(MAKE) all
  elf:
@@ -15,12 +15,12 @@
  	cd src; $(MAKE) install-elf
 -	@echo ""
 -	@echo "Although not required, consider doing 'make install-links' to extra links"
--	@echo "You will also have to run ldconfig."
+-	@echo "On some systems, e.g., linux, you will also have to run ldconfig."
 -	@echo ""
  install-links:
  	cd src; $(MAKE) install-links
 -	@echo ""
--	@echo "Make sure that you remember to run ldconfig to complete the installation."
+-	@echo "You may also have to run ldconfig to complete the installation."
 -	@echo ""
  #
  distclean:
diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad
index f085eb2f0f1..eb18d495989 100644
--- a/japanese/libslang/files/patch-ad
+++ b/japanese/libslang/files/patch-ad
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Thu Apr 27 22:32:56 2000
-+++ src/Makefile.in	Tue Jul 18 04:54:20 2000
+--- src/Makefile.in.orig	Wed Aug 30 19:43:11 2000
++++ src/Makefile.in	Fri Sep  1 04:37:36 2000
 @@ -36,7 +36,7 @@
  exec_prefix = @exec_prefix@
  install_lib_dir = @libdir@
@@ -21,7 +21,7 @@
  
  ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
  
-@@ -107,6 +111,7 @@
+@@ -108,6 +112,7 @@
  $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
  	-$(RM) $(ELFDIR_ELF_LIB)
  	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)