Tk v8.0.4. As with Tcl80 checked w/maintainer.

This commit is contained in:
Chris Timmons 1998-12-19 07:27:40 +00:00
parent 95bee517c8
commit f7a5a302df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=15421
5 changed files with 208 additions and 213 deletions

View File

@ -3,11 +3,11 @@
# Date created: 19 August 1997
# Whom: jkh
#
# $Id: Makefile,v 1.14 1998/11/14 09:43:32 asami Exp $
# $Id: Makefile,v 1.15 1998/12/13 08:49:13 asami Exp $
#
DISTNAME= tk8.0p2
PKGNAME= tk-8.0.2
DISTNAME= tk8.0.4
PKGNAME= tk-8.0.4
CATEGORIES= x11-toolkits tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
@ -16,14 +16,14 @@ MAINTAINER= jkh@Freebsd.ORG
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
USE_XLIB= yes
WRKSRC= ${WRKDIR}/tk8.0/unix
WRKSRC= ${WRKDIR}/tk8.0.4/unix
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=${TK_LIB_FILE}
PKGINSTALL= ${PKGDIR}/INSTALL.wish
SHLIB_MAJOR= 1
SHLIB_MINOR= 2
SHLIB_MINOR= 4
MAKEFILE= makefile
TK_LIB= libtk80.so

View File

@ -1 +1 @@
MD5 (tk8.0p2.tar.gz) = e7711ce7e584bf1c0388cdbb86ffe7cc
MD5 (tk8.0.4.tar.gz) = 8e4c6a20f11cdff76adb5d26423e4ea5

View File

@ -1,10 +1,10 @@
--- configure.orig Fri Aug 15 22:17:52 1997
+++ configure Wed Oct 1 10:50:54 1997
@@ -662,14 +662,14 @@
if test -n "$withval"; then
--- configure.orig Wed Nov 18 14:54:54 1998
+++ configure Tue Dec 1 14:49:37 1998
@@ -842,14 +842,14 @@
withval="$with_tcl"
TCL_BIN_DIR=$withval
else
- TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd`
- TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
+ TCL_BIN_DIR=${prefix}/lib/tcl8.0
fi
@ -14,24 +14,24 @@
-if test ! -f $TCL_BIN_DIR/Makefile; then
- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps your Tcl installation has been corrupted. Verify the installation of Tcl8.0 and try again." 1>&2; exit 1; }
fi
#--------------------------------------------------------------------
@@ -688,6 +688,8 @@
DL_LIBS=$TCL_DL_LIBS
LD_FLAGS=$TCL_LD_FLAGS
@@ -889,6 +889,7 @@
CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
@@ -2271,6 +2273,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
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g
s%@TCL_VERSION@%$TCL_VERSION%g
s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g
@@ -2344,7 +2345,7 @@
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ TK_LIB_FILE=${TK_LIB_FILE}
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
RANLIB=":"
else

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Fri Aug 15 22:17:51 1997
+++ Makefile.in Wed Oct 1 10:07:16 1997
--- Makefile.in.orig Wed Nov 18 14:54:53 1998
+++ Makefile.in Tue Dec 1 13:10:35 1998
@@ -56,7 +56,9 @@
BIN_DIR = $(exec_prefix)/bin
@ -11,21 +11,16 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
@@ -94,11 +96,11 @@
@@ -112,7 +114,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
-LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
+LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
# To change the compiler switches, for example to change from -O
# to -g, change the following line:
-CFLAGS = -O
+CFLAGS = @CFLAGS@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
@@ -134,7 +136,7 @@
@@ -148,7 +150,7 @@
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
@ -34,19 +29,19 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@@ -290,6 +292,11 @@
@@ -311,6 +313,11 @@
@MAKE_LIB@
$(RANLIB) @TK_LIB_FILE@
$(RANLIB) ${TK_LIB_FILE}
+libtk80.a: ${OBJS}
+ rm -f libtk80.a
+ ar cr libtk80.a ${OBJS}
+ $(RANLIB) libtk80.a
+ ranlib libtk80.a
+
# 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
@@ -340,7 +347,7 @@
@@ -365,7 +372,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -55,7 +50,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -354,13 +361,19 @@
@@ -379,13 +386,19 @@
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -76,7 +71,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -370,8 +383,18 @@
@@ -395,8 +408,18 @@
else true; \
fi; \
done;
@ -97,7 +92,7 @@
for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
do \
echo "Installing $$i"; \
@@ -430,28 +453,28 @@
@@ -455,28 +478,28 @@
@cd $(SRC_DIR)/doc; for i in *.1; \
do \
echo "Installing doc/$$i"; \

View File

@ -1,8 +1,5 @@
bin/wish8.0
include/tk8.0/tk.h
include/tk8.0/unix/tkUnixDefault.h
include/tk8.0/unix/tkUnixInt.h
include/tk8.0/unix/tkUnixPort.h
include/tk8.0/generic/default.h
include/tk8.0/generic/ks_names.h
include/tk8.0/generic/tk.h
@ -21,143 +18,38 @@ include/tk8.0/generic/tkScale.h
include/tk8.0/generic/tkScrollbar.h
include/tk8.0/generic/tkSelect.h
include/tk8.0/generic/tkText.h
man/man1/wish.1.gz
man/man3/FontId.3.gz
man/man3/GetFont.3.gz
man/man3/MeasureChar.3.gz
man/man3/GetGC.3.gz
man/man3/TextLayout.3.gz
man/man3/Name.3.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/GetImage.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/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/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/MoveToplev.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/SetVisual.3.gz
man/man3/StrictMotif.3.gz
man/man3/Tk_Init.3.gz
man/man3/Tk_Main.3.gz
man/man3/WindowId.3.gz
man/mann/chooseColor.n.gz
man/mann/getOpenFile.n.gz
man/mann/event.n.gz
man/mann/font.n.gz
man/mann/messageBox.n.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/clipboard.n.gz
man/mann/destroy.n.gz
man/mann/dialog.n.gz
man/mann/entry.n.gz
man/mann/focus.n.gz
man/mann/focusNext.n.gz
man/mann/frame.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/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
lib/tk8.0/demos/images/earth.gif
lib/tk8.0/demos/images/earthris.gif
lib/tk8.0/demos/images/face.bmp
lib/tk8.0/demos/images/flagdown.bmp
lib/tk8.0/demos/images/flagup.bmp
lib/tk8.0/demos/images/gray25.bmp
lib/tk8.0/demos/images/letters.bmp
lib/tk8.0/demos/images/noletter.bmp
lib/tk8.0/demos/images/pattern.bmp
lib/tk8.0/demos/images/tcllogo.gif
lib/tk8.0/demos/images/teapot.ppm
include/tk8.0/unix/tkUnixDefault.h
include/tk8.0/unix/tkUnixInt.h
include/tk8.0/unix/tkUnixPort.h
lib/libtk80.a
lib/libtk80.so
lib/libtk80.so.1.4
lib/tk8.0/bgerror.tcl
lib/tk8.0/button.tcl
lib/tk8.0/clrpick.tcl
lib/tk8.0/comdlg.tcl
lib/tk8.0/console.tcl
lib/tk8.0/dialog.tcl
lib/tk8.0/entry.tcl
lib/tk8.0/focus.tcl
lib/tk8.0/listbox.tcl
lib/tk8.0/menu.tcl
lib/tk8.0/msgbox.tcl
lib/tk8.0/obsolete.tcl
lib/tk8.0/optMenu.tcl
lib/tk8.0/palette.tcl
lib/tk8.0/prolog.ps
lib/tk8.0/safetk.tcl
lib/tk8.0/scale.tcl
lib/tk8.0/scrlbar.tcl
lib/tk8.0/tclIndex
lib/tk8.0/tearoff.tcl
lib/tk8.0/text.tcl
lib/tk8.0/tk.tcl
lib/tk8.0/tkAppInit.c
lib/tk8.0/tkConfig.sh
lib/tk8.0/tkfbox.tcl
lib/tk8.0/xmfbox.tcl
lib/tk8.0/demos/README
lib/tk8.0/demos/arrow.tcl
lib/tk8.0/demos/bind.tcl
@ -181,11 +73,23 @@ lib/tk8.0/demos/hscale.tcl
lib/tk8.0/demos/icon.tcl
lib/tk8.0/demos/image1.tcl
lib/tk8.0/demos/image2.tcl
lib/tk8.0/demos/images/earth.gif
lib/tk8.0/demos/images/earthris.gif
lib/tk8.0/demos/images/face.bmp
lib/tk8.0/demos/images/flagdown.bmp
lib/tk8.0/demos/images/flagup.bmp
lib/tk8.0/demos/images/gray25.bmp
lib/tk8.0/demos/images/letters.bmp
lib/tk8.0/demos/images/noletter.bmp
lib/tk8.0/demos/images/pattern.bmp
lib/tk8.0/demos/images/tcllogo.gif
lib/tk8.0/demos/images/teapot.ppm
lib/tk8.0/demos/items.tcl
lib/tk8.0/demos/ixset
lib/tk8.0/demos/label.tcl
lib/tk8.0/demos/license.terms
lib/tk8.0/demos/menu.tcl
lib/tk8.0/demos/menubu.tcl
lib/tk8.0/demos/msgbox.tcl
lib/tk8.0/demos/plot.tcl
lib/tk8.0/demos/puzzle.tcl
@ -205,31 +109,6 @@ lib/tk8.0/demos/timer
lib/tk8.0/demos/twind.tcl
lib/tk8.0/demos/vscale.tcl
lib/tk8.0/demos/widget
lib/tk8.0/demos/menubu.tcl
lib/tk8.0/bgerror.tcl
lib/tk8.0/button.tcl
lib/tk8.0/clrpick.tcl
lib/tk8.0/comdlg.tcl
lib/tk8.0/console.tcl
lib/tk8.0/dialog.tcl
lib/tk8.0/entry.tcl
lib/tk8.0/focus.tcl
lib/tk8.0/listbox.tcl
lib/tk8.0/menu.tcl
lib/tk8.0/msgbox.tcl
lib/tk8.0/obsolete.tcl
lib/tk8.0/optMenu.tcl
lib/tk8.0/palette.tcl
lib/tk8.0/scale.tcl
lib/tk8.0/scrlbar.tcl
lib/tk8.0/tearoff.tcl
lib/tk8.0/text.tcl
lib/tk8.0/tk.tcl
lib/tk8.0/tkfbox.tcl
lib/tk8.0/xmfbox.tcl
lib/tk8.0/tclIndex
lib/tk8.0/prolog.ps
lib/tk8.0/tkAppInit.c
lib/tk8.0/images/README
lib/tk8.0/images/logo100.gif
lib/tk8.0/images/logo64.gif
@ -240,11 +119,132 @@ lib/tk8.0/images/pwrdLogo150.gif
lib/tk8.0/images/pwrdLogo175.gif
lib/tk8.0/images/pwrdLogo200.gif
lib/tk8.0/images/pwrdLogo75.gif
lib/tk8.0/safetk.tcl
lib/tk8.0/tkConfig.sh
lib/libtk80.a
lib/libtk80.so
lib/libtk80.so.1.2
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/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/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
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@dirrm lib/tk8.0/demos/images