Cleanup conversion to ELF.

4 files changed, 58 insertions, 179 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index e3651a2e407f..0d05e180f88b 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1998/07/04 17:29:15 jdp Exp $
+# $Id: Makefile,v 1.10 1998/07/27 21:14:50 hoek Exp $
 #
 
 DISTNAME=	tcl8.1a2
@@ -19,8 +19,36 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
+MAN1=	tclsh.1
+MAN3=	AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \
+	BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 CmdCmplt.3 \
+	Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 CrtCommand.3 \
+	CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 CrtSlave.3 \
+	CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 DoOneEvent.3 \
+	DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 ExprLong.3 \
+	ExprLongObj.3 FindExec.3 GetIndex.3 GetInt.3 GetOpnFl.3 GetStdChan.3 \
+	Hash.3 IntObj.3 Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 \
+	ObjectType.3 OpenFileChnl.3 OpenTcp.3 ParseCmd.3  PkgRequire.3 \
+	Preserve.3 PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 \
+	SetErrno.3 SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 \
+	SplitPath.3 StaticPkg.3 StrMatch.3 StringObj.3 Tcl_Main.3 Thread.3 \
+	ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3
+MANN=	Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \
+	catch.n cd.n clock.n close.n concat.n continue.n eof.n error.n eval.n \
+	exec.n exit.n expr.n fblocked.n fconfigure.n fcopy.n file.n \
+	fileevent.n filename.n flush.n for.n foreach.n format.n gets.n glob.n \
+	global.n history.n http.n if.n incr.n info.n interp.n join.n \
+	lappend.n library.n lindex.n linsert.n list.n llength.n load.n \
+	lrange.n lreplace.n lsearch.n lsort.n namespace.n open.n package.n \
+	pid.n pkgMkIndex.n proc.n puts.n pwd.n read.n regexp.n registry.n \
+	regsub.n rename.n resource.n return.n safe.n scan.n seek.n set.n \
+	socket.n source.n split.n string.n subst.n switch.n tclvars.n tell.n \
+	time.n trace.n unknown.n unset.n update.n uplevel.n upvar.n \
+	variable.n vwait.n while.n
+MANCOMPRESSED=	yes
+
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh)
 	${SH} ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
 .endif
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa
index 98007f988d92..c916b97983d6 100644
--- a/lang/tcl84/files/patch-aa
+++ b/lang/tcl84/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Mon Feb 23 20:02:50 1998
-+++ Makefile.in	Sun Aug 23 13:16:18 1998
++++ Makefile.in	Sat Oct  3 15:49:29 1998
 @@ -55,7 +55,9 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -29,7 +29,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -334,7 +336,7 @@
+@@ -334,15 +336,21 @@
  
  SRCS = $(GENERIC_SRCS) $(UNIX_SRCS)
  
@@ -38,8 +38,10 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -343,6 +345,11 @@
+ ${TCL_LIB_FILE}: ${OBJS}
+ 	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
++	ln -sf ${TCL_LIB_FILE} libtcl81.so
  	$(RANLIB) ${TCL_LIB_FILE}
  
 +libtcl81.a: ${OBJS}
@@ -50,7 +52,7 @@
  # 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
-@@ -434,7 +441,7 @@
+@@ -434,7 +442,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -59,8 +61,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -448,18 +455,23 @@
+@@ -446,20 +454,26 @@
+ 	    done;
+ 	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
++	@ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl81.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
 +	@echo "Installing libtcl81.a"
@@ -87,7 +92,7 @@
  		chmod 755 $$i; \
  		else true; \
  		fi; \
-@@ -473,8 +485,15 @@
+@@ -473,8 +487,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -105,7 +110,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -506,30 +525,37 @@
+@@ -506,30 +527,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab
index 9d382306a052..09c7d883dccd 100644
--- a/lang/tcl84/files/patch-ab
+++ b/lang/tcl84/files/patch-ab
@@ -1,13 +1,22 @@
---- configure.orig	Tue Feb 24 02:02:51 1998
-+++ configure	Tue Sep 15 02:45:28 1998
-@@ -4535,7 +4535,11 @@
+--- configure.orig	Mon Feb 23 20:02:51 1998
++++ configure	Sat Oct  3 15:46:42 1998
+@@ -4528,14 +4528,19 @@
+   echo "$ac_t""yes" 1>&6
+   
+ 	    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=""
 +  if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
 +	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
-+    else
++	    SHLIB_LD="ld -shared -x -soname \$@"
++  else
  	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++	    SHLIB_LD="ld -Bshareable -x"
 +  fi
  	
  else
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index e68c86052a67..afb06e2db400 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -11,9 +11,10 @@ include/tcl8.1/generic/tclRegexp.h
 include/tcl8.1/tcl.h
 include/tcl8.1/unix/tclUnixPort.h
 lib/libtcl81.a
+lib/libtcl81.so
 lib/libtcl81.so.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tcl8.1/auto.tcl
 lib/tcl8.1/encoding/ascii.enc
 lib/tcl8.1/encoding/big5.enc
@@ -97,170 +98,6 @@ lib/tcl8.1/tclAppInit.c
 lib/tcl8.1/tclConfig.sh
 lib/tcl8.1/tclIndex
 lib/tcl8.1/word.tcl
-man/man1/tclsh.1.gz
-man/man3/AddErrInfo.3.gz
-man/man3/Alloc.3.gz
-man/man3/AllowExc.3.gz
-man/man3/AppInit.3.gz
-man/man3/AssocData.3.gz
-man/man3/Async.3.gz
-man/man3/BackgdErr.3.gz
-man/man3/Backslash.3.gz
-man/man3/BoolObj.3.gz
-man/man3/ByteArrObj.3.gz
-man/man3/CallDel.3.gz
-man/man3/CmdCmplt.3.gz
-man/man3/Concat.3.gz
-man/man3/CrtChannel.3.gz
-man/man3/CrtChnlHdlr.3.gz
-man/man3/CrtCloseHdlr.3.gz
-man/man3/CrtCommand.3.gz
-man/man3/CrtFileHdlr.3.gz
-man/man3/CrtInterp.3.gz
-man/man3/CrtMathFnc.3.gz
-man/man3/CrtObjCmd.3.gz
-man/man3/CrtSlave.3.gz
-man/man3/CrtTimerHdlr.3.gz
-man/man3/CrtTrace.3.gz
-man/man3/DString.3.gz
-man/man3/DetachPids.3.gz
-man/man3/DoOneEvent.3.gz
-man/man3/DoWhenIdle.3.gz
-man/man3/DoubleObj.3.gz
-man/man3/Encoding.3.gz
-man/man3/Eval.3.gz
-man/man3/Exit.3.gz
-man/man3/ExprLong.3.gz
-man/man3/ExprLongObj.3.gz
-man/man3/FindExec.3.gz
-man/man3/GetIndex.3.gz
-man/man3/GetInt.3.gz
-man/man3/GetOpnFl.3.gz
-man/man3/GetStdChan.3.gz
-man/man3/Hash.3.gz
-man/man3/IntObj.3.gz
-man/man3/Interp.3.gz
-man/man3/LinkVar.3.gz
-man/man3/ListObj.3.gz
-man/man3/Notifier.3.gz
-man/man3/Object.3.gz
-man/man3/ObjectType.3.gz
-man/man3/OpenFileChnl.3.gz
-man/man3/OpenTcp.3.gz
-man/man3/ParseCmd.3.gz
-man/man3/PkgRequire.3.gz
-man/man3/Preserve.3.gz
-man/man3/PrintDbl.3.gz
-man/man3/RecEvalObj.3.gz
-man/man3/RecordEval.3.gz
-man/man3/RegExp.3.gz
-man/man3/SaveResult.3.gz
-man/man3/SetErrno.3.gz
-man/man3/SetRecLmt.3.gz
-man/man3/SetResult.3.gz
-man/man3/SetVar.3.gz
-man/man3/Sleep.3.gz
-man/man3/SplitList.3.gz
-man/man3/SplitPath.3.gz
-man/man3/StaticPkg.3.gz
-man/man3/StrMatch.3.gz
-man/man3/StringObj.3.gz
-man/man3/Tcl_Main.3.gz
-man/man3/Thread.3.gz
-man/man3/ToUpper.3.gz
-man/man3/TraceVar.3.gz
-man/man3/Translate.3.gz
-man/man3/UpVar.3.gz
-man/man3/Utf.3.gz
-man/man3/WrongNumArgs.3.gz
-man/mann/Tcl.n.gz
-man/mann/after.n.gz
-man/mann/append.n.gz
-man/mann/array.n.gz
-man/mann/bgerror.n.gz
-man/mann/binary.n.gz
-man/mann/break.n.gz
-man/mann/case.n.gz
-man/mann/catch.n.gz
-man/mann/cd.n.gz
-man/mann/clock.n.gz
-man/mann/close.n.gz
-man/mann/concat.n.gz
-man/mann/continue.n.gz
-man/mann/eof.n.gz
-man/mann/error.n.gz
-man/mann/eval.n.gz
-man/mann/exec.n.gz
-man/mann/exit.n.gz
-man/mann/expr.n.gz
-man/mann/fblocked.n.gz
-man/mann/fconfigure.n.gz
-man/mann/fcopy.n.gz
-man/mann/file.n.gz
-man/mann/fileevent.n.gz
-man/mann/filename.n.gz
-man/mann/flush.n.gz
-man/mann/for.n.gz
-man/mann/foreach.n.gz
-man/mann/format.n.gz
-man/mann/gets.n.gz
-man/mann/glob.n.gz
-man/mann/global.n.gz
-man/mann/history.n.gz
-man/mann/http.n.gz
-man/mann/if.n.gz
-man/mann/incr.n.gz
-man/mann/info.n.gz
-man/mann/interp.n.gz
-man/mann/join.n.gz
-man/mann/lappend.n.gz
-man/mann/library.n.gz
-man/mann/lindex.n.gz
-man/mann/linsert.n.gz
-man/mann/list.n.gz
-man/mann/llength.n.gz
-man/mann/load.n.gz
-man/mann/lrange.n.gz
-man/mann/lreplace.n.gz
-man/mann/lsearch.n.gz
-man/mann/lsort.n.gz
-man/mann/namespace.n.gz
-man/mann/open.n.gz
-man/mann/package.n.gz
-man/mann/pid.n.gz
-man/mann/pkgMkIndex.n.gz
-man/mann/proc.n.gz
-man/mann/puts.n.gz
-man/mann/pwd.n.gz
-man/mann/read.n.gz
-man/mann/regexp.n.gz
-man/mann/registry.n.gz
-man/mann/regsub.n.gz
-man/mann/rename.n.gz
-man/mann/resource.n.gz
-man/mann/return.n.gz
-man/mann/safe.n.gz
-man/mann/scan.n.gz
-man/mann/seek.n.gz
-man/mann/set.n.gz
-man/mann/socket.n.gz
-man/mann/source.n.gz
-man/mann/split.n.gz
-man/mann/string.n.gz
-man/mann/subst.n.gz
-man/mann/switch.n.gz
-man/mann/tclvars.n.gz
-man/mann/tell.n.gz
-man/mann/time.n.gz
-man/mann/trace.n.gz
-man/mann/unknown.n.gz
-man/mann/unset.n.gz
-man/mann/update.n.gz
-man/mann/uplevel.n.gz
-man/mann/upvar.n.gz
-man/mann/variable.n.gz
-man/mann/vwait.n.gz
-man/mann/while.n.gz
 @dirrm include/tcl8.1/generic
 @dirrm include/tcl8.1/unix
 @dirrm include/tcl8.1