Convert to ELF.

3 files changed, 44 insertions, 140 deletions

diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 76c80bfeb348..f9469cabe81d 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.15 1998/08/07 23:56:52 asami Exp $
+# $Id: Makefile,v 1.16 1998/10/03 21:36:15 steve Exp $
 #
 
 DISTNAME=	tk8.1a2
@@ -21,8 +21,33 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
+MAN1=	wish.1
+MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
+	Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \
+	CrtErrHdlr.3 CrtGenHdlr.3 CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3 \
+	CrtSelHdlr.3 CrtWindow.3 DeleteImg.3 DrawFocHlt.3 EventHndlr.3 \
+	FindPhoto.3 FontId.3 FreeXId.3 GeomReq.3 GetAnchor.3 GetBitmap.3 \
+	GetCapStyl.3 GetClrmap.3 GetColor.3 GetCursor.3 GetFont.3 GetGC.3 \
+	GetImage.3 GetJoinStl.3 GetJustify.3 GetOption.3 GetPixels.3 \
+	GetPixmap.3 GetRelief.3 GetRootCrd.3 GetScroll.3 GetSelect.3 GetUid.3 \
+	GetVRoot.3 GetVisual.3 HandleEvent.3 IdToWindow.3 ImgChanged.3 \
+	InternAtom.3 MainLoop.3 MainWin.3 MaintGeom.3 ManageGeom.3 \
+	MapWindow.3 MeasureChar.3 MoveToplev.3 Name.3 NameOfImg.3 OwnSelect.3 \
+	ParseArgv.3 QWinEvent.3 Restack.3 RestrictEv.3 SetAppName.3 \
+	SetClass.3 SetGrid.3 SetOptions.3 SetVisual.3 StrictMotif.3 \
+	TextLayout.3 Tk_Init.3 Tk_Main.3 WindowId.3
+MANN=	bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
+	chooseColor.n clipboard.n dde.n destroy.n dialog.n entry.n event.n \
+	focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n \
+	image.n label.n listbox.n loadTk.n lower.n menu.n menubar.n \
+	menubutton.n message.n messageBox.n option.n optionMenu.n options.n \
+	pack-old.n pack.n palette.n photo.n place.n popup.n radiobutton.n \
+	raise.n scale.n scrollbar.n selection.n send.n text.n tk.n tkerror.n \
+	tkvars.n tkwait.n toplevel.n winfo.n wm.n
+MANCOMPRESSED=	yes
+
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
 	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index b408a73c7d34..ba78e41119ef 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Feb 23 21:11:34 1998
-+++ Makefile.in	Sun Mar  1 19:51:58 1998
+--- Makefile.in.orig	Mon Feb 23 20:11:34 1998
++++ Makefile.in	Sat Oct  3 16:48:40 1998
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -34,8 +34,11 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -301,6 +303,11 @@
+@@ -299,8 +301,14 @@
+ @TK_LIB_FILE@: ${OBJS}
+ 	rm -f @TK_LIB_FILE@
  	@MAKE_LIB@
++	ln -sf @TK_LIB_FILE@ libtk81.so
  	$(RANLIB) @TK_LIB_FILE@
  
 +libtk81.a: ${OBJS}
@@ -46,7 +49,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
-@@ -355,7 +362,7 @@
+@@ -355,7 +363,7 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -55,8 +58,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -369,13 +376,19 @@
+@@ -367,15 +375,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)/libtk81.so
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
 +	@echo "Installing libtk81.a"
@@ -76,7 +82,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -385,8 +398,18 @@
+@@ -385,8 +400,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -97,7 +103,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -445,28 +468,28 @@
+@@ -445,28 +470,28 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/x11-toolkits/tk83/pkg-plist b/x11-toolkits/tk83/pkg-plist
index bd9df2d210ed..4855c5c5e5d2 100644
--- a/x11-toolkits/tk83/pkg-plist
+++ b/x11-toolkits/tk83/pkg-plist
@@ -22,9 +22,10 @@ include/tk8.1/unix/tkUnixDefault.h
 include/tk8.1/unix/tkUnixInt.h
 include/tk8.1/unix/tkUnixPort.h
 lib/libtk81.a
-lib/libtk81.so.1.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libtk81.so
+lib/libtk81.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/tk8.1/bgerror.tcl
 lib/tk8.1/button.tcl
 lib/tk8.1/clrpick.tcl
@@ -121,134 +122,6 @@ lib/tk8.1/tkAppInit.c
 lib/tk8.1/tkConfig.sh
 lib/tk8.1/tkfbox.tcl
 lib/tk8.1/xmfbox.tcl
-man/man1/wish.1.gz
-man/man3/3DBorder.3.gz
-man/man3/BindTable.3.gz
-man/man3/CanvPsY.3.gz
-man/man3/CanvTkwin.3.gz
-man/man3/CanvTxtInfo.3.gz
-man/man3/Clipboard.3.gz
-man/man3/ClrSelect.3.gz
-man/man3/ConfigWidg.3.gz
-man/man3/ConfigWind.3.gz
-man/man3/CoordToWin.3.gz
-man/man3/CrtErrHdlr.3.gz
-man/man3/CrtGenHdlr.3.gz
-man/man3/CrtImgType.3.gz
-man/man3/CrtItemType.3.gz
-man/man3/CrtPhImgFmt.3.gz
-man/man3/CrtSelHdlr.3.gz
-man/man3/CrtWindow.3.gz
-man/man3/DeleteImg.3.gz
-man/man3/DrawFocHlt.3.gz
-man/man3/EventHndlr.3.gz
-man/man3/FindPhoto.3.gz
-man/man3/FontId.3.gz
-man/man3/FreeXId.3.gz
-man/man3/GeomReq.3.gz
-man/man3/GetAnchor.3.gz
-man/man3/GetBitmap.3.gz
-man/man3/GetCapStyl.3.gz
-man/man3/GetClrmap.3.gz
-man/man3/GetColor.3.gz
-man/man3/GetCursor.3.gz
-man/man3/GetFont.3.gz
-man/man3/GetGC.3.gz
-man/man3/GetImage.3.gz
-man/man3/GetJoinStl.3.gz
-man/man3/GetJustify.3.gz
-man/man3/GetOption.3.gz
-man/man3/GetPixels.3.gz
-man/man3/GetPixmap.3.gz
-man/man3/GetRelief.3.gz
-man/man3/GetRootCrd.3.gz
-man/man3/GetScroll.3.gz
-man/man3/GetSelect.3.gz
-man/man3/GetUid.3.gz
-man/man3/GetVRoot.3.gz
-man/man3/GetVisual.3.gz
-man/man3/HandleEvent.3.gz
-man/man3/IdToWindow.3.gz
-man/man3/ImgChanged.3.gz
-man/man3/InternAtom.3.gz
-man/man3/MainLoop.3.gz
-man/man3/MainWin.3.gz
-man/man3/MaintGeom.3.gz
-man/man3/ManageGeom.3.gz
-man/man3/MapWindow.3.gz
-man/man3/MeasureChar.3.gz
-man/man3/MoveToplev.3.gz
-man/man3/Name.3.gz
-man/man3/NameOfImg.3.gz
-man/man3/OwnSelect.3.gz
-man/man3/ParseArgv.3.gz
-man/man3/QWinEvent.3.gz
-man/man3/Restack.3.gz
-man/man3/RestrictEv.3.gz
-man/man3/SetAppName.3.gz
-man/man3/SetClass.3.gz
-man/man3/SetGrid.3.gz
-man/man3/SetOptions.3.gz
-man/man3/SetVisual.3.gz
-man/man3/StrictMotif.3.gz
-man/man3/TextLayout.3.gz
-man/man3/Tk_Init.3.gz
-man/man3/Tk_Main.3.gz
-man/man3/WindowId.3.gz
-man/mann/bell.n.gz
-man/mann/bind.n.gz
-man/mann/bindtags.n.gz
-man/mann/bitmap.n.gz
-man/mann/button.n.gz
-man/mann/canvas.n.gz
-man/mann/checkbutton.n.gz
-man/mann/chooseColor.n.gz
-man/mann/clipboard.n.gz
-man/mann/dde.n.gz
-man/mann/destroy.n.gz
-man/mann/dialog.n.gz
-man/mann/entry.n.gz
-man/mann/event.n.gz
-man/mann/focus.n.gz
-man/mann/focusNext.n.gz
-man/mann/font.n.gz
-man/mann/frame.n.gz
-man/mann/getOpenFile.n.gz
-man/mann/grab.n.gz
-man/mann/grid.n.gz
-man/mann/image.n.gz
-man/mann/label.n.gz
-man/mann/listbox.n.gz
-man/mann/loadTk.n.gz
-man/mann/lower.n.gz
-man/mann/menu.n.gz
-man/mann/menubar.n.gz
-man/mann/menubutton.n.gz
-man/mann/message.n.gz
-man/mann/messageBox.n.gz
-man/mann/option.n.gz
-man/mann/optionMenu.n.gz
-man/mann/options.n.gz
-man/mann/pack-old.n.gz
-man/mann/pack.n.gz
-man/mann/palette.n.gz
-man/mann/photo.n.gz
-man/mann/place.n.gz
-man/mann/popup.n.gz
-man/mann/radiobutton.n.gz
-man/mann/raise.n.gz
-man/mann/scale.n.gz
-man/mann/scrollbar.n.gz
-man/mann/selection.n.gz
-man/mann/send.n.gz
-man/mann/text.n.gz
-man/mann/tk.n.gz
-man/mann/tkerror.n.gz
-man/mann/tkvars.n.gz
-man/mann/tkwait.n.gz
-man/mann/toplevel.n.gz
-man/mann/winfo.n.gz
-man/mann/wm.n.gz
 @dirrm lib/tk8.1/demos/images
 @dirrm lib/tk8.1/demos
 @dirrm lib/tk8.1/images