summaryrefslogtreecommitdiff
path: root/x11-toolkits/tk84
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/tk84')
-rw-r--r--x11-toolkits/tk84/Makefile73
-rw-r--r--x11-toolkits/tk84/distinfo2
-rw-r--r--x11-toolkits/tk84/files/patch-aa46
-rw-r--r--x11-toolkits/tk84/files/patch-ab50
-rw-r--r--x11-toolkits/tk84/pkg-plist2
5 files changed, 110 insertions, 63 deletions
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index a4d6deaead74..654fed703655 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,55 +6,58 @@
#
PORTNAME= tk
-PORTVERSION= 8.3.4
-PORTREVISION= 1
-CATEGORIES= x11-toolkits tk83
+PORTVERSION= 8.4a3
+CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
-LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
+LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84
-LATEST_LINK= tk83
+NO_LATEST_LINK= yes
USE_XLIB= yes
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
-CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1
-MAKE_ENV= SHORT_TK_VER=83
+CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.4
+CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk84.so.1
+MAKE_ENV= SHORT_TK_VER=84
PKGINSTALL= ${PKGDIR}/pkg-install.wish
PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish
+TK_VER= 8.4
-PLIST_SUB= TK_VER=8.3 SHORT_TK_VER=83
+PLIST_SUB= TK_VER=${TK_VER} SHORT_TK_VER=84
MANCOMPRESSED= no
MAN1= wish.1
MAN3= 3DBorder.3 AddOption.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 GetDash.3 \
- GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.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 \
- Grab.3 HWNDToWindow.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 TkInitStubs.3 WindowId.3
+ CoordToWin.3 CrtCmHdlr.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 GetDash.3 GetFont.3 GetGC.3 GetHINSTANCE.3 GetHWND.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 Grab.3 HWNDToWindow.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 SetClassProcs.3 SetGrid.3 \
+ SetOptions.3 SetVisual.3 StrictMotif.3 TextLayout.3 Tk_Init.3 \
+ Tk_Main.3 TkInitStubs.3 WindowId.3
+
MANN= bell.n bind.n bindtags.n bitmap.n button.n canvas.n checkbutton.n \
- chooseColor.n chooseDirectory.n clipboard.n colors.n cursors.n destroy.n dialog.n entry.n\
- event.n focus.n focusNext.n font.n frame.n getOpenFile.n grab.n grid.n keysyms.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 \
+ chooseColor.n chooseDirectory.n clipboard.n colors.n console.n \
+ cursors.n destroy.n dialog.n entry.n event.n focus.n focusNext.n \
+ font.n frame.n getOpenFile.n grab.n grid.n keysyms.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 spinbox.n text.n tk.n tkerror.n \
tkvars.n tkwait.n toplevel.n winfo.n wm.n
# MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks
@@ -118,6 +121,8 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
ConfigWind.3 Tk_DefineCursor.3 \
ConfigWind.3 Tk_UndefineCursor.3 \
CoordToWin.3 Tk_CoordsToWindow.3 \
+ CrtCmHdlr.3 Tk_CreateClientMessageHandler.3 \
+ CrtCmHdlr.3 Tk_DeleteClientMessageHandler.3 \
CrtErrHdlr.3 Tk_CreateErrorHandler.3 \
CrtErrHdlr.3 Tk_DeleteErrorHandler.3 \
CrtGenHdlr.3 Tk_CreateGenericHandler.3 \
@@ -147,7 +152,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
FindPhoto.3 Tk_PhotoGetSize.3 \
FindPhoto.3 Tk_PhotoSetSize.3 \
FontId.3 Tk_FontId.3 \
- FontId.3 Tk_FontMetrics.3 \
+ FontId.3 Tk_GetFontMetrics.3 \
FontId.3 Tk_PostscriptFontName.3 \
FreeXId.3 Tk_FreeXId.3 \
GeomReq.3 Tk_GeometryRequest.3 \
@@ -253,6 +258,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
SetAppName.3 Tk_SetAppName.3 \
SetClass.3 Tk_SetClass.3 \
SetClass.3 Tk_Class.3 \
+ SetClassProcs.3 Tk_SetClassProcs.3 \
SetGrid.3 Tk_SetGrid.3 \
SetGrid.3 Tk_UnsetGrid.3 \
SetOptions.3 Tk_CreateOptionTable.3 \
@@ -264,6 +270,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
SetOptions.3 Tk_GetOptionValue.3 \
SetOptions.3 Tk_GetOptionInfo.3 \
SetOptions.3 Tk_FreeConfigOptions.3 \
+ SetOptions.3 Tk_Offset.3 \
SetVisual.3 Tk_SetWindowVisual.3 \
StrictMotif.3 Tk_StrictMotif.3 \
TextLayout.3 Tk_ComputeTextLayout.3 \
@@ -276,6 +283,7 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
TextLayout.3 Tk_IntersectTextLayout.3 \
TextLayout.3 Tk_TextLayoutToPostscript.3 \
TkInitStubs.3 Tk_InitStubs.3 \
+ Tk_Init.3 Tk_SafeInit.3 \
WindowId.3 Tk_WindowId.3 \
WindowId.3 Tk_Parent.3 \
WindowId.3 Tk_Display.3 \
@@ -306,17 +314,22 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
focusNext.n tk_focusFollowsMouse.n \
getOpenFile.n tk_getOpenFile.n \
getOpenFile.n tk_getSaveFile.n \
+ menu.n tk_menuSetFocus.n \
menubar.n tk_menuBar.n \
menubar.n tk_bindForTraversal.n \
messageBox.n tk_messageBox.n \
optionMenu.n tk_optionMenu.n \
palette.n tk_setPalette.n \
palette.n tk_bisque.n \
- popup.n tk_popup.n
+ popup.n tk_popup.n \
+ text.n tk_textCopy.n \
+ text.n tk_textCut.n \
+ text.n tk_textPaste.n
.include <bsd.port.pre.mk>
post-install:
+ @${RMDIR} ${PREFIX}/lib/tk${TK_VER}/msgs
.if exists(${PKGINSTALL})
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
.endif
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index d54f9190c057..a9ca3eb6d84b 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1 +1 @@
-MD5 (tk8.3.4.tar.gz) = 02311d8f90734c4f5eaa62e9b36fe535
+MD5 (tk8.4a3.tar.gz) = 6a87be59ec339619b037225f9371acbe
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index ee05cb4304c3..eae1bd508dae 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,10 +1,19 @@
---- configure.orig Sat Oct 20 02:24:40 2001
-+++ configure Sat Nov 10 21:53:28 2001
-@@ -2351,21 +2351,22 @@
+--- configure.orig Tue Aug 7 05:12:23 2001
++++ configure Tue Nov 13 08:20:01 2001
+@@ -1513,7 +1513,7 @@
+ EXTRA_CFLAGS=""
+ TCL_EXPORT_FILE_SUFFIX=""
+ UNSHARED_LIB_SUFFIX=""
+- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
++ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ ECHO_VERSION='`echo ${VERSION}`'
+ TCL_LIB_VERSIONS_OK=ok
+ CFLAGS_DEBUG=-g
+@@ -2039,18 +2039,23 @@
# FreeBSD doesn't handle version numbers with dots.
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
TCL_LIB_VERSIONS_OK=nodots
;;
FreeBSD-*)
@@ -20,14 +29,14 @@
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
LD_SEARCH_FLAGS=""
- # FreeBSD doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ # FreeBSD doesn't handle version numbers with dots.
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
++ TCL_LIB_VERSIONS_OK=nodots
;;
- Rhapsody-*|Darwin-*)
-@@ -2882,6 +2883,7 @@
+ NEXTSTEP-*)
+ SHLIB_CFLAGS=""
+@@ -2538,6 +2543,7 @@
echo "$ac_t""no" 1>&6
fi
@@ -35,3 +44,20 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
+@@ -4270,6 +4276,7 @@
+ else
+ eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
+ fi
++ TK_LIB_FLAG="-ltk${TCL_TRIM_DOTS}\${TK_DBGX}"
+ TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
+ TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
+ TK_BUILD_EXP_FILE=""
+@@ -4301,7 +4308,7 @@
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
+ else
+- eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}"
++ eval TK_STUB_LIB_FLAG="-ltkstub${TCL_TRIM_DOTS}\${TK_DBGX}"
+ fi
+
+ TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index c4405ddb29cc..a17f49ae71a6 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in.orig Fri Apr 6 04:03:05 2001
-+++ Makefile.in Fri Apr 13 21:59:30 2001
-@@ -57,7 +57,9 @@
+--- Makefile.in.orig Tue Aug 7 05:12:23 2001
++++ Makefile.in Tue Nov 13 07:39:32 2001
+@@ -58,7 +58,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
# Directory in which to install the include file tk.h:
@@ -11,10 +11,16 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
-@@ -103,1 +103,1 @@
--CFLAGS = @CFLAGS@
+@@ -101,7 +103,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
+ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
+CFLAGS ?= @CFLAGS@
-@@ -197,7 +199,7 @@
+
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+@@ -203,7 +205,7 @@
# Libraries to use when linking. This definition is determined by the
# configure script.
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
@@ -23,7 +29,7 @@
# The symbol below provides support for dynamic loading and shared
# libraries. See configure.in for a description of what it means.
-@@ -346,6 +348,8 @@
+@@ -354,6 +356,8 @@
default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \
tkPort.h tkScrollbar.h tkText.h
@@ -32,7 +38,7 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
all: binaries libraries doc
-@@ -365,8 +369,14 @@
+@@ -373,8 +377,14 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@@ -47,7 +53,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
-@@ -438,7 +448,7 @@
+@@ -474,7 +484,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@@ -56,7 +62,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
-@@ -456,12 +466,18 @@
+@@ -492,12 +502,18 @@
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -76,22 +82,23 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -475,6 +491,7 @@
+@@ -511,6 +527,7 @@
install-libraries:
@for i in $(INCLUDE_INSTALL_DIR) \
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
+ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
+ $(SCRIPT_INSTALL_DIR)/msgs; \
do \
- if [ ! -d $$i ] ; then \
-@@ -488,10 +505,18 @@
+@@ -525,10 +542,18 @@
chmod +x $(UNIX_DIR)/install-sh; \
fi
@echo "Installing header files";
-- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
-- $(GENERIC_DIR)/tkDecls.h $(GENERIC_DIR)/tkIntXlibDecls.h ; \
+- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
+- $(GENERIC_DIR)/tkPlatDecls.h ; \
+ @for i in $(GENERIC_DIR)/*.h ; \
-+ do \
+ do \
+- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
@@ -99,14 +106,13 @@
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(INSTALL_HDRS) ; \
- do \
-- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
++ do \
+ j=`basename $$i` ; \
+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
-@@ -558,7 +583,6 @@
+@@ -602,7 +627,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@@ -114,7 +120,7 @@
@echo "Installing C API (.3) docs";
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
-@@ -568,7 +592,6 @@
+@@ -612,7 +636,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.3) docs";
@@ -122,7 +128,7 @@
@echo "Installing command (.n) docs";
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
-@@ -578,7 +601,6 @@
+@@ -622,7 +645,6 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index 26b2783a4011..15dce59e771b 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -124,6 +124,7 @@ lib/tk%%TK_VER%%/prolog.ps
lib/tk%%TK_VER%%/safetk.tcl
lib/tk%%TK_VER%%/scale.tcl
lib/tk%%TK_VER%%/scrlbar.tcl
+lib/tk%%TK_VER%%/spinbox.tcl
lib/tk%%TK_VER%%/tclIndex
lib/tk%%TK_VER%%/tearoff.tcl
lib/tk%%TK_VER%%/text.tcl
@@ -131,6 +132,7 @@ lib/tk%%TK_VER%%/tk.tcl
lib/tk%%TK_VER%%/tkAppInit.c
lib/tk%%TK_VER%%/tkConfig.sh
lib/tk%%TK_VER%%/tkfbox.tcl
+lib/tk%%TK_VER%%/unsupported.tcl
lib/tk%%TK_VER%%/xmfbox.tcl
@dirrm lib/tk%%TK_VER%%/demos/images
@dirrm lib/tk%%TK_VER%%/demos
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 20:35:51 +0000