5 files changed, 118 insertions, 88 deletions

diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index 1e6edd66f0ca..42a1f72486c5 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -1,19 +1,25 @@
 # New ports collection makefile for:	ja-S-lang library
-# Version required:	1.3.8_j067
+# Version required:	1.4.0jp0
 # Date created:		3 September 1999
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slang-1.3.8__J067
-PKGNAME=	ja-libslang-1.3.8.j067.1
+DISTNAME=	slang-1.3.10jp0-20000123
+PKGNAME=	ja-libslang-1.4.0.j0
 CATEGORIES=	japanese devel
-MASTER_SITES=	http://home.sprintmail.com/~kikutani/slang/
+MASTER_SITES=	http://home.sprintmail.com/~kikutani/slang/ \
+		http://www.actweb.ne.jp/k-yosino/
+
+PATCH_SITES=	http://www.actweb.ne.jp/k-yosino/
+PATCHFILES=	1.3.10jp0__1.4.0jp0.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mega@minz.org
 
 GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/slang-1.3.10jp0
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install-elf
diff --git a/japanese/libslang/distinfo b/japanese/libslang/distinfo
index 8ab2656e41b0..3d3fa385b061 100644
--- a/japanese/libslang/distinfo
+++ b/japanese/libslang/distinfo
@@ -1 +1,2 @@
-MD5 (slang-1.3.8__J067.tar.gz) = 3e1d4b4d35d479091fb3f6a876433d8b
+MD5 (slang-1.3.10jp0-20000123.tar.gz) = fc93176df905affcd201a5d13b9259ba
+MD5 (1.3.10jp0__1.4.0jp0.diff.gz) = 545e71f0c39e51b98b08e4036cf7ab83
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa
index 1bae81a23617..e53637717080 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-aa
@@ -1,8 +1,75 @@
-*** configure.orig	Wed Jul 14 05:30:30 1999
---- configure	Fri Sep  3 04:10:29 1999
+*** configure.orig	Thu Feb  3 05:30:44 2000
+--- configure	Sat Feb  5 01:22:00 2000
 ***************
-*** 2025,2038 ****
-  echo "configure:2026: checking SLANG_VERSION" >&5
+*** 1760,1766 ****
+    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"
+--- 1760,1766 ----
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_save_LIBS="$LIBS"
+! 
+  cat > conftest.$ac_ext <<EOF
+  #line 1766 "configure"
+  #include "confdefs.h"
+***************
+*** 1818,1824 ****
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+    
+! 		DYNAMIC_LINK_LIB="-ldl"
+  		cat >> confdefs.h <<\EOF
+  #define HAVE_DLFCN_H 1
+  EOF
+--- 1818,1824 ----
+  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+    
+! 		DYNAMIC_LINK_LIB=""
+  		cat >> confdefs.h <<\EOF
+  #define HAVE_DLFCN_H 1
+  EOF
+***************
+*** 1866,1876 ****
+      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)"
+  esac
+  
+  
+--- 1866,1884 ----
+      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)"
+!     else
+!       DYNAMIC_LINK_FLAGS=""
+!       ELF_CC="\$(CC)"
+!       ELF_CFLAGS="\$(CFLAGS) -fPIC"
+!       ELF_LINK="ld -Bshareable -x"
+!       ELF_LINK_CMD="\$(ELF_LINK)"
+!     fi
+  esac
+  
+  
+***************
+*** 2183,2196 ****
+  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 |
@@ -16,84 +83,33 @@
   slang_version="$slang_major_version.$slang_minor_version"
   echo "$ac_t""$slang_version" 1>&6
   
---- 2025,2032 ----
-  echo "configure:2026: checking SLANG_VERSION" >&5
+--- 2191,2198 ----
+  echo "configure:2184: checking SLANG_VERSION" >&5
   slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
                  awk '{ print $3 }'`
 ! slang_major_version=2
-! slang_minor_version=1
+! slang_minor_version=2
   slang_version="$slang_major_version.$slang_minor_version"
   echo "$ac_t""$slang_version" 1>&6
   
 ***************
-*** 2040,2054 ****
-  
-  
-  
-! 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)"
-  else
-!   ELF_CC="cc"
-!   ELF_CFLAGS="-K pic"
-!   ELF_LINK="ld -G -z text"
-    ELF_LINK_CMD="\$(ELF_LINK)"
-  fi
-  
---- 2034,2048 ----
-  
-  
-  
-! 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
-  
-***************
-*** 2569,2586 ****
-  
-  
-  echo ""
-! echo "Configuration complete.  You may need to edit src/Makefile."
-! echo "You are compiling SLANG with the following compiler configuration:"
-! echo "       CC =" "$CC"
-! echo "   CFLAGS =" "$CFLAGS"
-! echo "  LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS"
-! echo ""
-! echo "   ELF_CC =" "$ELF_CC"
-! echo " ELF_LINK =" "$ELF_LINK"
-! echo "ELF_CFLAGS=" "$ELF_CFLAGS"
-! echo ""
-  echo "Installation Prefix:" "$prefix"
-  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."
---- 2563,2580 ----
+*** 2712,2729 ****
   
   
   echo ""
-! #echo "Configuration complete.  You may need to edit src/Makefile."
-! #echo "You are compiling SLANG with the following compiler configuration:"
-! #echo "       CC =" "$CC"
-! #echo "   CFLAGS =" "$CFLAGS"
-! #echo "  LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS"
-! #echo ""
-! #echo "   ELF_CC =" "$ELF_CC"
-! #echo " ELF_LINK =" "$ELF_LINK"
-! #echo "ELF_CFLAGS=" "$ELF_CFLAGS"
-! #echo ""
+- echo "Configuration complete.  You may need to edit src/Makefile."
+- echo "You are compiling SLANG with the following compiler configuration:"
+- echo "       CC =" "$CC"
+- echo "   CFLAGS =" "$CFLAGS"
+- echo "  LDFLAGS =" "$LDFLAGS $DYNAMIC_LINK_FLAGS"
+- echo ""
+- echo "   ELF_CC =" "$ELF_CC"
+- echo " ELF_LINK =" "$ELF_LINK"
+- echo "ELF_CFLAGS=" "$ELF_CFLAGS"
+- echo ""
   echo "Installation Prefix:" "$prefix"
   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."
+- 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."
+--- 2714,2718 ----
diff --git a/japanese/libslang/files/patch-ac b/japanese/libslang/files/patch-ac
index a10a10967c64..33bdbd892bcd 100644
--- a/japanese/libslang/files/patch-ac
+++ b/japanese/libslang/files/patch-ac
@@ -1,15 +1,22 @@
-*** autoconf/Makefile.in.orig	Wed Jul 14 05:30:30 1999
---- autoconf/Makefile.in	Fri Sep  3 03:54:21 1999
+*** autoconf/Makefile.in.orig	Sun Nov 14 15:20:58 1999
+--- autoconf/Makefile.in	Thu Feb  3 04:09:19 2000
 ***************
 *** 10,16 ****
   	cd src; $(MAKE) all
   elf:
   	cd src; $(MAKE) elf
-- 	@echo Use make install-elf to install it.
+! 	@echo Use make install-elf to install it.
+  runtests:
+  	cd src/test; $(MAKE)
+  demos:
+--- 10,16 ----
+  	cd src; $(MAKE) all
+  elf:
+  	cd src; $(MAKE) elf
+! 
   runtests:
   	cd src/test; $(MAKE)
   demos:
---- 10,15 ----
 ***************
 *** 23,37 ****
   	cd src; $(MAKE) install
@@ -27,4 +34,4 @@
   #
   distclean:
   	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck
---- 22,29 ----
+--- 23,30 ----
diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad
index a4c26a605c03..d207b6f46c33 100644
--- a/japanese/libslang/files/patch-ad
+++ b/japanese/libslang/files/patch-ad
@@ -1,5 +1,5 @@
-*** src/Makefile.in.orig	Mon Jul 19 21:28:29 1999
---- src/Makefile.in	Fri Sep  3 04:26:09 1999
+*** src/Makefile.in.orig	Thu Feb  3 03:25:50 2000
+--- src/Makefile.in	Thu Feb  3 04:15:43 2000
 ***************
 *** 36,42 ****
   exec_prefix = @exec_prefix@
@@ -26,14 +26,14 @@
 + .if ( ${PORTOBJFORMAT} == "aout" )
   ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)#
 + .else
-+ ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)#
++ ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)
 + .endif
   
   ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
   
 ***************
-*** 106,111 ****
---- 110,116 ----
+*** 107,112 ****
+--- 111,117 ----
   $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
   	-$(RM) $(ELFDIR_ELF_LIB)
   	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)