Update to 1.4.5.j2.

Hand the maintainership over to the submitter.

PR:		ports/38037
Submitted by:	IWASHITA Yoji <shuna@pop16.odn.ne.jp>
Approved by:	mega@minz.org (ex-MAINTAINER)

5 files changed, 56 insertions, 84 deletions

diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index a17c05193646..d2a240801be3 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -8,19 +8,14 @@
 PORTNAME=	libslang
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese devel
-MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/
-DISTNAME=	slang-${VERSION}
+MASTER_SITES=	http://www.actweb.ne.jp/k-yosino/
+DISTNAME=	slang-${VERSION}jp${JP_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
+MAINTAINER=	shuna@pop16.odn.ne.jp
 
 VERSION=	1.4.5
-JP_VERSION=	0
+JP_VERSION=	2
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
 ALL_TARGET=	all elf
diff --git a/japanese/libslang/distinfo b/japanese/libslang/distinfo
index 608e91c53e87..3f4d5f4ec52f 100644
--- a/japanese/libslang/distinfo
+++ b/japanese/libslang/distinfo
@@ -1,2 +1 @@
-MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3
-MD5 (slang-1.4.5jp0.patch.gz) = c000d16a895a695663d9f573ea7a383f
+MD5 (slang-1.4.5jp2.tar.gz) = 17ece81aff09c0c38369c6952d829985
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa
index cad6178d2955..f58a3046be8e 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-aa
@@ -1,33 +1,59 @@
---- configure.orig	Sun Feb 10 16:39:19 2002
-+++ configure	Mon Feb 25 01:10:52 2002
-@@ -2032,6 +2032,26 @@
+--- configure.orig	Thu Feb 21 20:10:02 2002
++++ configure	Tue May  7 00:40:04 2002
+@@ -1832,8 +1832,8 @@
+ #define HAVE_DLFCN_H 1
+ EOF
+ 
+-  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1837: checking for dlopen in -ldl" >&5
++  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "configure:1837: 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
+@@ -1868,7 +1868,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_DLOPEN 1
+ EOF
+@@ -1943,7 +1943,11 @@
+ 
+ ELFLIB="lib\$(THIS_LIB).so"
+ ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
+-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
++if test $PORTOBJFORMAT = elf; then
++  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
++else
++  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
++fi
+ 
+ case "$host_os" in
+   *linux* )
+@@ -2032,6 +2036,19 @@
       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"
++     if [ $PORTOBJFORMAT = elf ]; then
 +       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"
++       ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
++       ELF_LINK_CMD="\$(ELF_LINK)"
 +     else
-+       # aout format is not tested
-+       DYNAMIC_LINK_FLAGS=""
 +       ELF_CC="\$(CC)"
-+       ELF_CFLAGS="\$(CFLAGS) -fpic -DPIC"
++       ELF_CFLAGS="\$(CFLAGS) -fPIC"
 +       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"
-@@ -2432,16 +2452,16 @@
+@@ -2432,16 +2449,8 @@
  
  echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6
  echo "configure:2435: checking SLANG_VERSION" >&5
@@ -41,38 +67,8 @@
 - 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=5
  slang_version="$slang_major_version.$slang_minor_version"
  echo "$ac_t""$slang_version" 1>&6
  
-@@ -2970,21 +2990,3 @@
- 
- 
- 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 "                  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 6bf582caeb49..0cad8f4278af 100644
--- a/japanese/libslang/files/patch-ac
+++ b/japanese/libslang/files/patch-ac
@@ -1,14 +1,15 @@
---- 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 @@
+--- autoconf/Makefile.in.orig	Thu Feb 21 20:10:02 2002
++++ autoconf/Makefile.in	Tue May  7 00:56:06 2002
+@@ -10,7 +10,7 @@
  	cd src; $(MAKE) all
  elf:
  	cd src; $(MAKE) elf
 -	@echo Use make install-elf to install it.
++
  runtests:
  	cd src; $(MAKE) runtests
  demos:
-@@ -23,15 +22,8 @@
+@@ -23,15 +23,7 @@
  	cd src; $(MAKE) install
  install-elf:
  	cd src; $(MAKE) install-elf
@@ -16,11 +17,12 @@
 -	@echo "Although not required, consider doing 'make install-links' to extra links"
 -	@echo "On some systems, e.g., linux, you will also have to run ldconfig."
 -	@echo ""
- install-links:
- 	cd src; $(MAKE) install-links
+-install-links:
+-	cd src; $(MAKE) install-links
 -	@echo ""
 -	@echo "You may also have to run ldconfig to complete the installation."
 -	@echo ""
++
  #
  distclean:
  	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck
diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad
index ab5e17f33806..f96e37084d4a 100644
--- a/japanese/libslang/files/patch-ad
+++ b/japanese/libslang/files/patch-ad
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig2	Mon Feb 25 00:59:08 2002
-+++ src/Makefile.in	Mon Feb 25 01:06:27 2002
+--- src/Makefile.in.orig	Tue May  7 00:20:07 2002
++++ src/Makefile.in	Tue May  7 00:21:34 2002
 @@ -38,7 +38,7 @@
  exec_prefix = @exec_prefix@
  install_lib_dir = @libdir@
@@ -9,23 +9,3 @@
  DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
  MODULE_INSTALL_DIR = @libdir@/slang/modules
  #---------------------------------------------------------------------------
-@@ -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_MAJOR_MINOR@
-+.else
-+ELFLIB_MAJOR_MINOR = @ELFLIB_MAJOR@
-+.endif
- 
- ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
- 
-@@ -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)
-+	cd $(ELFDIR); strip $(ELFLIB_MAJOR_MINOR)
- 	cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
- 	@echo ""
- 	@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).