ELFization patch.

PR:		ports/8045
Submitted by:	Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>

4 files changed, 101 insertions, 54 deletions

diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 90a5df4bdaa3..529f524b7a7b 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -3,21 +3,21 @@
 # Date created:		23 Jan 1998
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
-# $Id: Makefile,v 1.3 1998/07/04 19:11:58 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/27 00:14:52 steve Exp $
 #
 
-DISTNAME=	tcl8.0p2
-PKGNAME=	ja-tcl-8.0.2
+DISTNAME=	tcl8.0.3
+PKGNAME=	ja-tcl-8.0.3
 CATEGORIES=	japanese lang tcl80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tcl8.0p2jp1.1b0.patch.gz
+PATCHFILES=	tcl8.0.3jp1.1.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 VERSION=	8.0
-TOPDIR=		${WRKDIR}/tcl${VERSION}
+TOPDIR=		${WRKDIR}/${DISTNAME}
 WRKSRC=		${TOPDIR}/unix
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
@@ -46,13 +46,13 @@ post-install:
 		Incompat80jp ${PREFIX}/share/doc/tcl${VERSION}jp; \
 	 )
 .endif
-	@${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@${CAT}	${PKGDIR}/MESSAGE
 
 test:
-	cd ${WRKSRC} && ${MAKE} test
+	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test
 
 install-man:
-	cd ${WRKSRC} && ${MAKE} install-man
+	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
 
 .include <bsd.port.mk>
diff --git a/japanese/tcl80/distinfo b/japanese/tcl80/distinfo
index f19c749a18a1..1ccb5416e343 100644
--- a/japanese/tcl80/distinfo
+++ b/japanese/tcl80/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcl8.0p2.tar.gz) = c1ee11750153717cb8237b830867a0e6
-MD5 (tcl8.0p2jp1.1b0.patch.gz) = 59019d672b86b0e8c5cfaa7a65805e79
+MD5 (tcl8.0.3.tar.gz) = 8c2573cf8dc08354820223168516e11a
+MD5 (tcl8.0.3jp1.1.patch.gz) = 0600118ea3e3fb178438e3a286d2b384
diff --git a/japanese/tcl80/files/patch-aa b/japanese/tcl80/files/patch-aa
index 29d8be5cb9f7..9763c177517c 100644
--- a/japanese/tcl80/files/patch-aa
+++ b/japanese/tcl80/files/patch-aa
@@ -1,32 +1,73 @@
---- configure.in.ORIG	Tue Jan  6 11:51:48 1998
-+++ configure.in	Tue Jan  6 11:52:23 1998
-@@ -9,6 +9,7 @@
- TCL_MINOR_VERSION=0
- TCL_PATCH_LEVEL="p2"
- VERSION=${TCL_VERSION}
-+TCL_L10N=jp
- 
- if test "${prefix}" = "NONE"; then
-     prefix=/usr/local
-@@ -793,7 +794,7 @@
+--- configure.in.ORIG	Sun Sep 20 20:57:48 1998
++++ configure.in	Sun Sep 20 21:00:47 1998
+@@ -811,15 +811,21 @@
+     NetBSD-*|FreeBSD-*|OpenBSD-*)
+ 	# Not available on all versions:  check for include file.
+ 	AC_CHECK_HEADER(dlfcn.h, [
++	# FreeBSD-current supports elf format, now.
++	    if test "X$PORTOBJFORMAT" = "Xelf"; then
++	       SHLIB_LD='${CC} -shared -Wl,-x'
++	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    else
++	       SHLIB_LD="ld -Bshareable -x"
++	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++	    fi
+ 	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_LD="ld -Bshareable -x"
+ 	    SHLIB_LD_LIBS=""
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
--	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
-+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.2'
+-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
  	], [
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1228,5 +1229,6 @@
- AC_SUBST(TCL_SRC_DIR)
- AC_SUBST(TCL_UNSHARED_LIB_SUFFIX)
- AC_SUBST(TCL_VERSION)
-+AC_SUBST(TCL_L10N)
- 
- AC_OUTPUT(Makefile tclConfig.sh)
---- Makefile.in.ORIG	Tue Jan  6 11:51:53 1998
-+++ Makefile.in	Tue Jan  6 11:52:48 1998
-@@ -55,7 +55,9 @@
+@@ -1182,6 +1188,7 @@
+ if test "$TCL_UNSHARED_LIB_SUFFIX" = "" ; then
+     TCL_UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+ fi
++TCL_STATIC_LIB_FILE=""
+ AC_ARG_ENABLE(shared,
+     [  --enable-shared         build libtcl as a shared library],
+     [tcl_ok=$enableval], [tcl_ok=no])
+@@ -1190,10 +1197,15 @@
+     TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+     TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
+     eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
++    eval "TCL_STATIC_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
+     if test "x$DL_OBJS" = "xtclLoadAout.o"; then
+ 	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+     else
+-	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
++        if test "X$PORTOBJFORMAT" = "Xelf"; then
++	   MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} -Wl,-soname,${TCL_LIB_FILE} ${SHLIB_LD_LIBS}"
++	else
++	   MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
++	fi
+ 	RANLIB=":"
+     fi
+ else
+@@ -1234,6 +1246,7 @@
+ # Trick to replace DBGX with TCL_DBGX
+ DBGX='${TCL_DBGX}'
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
++eval "TCL_STATIC_LIB_FILE=${TCL_STATIC_LIB_FILE}"
+ 
+ VERSION='${VERSION}'
+ eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
+@@ -1272,6 +1285,7 @@
+ AC_SUBST(TCL_BUILD_LIB_SPEC)
+ AC_SUBST(TCL_LD_SEARCH_FLAGS)
+ AC_SUBST(TCL_LIB_FILE)
++AC_SUBST(TCL_STATIC_LIB_FILE)
+ AC_SUBST(TCL_LIB_FLAG)
+ AC_SUBST(TCL_LIB_SPEC)
+ AC_SUBST(TCL_LIB_VERSIONS_OK)
+--- Makefile.in.ORIG	Sun Sep 20 20:57:54 1998
++++ Makefile.in	Sun Sep 20 21:01:40 1998
+@@ -55,11 +55,16 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
  # Directory in which to install the include file tcl.h:
@@ -37,17 +78,14 @@
  
  # Top-level directory in which to install manual entries:
  MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-@@ -71,6 +73,9 @@
- # Tcl commands:
- MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
  
 +# Directory in which to install sharedable other documents:
 +DOC_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/share/doc/tcl$(VERSION)
 +
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
- CFLAGS = @CFLAGS@
-@@ -140,7 +145,7 @@
+ # Directory in which to install manual entry for tclsh:
+ MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
+ 
+@@ -151,7 +156,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -56,16 +94,15 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -173,6 +178,8 @@
+@@ -184,6 +189,7 @@
  #BUILD_DLTEST =
  
  TCL_LIB_FILE = @TCL_LIB_FILE@
-+TCL_L10N=@TCL_L10N@
-+TCL_STATIC_LIB_FILE= libtcl@TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@${TCL_L10N}.a
++TCL_STATIC_LIB_FILE= @TCL_STATIC_LIB_FILE@
  #TCL_LIB_FILE = libtcl.a
  
- #----------------------------------------------------------------
-@@ -317,7 +324,11 @@
+ TCL_LIB_FLAG = @TCL_LIB_FLAG@
+@@ -334,7 +340,11 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(KANJI_SRCS)
  
@@ -78,19 +115,22 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -326,6 +337,11 @@
+@@ -342,6 +352,14 @@
+ 	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
- 
++.if ${PORTOBJFORMAT}X == elfX
++	ln -sf ${TCL_LIB_FILE} `echo ${TCL_LIB_FILE} | sed 's/\.so.*$$/.so/'`
++.endif
++
 +${TCL_STATIC_LIB_FILE}: ${OBJS}
 +	rm -f ${TCL_STATIC_LIB_FILE}
 +	ar cr ${TCL_STATIC_LIB_FILE} ${OBJS}	
 +	$(RANLIB) ${TCL_STATIC_LIB_FILE}
-+
+ 
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
- # extensions.  used for the Tcl Plugin.  -- dl
-@@ -411,13 +427,13 @@
+@@ -430,13 +448,13 @@
  	cd dltest; if test -f configure; then ./configure; else \
  	    $(DLTEST_DIR)/configure; fi
  
@@ -106,9 +146,13 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -431,18 +447,23 @@
+@@ -449,19 +467,27 @@
+ 	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
++.if ${PORTOBJFORMAT}X == elfX
++	@(cd $(LIB_INSTALL_DIR); ln -sf ${TCL_LIB_FILE} `echo ${TCL_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
++.endif
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@echo "Installing $(TCL_STATIC_LIB_FILE)"
 +	@$(INSTALL_DATA) $(TCL_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_STATIC_LIB_FILE)
@@ -134,7 +178,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -456,8 +477,15 @@
+@@ -475,8 +501,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -152,7 +196,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -485,30 +513,37 @@
+@@ -504,30 +537,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/japanese/tcl80/pkg-plist b/japanese/tcl80/pkg-plist
index 455da23dae64..2e8321fdca37 100644
--- a/japanese/tcl80/pkg-plist
+++ b/japanese/tcl80/pkg-plist
@@ -1,7 +1,9 @@
 bin/tclsh8.0jp
 lib/libtcl80jp.a
 lib/libtcl80jp.so.1.2
-@exec /sbin/ldconfig -m %B
+lib/libtcl80jp.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/tcl8.0jp/tcl.h
 include/tcl8.0jp/generic/tcl.h
 include/tcl8.0jp/generic/tclCompile.h
@@ -9,6 +11,7 @@ include/tcl8.0jp/generic/tclInt.h
 include/tcl8.0jp/generic/tclMath.h
 include/tcl8.0jp/generic/tclPort.h
 include/tcl8.0jp/generic/tclRegexp.h
+include/tcl8.0jp/generic/tclInitScript.h
 include/tcl8.0jp/unix/tclUnixPort.h
 lib/tcl8.0jp/history.tcl
 lib/tcl8.0jp/init.tcl