summaryrefslogtreecommitdiff
path: root/x11/tk/patches/patch-aa
diff options
context:
space:
mode:
authorjwise <jwise@pkgsrc.org>2000-08-29 16:16:06 +0000
committerjwise <jwise@pkgsrc.org>2000-08-29 16:16:06 +0000
commit2b2fee8de090e589c503cd654dc308e8da5c0f19 (patch)
tree7929d2cb26e9a1ab4ed5d164d9c58979937e54d2 /x11/tk/patches/patch-aa
parentc7fdbad17d5d30d59c226b986b6db82e45de9c64 (diff)
downloadpkgsrc-2b2fee8de090e589c503cd654dc308e8da5c0f19.tar.gz
Initial import of new pkgsrc/lang/tk (tk-8.3.2) package, partly derived
from the older pkgsrc/lang/tk80 (tk-8.0.5) package. This is an update of the tk package from version 8.0.5 to version 8.3.2, and also a slight change in the organization of tcl/tk packages. This will be added disabled to pkgsrc/x11/Makefile until I finish updating all tcl/tk-based packags. Changes from out-of-the-box tk-8.3.2: Both static and shared libtcl83.* are installed, thanks to the magic of libtool. Changes to the package since tk-8.3.2: A symlink to ${PREFIX}/bin/wish8.3 is installed as ${PREFIX}/bin/wish This change is designed to allow tk-using packages to not depend on any particular version of tk. public tk include files and the tk configuration information script are now installed in their standard places (${PREFIX}/include/tk*.h, and ${PREFIX}/lib/tkConfig.sh), and private tcl include files are now installed in ${PREFIX}/include/tk. This change allows tcl extension packages to work out of the box, and to not need modification when tcl and tk are updated. When extension package authors use the new libtclstubs*.a API, this even allows binary packages of dynamically- loadable tcl extensions to be used with newer versions of tcl without recompilation. Here are the new features in tk-8.3.x as opposed to 8.0.x. I am not including bug fixes as this represents about 18 months of them. Img patch from Nijtmans, et al was adopted. This includes a Tcl_Obj-based image command, support for binary in -data args, adds an alpha channel to all photo types, as well as GIF write capability. Major portions of Dash patch from Nijtmans, et al was adopted. This includes a Tcl_Obj-based canvas command, dashed canvas item support, enhanced canvas tag searching capabilities, pointer warping with event -warp, entry widget validation routines, -elide tag option for of the text widget (TkMan runs on 8.3 without a patch), several new canvas item arguments, as well as postscript printing support for images and windows in the canvas. Listboxes support a -listvariable and have a new itemconfigure command to color individual items. Extended "wm state" command to accept a state to set for the toplevel, and added support for the zoomed (maximized) state on Windows. Standard Unix dialogs have been updated to use color icons and have improved behavior. New "tk useinputmethods" command. This changes the behavior of Tk on X where X Input Methods (XIM) were recognized and used without question. With 8.3, they will be recognized and initialized, but not used unless XIM is turned on (tk useinputmethods 1). This should only affect users with special input methods, and the new default behavior should be more beneficial to the average user.
Diffstat (limited to 'x11/tk/patches/patch-aa')
-rw-r--r--x11/tk/patches/patch-aa80
1 files changed, 80 insertions, 0 deletions
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
new file mode 100644
index 00000000000..eba016b234c
--- /dev/null
+++ b/x11/tk/patches/patch-aa
@@ -0,0 +1,80 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/08/29 16:16:07 jwise Exp $
+--- Makefile.in.orig Mon Aug 28 23:29:09 2000
++++ Makefile.in Mon Aug 28 23:34:09 2000
+@@ -76,7 +76,7 @@
+ # The directory containing the Tcl sources and headers appropriate
+ # for this version of Tk ("srcdir" will be replaced or has already
+ # been replaced by the configure script):
+-TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic
++TCL_GENERIC_DIR = ${PREFIX}/include/tcl/generic
+
+ # The directory containing the Tcl library archive file appropriate
+ # for this version of Tk:
+@@ -154,8 +154,8 @@
+ # "install" around; better to use the install-sh script that comes
+ # with the distribution, which is slower but guaranteed to work.
+
+-INSTALL = @srcdir@/install-sh -c
+-INSTALL_PROGRAM = ${INSTALL}
++INSTALL = ${LIBTOOL} --mode=install @srcdir@/install-sh -c
++INSTALL_PROGRAM = ${INSTALL} -s
+ INSTALL_DATA = ${INSTALL} -m 644
+
+ # The following specifies which Tcl executable to use for make targets
+@@ -203,7 +203,7 @@
+ # libraries. See configure.in for a description of what it means.
+ # The values of the symbolis normally set by the configure script.
+
+-SHLIB_LD = @SHLIB_LD@
++SHLIB_LD = ${LIBTOOL} --mode=link @CC@
+ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+
+ # Additional search flags needed to find the various shared libraries
+@@ -233,11 +233,12 @@
+ # either.
+ #----------------------------------------------------------------
+
+-CC = @CC@
++CC = ${LIBTOOL} --mode=compile @CC@
++LD = ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
+
+ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+ -I${UNIX_DIR} -I${GENERIC_DIR} \
+--I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} \
++-I${BMAP_DIR} -I${TCL_GENERIC_DIR} -I${PREFIX}/include ${X11_INCLUDES} \
+ ${AC_FLAGS} ${PROTO_FLAGS} \
+ ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS}
+
+@@ -389,7 +390,7 @@
+
+
+ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
+- $(CC) @LDFLAGS@ $(WISH_OBJS) \
++ $(LD) @LDFLAGS@ $(WISH_OBJS) \
+ @TK_BUILD_LIB_SPEC@ \
+ $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
+
+@@ -400,12 +401,12 @@
+ make tcltest
+
+ tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
+- ${CC} @LDFLAGS@ $(TKTEST_OBJS) \
++ ${LD} @LDFLAGS@ $(TKTEST_OBJS) \
+ @TK_BUILD_LIB_SPEC@ \
+ $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
+
+ xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
+- ${CC} @LDFLAGS@ test.o tkTest.o tkSquare.o \
++ ${LD} @LDFLAGS@ test.o tkTest.o tkSquare.o \
+ @TK_BUILD_LIB_SPEC@ \
+ $(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest
+
+@@ -456,7 +457,7 @@
+ chmod +x $(UNIX_DIR)/mkLinks; \
+ fi
+ @echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
+- @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
++ @$(INSTALL_DATA) $(TK_LIB_FILE:.so=.la) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
+ @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
+ @echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"