Convert to ELF.

2 files changed, 27 insertions, 14 deletions

diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa
index 57f233194fad..04df1b4db329 100644
--- a/x11-toolkits/tkstep80/files/patch-aa
+++ b/x11-toolkits/tkstep80/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Tue Dec  2 10:36:23 1997
-+++ configure	Tue Dec  2 11:23:24 1997
+--- configure.orig	Sun Oct  4 13:14:37 1998
++++ configure	Sun Oct  4 13:26:21 1998
 @@ -877,14 +877,14 @@
    withval="$with_tcl"
    TCL_BIN_DIR=$withval
@@ -27,16 +27,23 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -2423,7 +2425,7 @@
+@@ -2428,8 +2430,13 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
 -    eval "TK_LIB_FILE=libtkstep${TCL_SHARED_LIB_SUFFIX}"
-+    eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1.2"
-     MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+-    MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    if [ "$PORTOBJFORMAT" = "elf" ]; then
++	eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1"
++	MAKE_LIB="\${SHLIB_LD} -soname ${TK_LIB_FILE} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    else
++	eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1.2"
++	MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    fi
      RANLIB=":"
  else
-@@ -2475,7 +2477,7 @@
+     TK_SHARED_BUILD=0
+@@ -2480,7 +2487,7 @@
  
  if test "$ok" = "yes" ; then
      ENABLE_TIFF="-DENABLE_TIFF"
@@ -45,7 +52,7 @@
      IMAGE_OBJ="$IMAGE_OBJ tkImgTIFF.o"
  else
      ENABLE_TIFF=""
-@@ -2731,6 +2733,7 @@
+@@ -2736,6 +2743,7 @@
  s%@SHLIB_VERSION@%$SHLIB_VERSION%g
  s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
  s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
diff --git a/x11-toolkits/tkstep80/files/patch-ab b/x11-toolkits/tkstep80/files/patch-ab
index 1b06b51befdd..b55d1bd2e421 100644
--- a/x11-toolkits/tkstep80/files/patch-ab
+++ b/x11-toolkits/tkstep80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Nov  9 10:54:46 1997
-+++ Makefile.in	Sun Nov  9 12:37:55 1997
+--- Makefile.in.orig	Sun Oct  4 13:14:37 1998
++++ Makefile.in	Sun Oct  4 13:23:30 1998
 @@ -38,7 +38,7 @@
  # Directory from which applications will reference the library of Tcl
  # scripts (note: you can set the TK_LIBRARY environment variable at
@@ -38,8 +38,11 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -294,6 +296,11 @@
+@@ -292,8 +294,14 @@
+ @TK_LIB_FILE@: ${OBJS}
+ 	rm -f @TK_LIB_FILE@
  	@MAKE_LIB@
++	ln -sf @TK_LIB_FILE@ libtkstep80.so
  	$(RANLIB) @TK_LIB_FILE@
  
 +libtkstep80.a: ${OBJS}
@@ -50,7 +53,7 @@
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -344,7 +351,7 @@
+@@ -344,7 +352,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -59,8 +62,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -358,13 +365,19 @@
+@@ -356,15 +364,22 @@
+ 	    done;
+ 	@echo "Installing $(TK_LIB_FILE)"
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
++	@ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtkstep80.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 +	@echo "Installing libtkstep80.a"
@@ -80,7 +86,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -374,8 +387,19 @@
+@@ -374,8 +389,19 @@
  		else true; \
  		fi; \
  	    done;
@@ -102,7 +108,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -434,28 +458,28 @@
+@@ -434,28 +460,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \