Update to 1.4.5.

PR:		ports/36638
Submitted by:	IWASHITA Yoji <shuna@pop16.odn.ne.jp>
No response from:	MAINTAINER

5 files changed, 74 insertions, 69 deletions

diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index b03fe1d545b2..a17c05193646 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -8,14 +8,19 @@
 PORTNAME=	libslang
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese devel
-MASTER_SITES=	http://www.actweb.ne.jp/k-yosino/
-DISTNAME=	slang-${VERSION}jp${JP_VERSION}
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
+DISTNAME=	slang-${VERSION}
+
+PATCH_SITES=	http://www.asmnet.ne.jp/~matubara/src/
+PATCHFILES=	slang-${VERSION}jp${JP_VERSION}.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mega@minz.org
 
-VERSION=	1.4.2
+VERSION=	1.4.5
 JP_VERSION=	0
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
 ALL_TARGET=	all elf
@@ -23,6 +28,6 @@ INSTALL_TARGET=	install-elf
 INSTALLS_SHLIB=	yes
 
 post-install:
-	${CP} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
+	${INSTALL_DATA} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
 
 .include <bsd.port.mk>
diff --git a/japanese/libslang/distinfo b/japanese/libslang/distinfo
index 4befdc0e4b1c..608e91c53e87 100644
--- a/japanese/libslang/distinfo
+++ b/japanese/libslang/distinfo
@@ -1 +1,2 @@
-MD5 (slang-1.4.2jp0.tar.gz) = 9b7ec84155eec235bce4c8d406473eb2
+MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3
+MD5 (slang-1.4.5jp0.patch.gz) = c000d16a895a695663d9f573ea7a383f
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa
index b0cb3e0edc3f..cad6178d2955 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-aa
@@ -1,49 +1,38 @@
---- 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
-   ac_save_LIBS="$LIBS"
--LIBS="-ldl  $LIBS"
-+
- cat > conftest.$ac_ext <<EOF
- #line 1766 "configure"
- #include "confdefs.h"
-@@ -1818,7 +1818,7 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--		DYNAMIC_LINK_LIB="-ldl"
-+		DYNAMIC_LINK_LIB=""
- 		cat >> confdefs.h <<\EOF
- #define HAVE_DLFCN_H 1
- EOF
-@@ -1887,6 +1887,21 @@
-        ELF_DEP_LIBS=
-      fi
+--- configure.orig	Sun Feb 10 16:39:19 2002
++++ configure	Mon Feb 25 01:10:52 2002
+@@ -2032,6 +2032,26 @@
+      ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
+      ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
       ;;
 +  *freebsd* )
-+    if [ "$PORTOBJFORMAT" = elf ]; then
-+      DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
-+      ELF_CC="\$(CC)"
-+      ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+      ELF_LINK="\$(CC) -shared -Wl,-soname#"
-+      ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
-+    else
-+      DYNAMIC_LINK_FLAGS=""
-+      ELF_CC="\$(CC)"
-+      ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+      ELF_LINK="ld -Bshareable -x"
-+      ELF_LINK_CMD="\$(ELF_LINK)"
-+    fi
-+    ;;
++     if [ "$PORTOBJFORMAT" = elf ]; then
++       DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
++       ELF_CC="\$(CC)"
++       ELF_CFLAGS="\$(CFLAGS) -fPIC"
++       ELF_LINK="\$(CC) -shared -Wl,-soname#"
++       ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
++       ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
++       CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC"
++     else
++       # aout format is not tested
++       DYNAMIC_LINK_FLAGS=""
++       ELF_CC="\$(CC)"
++       ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC"
++       ELF_LINK="ld -Bshareable -x"
++       ELF_LINK_CMD="\$(ELF_LINK)"
++       ELF_DEP_LIBS="\$(DL_LIB) -lm -lc"
++       CC_SHARED="\$(CC) \$(CFLAGS) -fpic -DPIC"
++     fi
++     ;;
    * )
      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 }'`
+     ELF_CC="$CC"
+@@ -2432,16 +2452,16 @@
+ 
+ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
+ echo "configure:2435: 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 |
@@ -52,12 +41,20 @@
 - awk '{ print ($1 - $2*10000 - $3*100) }'`
 -
 -slang_minor_version="$slang_minor_version.$slang_mminor_version"
++#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_major_version=2
-+slang_minor_version=4
++slang_minor_version=5
  slang_version="$slang_major_version.$slang_minor_version"
  echo "$ac_t""$slang_version" 1>&6
  
-@@ -2765,18 +2774,5 @@
+@@ -2970,21 +2990,3 @@
  
  
  echo ""
@@ -71,8 +68,11 @@
 -echo " ELF_LINK =" "$ELF_LINK"
 -echo "ELF_CFLAGS=" "$ELF_CFLAGS"
 -echo ""
- echo "Installation Prefix:" "$prefix"
- echo ""
+-echo "                  prefix:" "$prefix"
+-echo "             exec_prefix:" "$exec_prefix"
+-echo "    Installation Lib Dir:" "$libdir"
+-echo "Installation Include Dir:" "$includedir"
+-echo ""
 -echo "See also src/sl-feat.h for various features."
 -echo "Type 'make' to build normal library."
 -echo "On ELF systems, type 'make elf' to create ELF shared library."
diff --git a/japanese/libslang/files/patch-ac b/japanese/libslang/files/patch-ac
index 976b3f8ba6f6..6bf582caeb49 100644
--- a/japanese/libslang/files/patch-ac
+++ b/japanese/libslang/files/patch-ac
@@ -1,15 +1,14 @@
---- 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 @@
+--- autoconf/Makefile.in.orig	Sun Feb 24 19:03:54 2002
++++ autoconf/Makefile.in	Sun Feb 24 19:07:01 2002
+@@ -10,7 +10,6 @@
  	cd src; $(MAKE) all
  elf:
  	cd src; $(MAKE) elf
 -	@echo Use make install-elf to install it.
-+
  runtests:
- 	cd src/test; $(MAKE)
+ 	cd src; $(MAKE) runtests
  demos:
-@@ -23,15 +23,8 @@
+@@ -23,15 +22,8 @@
  	cd src; $(MAKE) install
  install-elf:
  	cd src; $(MAKE) install-elf
diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad
index eb18d4959891..ab5e17f33806 100644
--- a/japanese/libslang/files/patch-ad
+++ b/japanese/libslang/files/patch-ad
@@ -1,27 +1,27 @@
---- 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 @@
+--- src/Makefile.in.orig2	Mon Feb 25 00:59:08 2002
++++ src/Makefile.in	Mon Feb 25 01:06:27 2002
+@@ -38,7 +38,7 @@
  exec_prefix = @exec_prefix@
  install_lib_dir = @libdir@
  install_include_dir = @includedir@
--install_doc_dir = $(prefix)/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
+ MODULE_INSTALL_DIR = @libdir@/slang/modules
  #---------------------------------------------------------------------------
- # Misc commands (safe to leave these untouched)
-@@ -74,7 +74,11 @@
- 
- ELFLIB = lib$(THIS_LIB).so#
- ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)#
+@@ -88,7 +88,11 @@
+ # ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
+ ELFLIB = @ELFLIB@
+ ELFLIB_MAJOR = @ELFLIB_MAJOR@
 +.if ( ${PORTOBJFORMAT} == "aout" )
- ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
+ ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR_MINOR@
 +.else
-+ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)
++ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR@
 +.endif
  
  ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
  
-@@ -108,6 +112,7 @@
+@@ -125,6 +129,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)