cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regen patches; welcome in the 21st century!

Browse Source
This commit is contained in:
naddy 2006-01-08 17:20:11 +00:00
parent 6d43b22555
commit f236d7f3d3
8 changed files with 89 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/tk/8.0/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2004/12/19 17:27:01 alek Exp $
# $OpenBSD: Makefile,v 1.20 2006/01/08 17:20:11 naddy Exp $
# $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
COMMENT= "graphical toolkit for Tcl"
@ -34,7 +34,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-tcl="${LOCALBASE}/lib/tcl8.0"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
WRKDIST= ${WRKDIR}/${DISTNAME}/unix
WRKSRC= ${WRKDIST}/unix
REGRESS_TARGET= test
REGRESS_DEPENDS=::lang/tcl/8.3:regress

7
x11/tk/8.0/patches/patch-ae → x11/tk/8.0/patches/patch-generic_tkTextBTree_c
View File

@ -1,6 +1,7 @@
--- ../generic/tkTextBTree.c.orig Mon Sep 14 14:23:18 1998
+++ ../generic/tkTextBTree.c Wed Jan 5 23:20:55 2000
@@ -2427,6 +2427,132 @@
$OpenBSD: patch-generic_tkTextBTree_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextBTree.c.orig Mon Sep 14 20:23:18 1998
+++ generic/tkTextBTree.c Sun Jan 8 18:09:42 2006
@@ -2427,6 +2427,132 @@ TkBTreeGetTags(indexPtr, numTagsPtr)
}
return tagInfo.tagPtrs;
}

79
x11/tk/8.0/patches/patch-af → x11/tk/8.0/patches/patch-generic_tkTextDisp_c
View File

@ -1,6 +1,7 @@
--- ../generic/tkTextDisp.c.orig Mon Sep 14 14:23:18 1998
+++ ../generic/tkTextDisp.c Wed Jan 5 23:20:56 2000
@@ -55,6 +55,7 @@
$OpenBSD: patch-generic_tkTextDisp_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextDisp.c.orig Mon Sep 14 20:23:18 1998
+++ generic/tkTextDisp.c Sun Jan 8 18:09:42 2006
@@ -55,6 +55,7 @@ typedef struct StyleValues {
* be NULL). */
int underline; /* Non-zero means draw underline underneath
* text. */
@ -8,7 +9,7 @@
Tk_Uid wrapMode; /* How to handle wrap-around for this tag.
* One of tkTextCharUid, tkTextNoneUid,
* or tkTextWordUid. */
@@ -311,6 +312,21 @@
@@ -311,6 +312,21 @@ static int CharMeasureProc _ANSI_ARGS_(
int x));
static void CharUndisplayProc _ANSI_ARGS_((TkText *textPtr,
TkTextDispChunk *chunkPtr));
@ -30,7 +31,7 @@
static void DisplayDLine _ANSI_ARGS_((TkText *textPtr,
DLine *dlPtr, DLine *prevPtr, Pixmap pixmap));
static void DisplayLineBackground _ANSI_ARGS_((TkText *textPtr,
@@ -479,7 +495,7 @@
@@ -479,7 +495,7 @@ GetStyle(textPtr, indexPtr)
int borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio;
int fgPrio, fontPrio, fgStipplePrio;
@ -39,7 +40,7 @@
int lMargin1Prio, lMargin2Prio, rMarginPrio;
int spacing1Prio, spacing2Prio, spacing3Prio;
int overstrikePrio, tabPrio, wrapPrio;
@@ -494,7 +510,7 @@
@@ -494,7 +510,7 @@ GetStyle(textPtr, indexPtr)
tagPtrs = TkBTreeGetTags(indexPtr, &numTags);
borderPrio = borderWidthPrio = reliefPrio = bgStipplePrio = -1;
fgPrio = fontPrio = fgStipplePrio = -1;
@ -48,7 +49,7 @@
lMargin1Prio = lMargin2Prio = rMarginPrio = -1;
spacing1Prio = spacing2Prio = spacing3Prio = -1;
overstrikePrio = tabPrio = wrapPrio = -1;
@@ -612,6 +628,11 @@
@@ -612,6 +628,11 @@ GetStyle(textPtr, indexPtr)
styleValues.underline = tagPtr->underline;
underlinePrio = tagPtr->priority;
}
@ -60,7 +61,7 @@
if ((tagPtr->wrapMode != NULL)
&& (tagPtr->priority > wrapPrio)) {
styleValues.wrapMode = tagPtr->wrapMode;
@@ -768,7 +789,7 @@
@@ -768,7 +789,7 @@ LayoutDLine(textPtr, indexPtr)
* lines with numChars > 0. Used to
* drop 0-sized chunks from the end
* of the line. */
@ -69,12 +70,12 @@
StyleValues *sValuePtr;
/*
@@ -786,6 +807,34 @@
@@ -786,7 +807,35 @@ LayoutDLine(textPtr, indexPtr)
dlPtr->nextPtr = NULL;
dlPtr->flags = NEW_LAYOUT;
+
+ /*
/*
+ * special case entirely elide line as there may be 1000s or more
+ */
+ elide = TkTextIsElided(textPtr, indexPtr); /* save a malloc */
@ -101,10 +102,11 @@
+
+
+
/*
+ /*
* Each iteration of the loop below creates one TkTextDispChunk for
* the new display line. The line will always have at least one
@@ -797,6 +846,7 @@
* chunk (for the newline character at the end, if there's nothing
@@ -797,6 +846,7 @@ LayoutDLine(textPtr, indexPtr)
lastChunkPtr = NULL;
chunkPtr = NULL;
noCharsYet = 1;
@ -112,7 +114,7 @@
breakChunkPtr = NULL;
breakCharOffset = 0;
justify = TK_JUSTIFY_LEFT;
@@ -821,6 +871,31 @@
@@ -821,6 +871,31 @@ LayoutDLine(textPtr, indexPtr)
}
while (segPtr != NULL) {
@ -144,7 +146,7 @@
if (segPtr->typePtr->layoutProc == NULL) {
segPtr = segPtr->nextPtr;
offset = 0;
@@ -831,6 +906,7 @@
@@ -831,6 +906,7 @@ LayoutDLine(textPtr, indexPtr)
chunkPtr->nextPtr = NULL;
}
chunkPtr->stylePtr = GetStyle(textPtr, &curIndex);
@ -152,7 +154,7 @@
/*
* Save style information such as justification and indentation,
@@ -864,7 +940,7 @@
@@ -864,7 +940,7 @@ LayoutDLine(textPtr, indexPtr)
gotTab = 0;
maxChars = segPtr->size - offset;
@ -161,7 +163,7 @@
if (segPtr->typePtr == &tkTextCharType) {
char *p;
@@ -877,8 +953,21 @@
@@ -877,8 +953,21 @@ LayoutDLine(textPtr, indexPtr)
}
}
}
@ -184,7 +186,7 @@
code = (*segPtr->typePtr->layoutProc)(textPtr, &curIndex, segPtr,
offset, maxX-tabSize, maxChars, noCharsYet, wrapMode,
chunkPtr);
@@ -950,6 +1039,7 @@
@@ -950,6 +1039,7 @@ LayoutDLine(textPtr, indexPtr)
offset = 0;
segPtr = segPtr->nextPtr;
}
@ -192,7 +194,7 @@
chunkPtr = NULL;
}
if (noCharsYet) {
@@ -998,6 +1088,7 @@
@@ -998,6 +1088,7 @@ LayoutDLine(textPtr, indexPtr)
wholeLine = 0;
}
@ -200,7 +202,7 @@
/*
* Make tab adjustments for the last tab stop, if there is one.
*/
@@ -1321,6 +1412,7 @@
@@ -1321,6 +1412,7 @@ UpdateDisplayInfo(textPtr)
index.linePtr = TkBTreeFindLine(textPtr->tree, lineNum);
index.charIndex = 0;
lowestPtr = NULL;
@ -208,7 +210,7 @@
do {
dlPtr = LayoutDLine(textPtr, &index);
dlPtr->nextPtr = lowestPtr;
@@ -1554,6 +1646,8 @@
@@ -1554,6 +1646,8 @@ DisplayDLine(textPtr, dlPtr, prevPtr, pi
Display *display;
int height, x;
@ -217,7 +219,7 @@
/*
* First, clear the area of the line to the background color for the
* text widget.
@@ -1620,12 +1714,16 @@
@@ -1620,12 +1714,16 @@ DisplayDLine(textPtr, dlPtr, prevPtr, pi
* something is off to the right).
*/
@ -234,7 +236,7 @@
(*chunkPtr->displayProc)(chunkPtr, x, dlPtr->spaceAbove,
dlPtr->height - dlPtr->spaceAbove - dlPtr->spaceBelow,
dlPtr->baseline - dlPtr->spaceAbove, display, pixmap,
@@ -1714,6 +1812,7 @@
@@ -1714,6 +1812,7 @@ DisplayLineBackground(textPtr, dlPtr, pr
StyleValues *sValuePtr;
Display *display;
@ -242,7 +244,7 @@
/*
* Pass 1: scan through dlPtr from left to right. For each range of
* chunks with the same style, draw the main background for the style
@@ -1787,7 +1886,7 @@
@@ -1787,7 +1886,7 @@ DisplayLineBackground(textPtr, dlPtr, pr
rightX = maxX;
}
chunkPtr2 = NULL;
@ -251,7 +253,7 @@
/*
* Find the chunk in the previous line that covers leftX.
*/
@@ -1908,7 +2007,8 @@
@@ -1908,7 +2007,8 @@ DisplayLineBackground(textPtr, dlPtr, pr
rightX = maxX;
}
chunkPtr2 = NULL;
@ -261,7 +263,7 @@
/*
* Find the chunk in the previous line that covers leftX.
*/
@@ -2299,6 +2399,7 @@
@@ -2299,6 +2399,7 @@ DisplayText(clientData)
for (prevPtr = NULL, dlPtr = textPtr->dInfoPtr->dLinePtr;
(dlPtr != NULL) && (dlPtr->y < dInfoPtr->maxY);
prevPtr = dlPtr, dlPtr = dlPtr->nextPtr) {
@ -269,7 +271,7 @@
if (dlPtr->oldY != dlPtr->y) {
if (tkTextDebug) {
char string[TK_POS_CHARS];
@@ -2315,6 +2416,7 @@
@@ -2315,6 +2416,7 @@ DisplayText(clientData)
dlPtr->oldY = dlPtr->y;
dlPtr->flags &= ~NEW_LAYOUT;
}
@ -277,7 +279,7 @@
}
Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap);
}
@@ -3369,6 +3471,7 @@
@@ -3369,6 +3471,7 @@ ScrollByLines(textPtr, offset)
dlPtr = LayoutDLine(textPtr, &index);
dlPtr->nextPtr = lowestPtr;
lowestPtr = dlPtr;
@ -285,7 +287,7 @@
TkTextIndexForwChars(&index, dlPtr->count, &index);
charsToCount -= dlPtr->count;
} while ((charsToCount > 0)
@@ -3381,7 +3484,7 @@
@@ -3381,7 +3484,7 @@ ScrollByLines(textPtr, offset)
break;
}
}
@ -294,7 +296,7 @@
/*
* Discard the display lines, then either return or prepare
* for the next display line to lay out.
@@ -3410,12 +3513,14 @@
@@ -3410,12 +3513,14 @@ ScrollByLines(textPtr, offset)
TkBTreeNumLines(textPtr->tree));
for (i = 0; i < offset; i++) {
dlPtr = LayoutDLine(textPtr, &textPtr->topIndex);
@ -309,7 +311,7 @@
textPtr->topIndex = new;
}
}
@@ -3949,7 +4054,7 @@
@@ -3949,7 +4054,7 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
* index of the character nearest to (x,y). */
{
TextDInfo *dInfoPtr = textPtr->dInfoPtr;
@ -318,7 +320,7 @@
register TkTextDispChunk *chunkPtr;
/*
@@ -3982,8 +4087,9 @@
@@ -3982,8 +4087,9 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
* Find the display line containing the desired y-coordinate.
*/
@ -329,16 +331,17 @@
if (dlPtr->nextPtr == NULL) {
/*
* Y-coordinate is off the bottom of the displayed text.
@@ -3994,6 +4100,8 @@
@@ -3994,7 +4100,9 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
break;
}
}
+ if (dlPtr->chunkPtr == NULL) dlPtr = validdlPtr;
+
+
/*
* Scan through the line's chunks to find the one that contains
@@ -4005,12 +4113,12 @@
* the desired x-coordinate. Before doing this, translate the
@@ -4005,12 +4113,12 @@ TkTextPixelIndex(textPtr, x, y, indexPtr
*indexPtr = dlPtr->index;
x = x - dInfoPtr->x + dInfoPtr->curPixelOffset;
for (chunkPtr = dlPtr->chunkPtr; x >= (chunkPtr->x + chunkPtr->width);
@ -354,7 +357,7 @@
}
/*
@@ -4166,6 +4274,7 @@
@@ -4166,6 +4274,7 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
{
TextDInfo *dInfoPtr = textPtr->dInfoPtr;
DLine *dlPtr;
@ -362,7 +365,7 @@
/*
* Make sure that all of the screen layout information is up to date.
@@ -4184,8 +4293,9 @@
@@ -4184,8 +4293,9 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
return -1;
}
@ -374,7 +377,7 @@
*yPtr = dlPtr->y;
if ((dlPtr->y + dlPtr->height) > dInfoPtr->maxY) {
*heightPtr = dInfoPtr->maxY - dlPtr->y;
@@ -4196,6 +4306,41 @@
@@ -4196,6 +4306,41 @@ TkTextDLineInfo(textPtr, indexPtr, xPtr,
return 0;
}
@ -416,7 +419,7 @@
/*
*--------------------------------------------------------------
*
@@ -4421,7 +4566,7 @@
@@ -4421,7 +4566,7 @@ CharDisplayProc(chunkPtr, x, y, height,
* Draw the text, underline, and overstrike for this chunk.
*/

15
x11/tk/8.0/patches/patch-ag → x11/tk/8.0/patches/patch-generic_tkTextTag_c
View File

@ -1,6 +1,7 @@
--- ../generic/tkTextTag.c.orig Mon Sep 14 14:23:19 1998
+++ ../generic/tkTextTag.c Wed Jan 5 23:20:56 2000
@@ -63,6 +63,9 @@
$OpenBSD: patch-generic_tkTextTag_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkTextTag.c.orig Mon Sep 14 20:23:19 1998
+++ generic/tkTextTag.c Sun Jan 8 18:09:42 2006
@@ -63,6 +63,9 @@ static Tk_ConfigSpec tagConfigSpecs[] =
{TK_CONFIG_STRING, "-underline", (char *) NULL, (char *) NULL,
(char *) NULL, Tk_Offset(TkTextTag, underlineString),
TK_CONFIG_NULL_OK},
@ -10,7 +11,7 @@
{TK_CONFIG_UID, "-wrap", (char *) NULL, (char *) NULL,
(char *) NULL, Tk_Offset(TkTextTag, wrapMode),
TK_CONFIG_NULL_OK},
@@ -378,6 +381,12 @@
@@ -378,6 +381,12 @@ TkTextTagCmd(textPtr, interp, argc, argv
return TCL_ERROR;
}
}
@ -23,7 +24,7 @@
if ((tagPtr->wrapMode != NULL)
&& (tagPtr->wrapMode != tkTextCharUid)
&& (tagPtr->wrapMode != tkTextNoneUid)
@@ -419,6 +428,7 @@
@@ -419,6 +428,7 @@ TkTextTagCmd(textPtr, interp, argc, argv
|| (tagPtr->spacing3String != NULL)
|| (tagPtr->tabString != NULL)
|| (tagPtr->underlineString != NULL)
@ -31,7 +32,7 @@
|| (tagPtr->wrapMode != NULL)) {
tagPtr->affectsDisplay = 1;
}
@@ -811,6 +821,8 @@
@@ -811,6 +821,8 @@ TkTextCreateTag(textPtr, tagName)
tagPtr->tabArrayPtr = NULL;
tagPtr->underlineString = NULL;
tagPtr->underline = 0;
@ -40,7 +41,7 @@
tagPtr->wrapMode = NULL;
tagPtr->affectsDisplay = 0;
textPtr->numTags++;
@@ -934,6 +946,9 @@
@@ -934,6 +946,9 @@ TkTextFreeTag(textPtr, tagPtr)
}
if (tagPtr->underlineString != NULL) {
ckfree(tagPtr->underlineString);

21
x11/tk/8.0/patches/patch-ac → x11/tk/8.0/patches/patch-generic_tkText_c
View File

@ -1,6 +1,7 @@
--- ../generic/tkText.c.orig Mon Sep 14 14:23:17 1998
+++ ../generic/tkText.c Wed Jan 5 23:20:54 2000
@@ -866,6 +866,7 @@
$OpenBSD: patch-generic_tkText_c,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkText.c.orig Mon Sep 14 20:23:17 1998
+++ generic/tkText.c Sun Jan 8 18:09:42 2006
@@ -866,6 +866,7 @@ ConfigureText(interp, textPtr, argc, arg
|| (textPtr->selTagPtr->spacing2String != NULL)
|| (textPtr->selTagPtr->spacing3String != NULL)
|| (textPtr->selTagPtr->tabString != NULL)
@ -8,7 +9,7 @@
|| (textPtr->selTagPtr->underlineString != NULL)
|| (textPtr->selTagPtr->wrapMode != NULL)) {
textPtr->selTagPtr->affectsDisplay = 1;
@@ -1413,7 +1414,7 @@
@@ -1413,7 +1414,7 @@ TextFetchSelection(clientData, offset, b
}
}
}
@ -17,7 +18,7 @@
memcpy((VOID *) buffer, (VOID *) (segPtr->body.chars
+ offsetInSeg), (size_t) chunkSize);
buffer += chunkSize;
@@ -1554,7 +1555,7 @@
@@ -1554,7 +1555,7 @@ TextSearchCmd(textPtr, interp, argc, arg
int argc; /* Number of arguments. */
char **argv; /* Argument strings. */
{
@ -26,7 +27,7 @@
size_t length;
int numLines, startingLine, startingChar, lineNum, firstChar, lastChar;
int code, matchLength, matchChar, passes, stopLine, searchWholeText;
@@ -1565,6 +1566,7 @@
@@ -1565,6 +1566,7 @@ TextSearchCmd(textPtr, interp, argc, arg
Tcl_DString line, patDString;
TkTextSegment *segPtr;
TkTextLine *linePtr;
@ -34,7 +35,7 @@
Tcl_RegExp regexp = NULL; /* Initialization needed only to
* prevent compiler warning. */
@@ -1573,6 +1575,8 @@
@@ -1573,6 +1575,8 @@ TextSearchCmd(textPtr, interp, argc, arg
*/
exact = 1;
@ -43,7 +44,7 @@
backwards = 0;
noCase = 0;
varName = NULL;
@@ -1586,7 +1590,7 @@
@@ -1586,7 +1590,7 @@ TextSearchCmd(textPtr, interp, argc, arg
badSwitch:
Tcl_AppendResult(interp, "bad switch \"", arg,
"\": must be -forward, -backward, -exact, -regexp, ",
@ -52,7 +53,7 @@
return TCL_ERROR;
}
c = arg[1];
@@ -1601,6 +1605,8 @@
@@ -1601,6 +1605,8 @@ TextSearchCmd(textPtr, interp, argc, arg
varName = argv[i];
} else if ((c == 'e') && (strncmp(argv[i], "-exact", length) == 0)) {
exact = 1;
@ -61,7 +62,7 @@
} else if ((c == 'f') && (strncmp(argv[i], "-forwards", length) == 0)) {
backwards = 0;
} else if ((c == 'n') && (strncmp(argv[i], "-nocase", length) == 0)) {
@@ -1702,9 +1708,10 @@
@@ -1702,9 +1708,10 @@ TextSearchCmd(textPtr, interp, argc, arg
*/
linePtr = TkBTreeFindLine(textPtr->tree, lineNum);

9
x11/tk/8.0/patches/patch-ad → x11/tk/8.0/patches/patch-generic_tkText_h
View File

@ -1,6 +1,7 @@
--- ../generic/tkText.h.orig Mon Sep 14 14:23:18 1998
+++ ../generic/tkText.h Wed Jan 5 23:20:55 2000
@@ -370,6 +370,10 @@
$OpenBSD: patch-generic_tkText_h,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- generic/tkText.h.orig Mon Sep 14 20:23:18 1998
+++ generic/tkText.h Sun Jan 8 18:09:42 2006
@@ -370,6 +370,10 @@ typedef struct TkTextTag {
* Must be tkTextCharUid, tkTextNoneUid,
* tkTextWordUid, or NULL to use wrapMode
* for whole widget. */
@ -11,7 +12,7 @@
int affectsDisplay; /* Non-zero means that this tag affects the
* way information is displayed on the screen
* (so need to redisplay if tag changes). */
@@ -800,6 +804,8 @@
@@ -800,6 +804,8 @@ extern void TkTextLostSelection _ANSI_A
ClientData clientData));
extern TkTextIndex * TkTextMakeIndex _ANSI_ARGS_((TkTextBTree tree,
int lineIndex, int charIndex,

20
x11/tk/8.0/patches/patch-ab → x11/tk/8.0/patches/patch-unix_Makefile_in
View File

@ -1,6 +1,7 @@
--- Makefile.in.orig Tue Mar 9 01:53:50 1999
+++ Makefile.in Tue Jul 18 05:26:36 2000
@@ -112,7 +112,7 @@
$OpenBSD: patch-unix_Makefile_in,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- unix/Makefile.in.orig Tue Mar 9 07:53:50 1999
+++ unix/Makefile.in Sun Jan 8 18:09:42 2006
@@ -112,7 +112,7 @@ X11_LIB_SWITCHES = @XLIBSW@
# Libraries to use when linking. This definition is determined by the
# configure script.
@ -9,7 +10,7 @@
# To turn off the security checks that disallow incoming sends when
# the X server appears to be insecure, reverse the comments on the
@@ -302,14 +302,18 @@
@@ -302,15 +302,19 @@ HDRS = bltList.h \
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@ -22,15 +23,16 @@
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
- $(RANLIB) ${TK_LIB_FILE}
+
+libtk80.a: ${OBJS}
+ rm -f libtk80.a
+ ar cr libtk80.a ${OBJS}
+ $(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
@@ -365,7 +369,7 @@
# extensions. used for the Tcl Plugin. -- dl
@@ -365,7 +369,7 @@ install: install-binaries install-librar
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@ -39,7 +41,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
@@ -377,15 +381,19 @@
@@ -377,15 +381,19 @@ install-binaries: $(TK_LIB_FILE) wish
done;
@echo "Installing $(TK_LIB_FILE)"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@ -61,7 +63,7 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
@@ -395,8 +403,18 @@
@@ -395,8 +403,18 @@ install-libraries:
else true; \
fi; \
done;

13
x11/tk/8.0/patches/patch-aa → x11/tk/8.0/patches/patch-unix_configure
View File

@ -1,6 +1,7 @@
--- configure.orig Tue Mar 9 01:53:50 1999
+++ configure Thu Jan 13 20:27:11 2000
@@ -880,8 +880,8 @@
$OpenBSD: patch-unix_configure,v 1.1 2006/01/08 17:20:11 naddy Exp $
--- unix/configure.orig Tue Mar 9 07:53:50 1999
+++ unix/configure Sun Jan 8 18:09:42 2006
@@ -880,8 +880,8 @@ fi
if test ! -d $TCL_BIN_DIR; then
{ echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
fi
@ -11,7 +12,7 @@
fi
#--------------------------------------------------------------------
@@ -922,6 +922,8 @@
@@ -922,6 +922,8 @@ CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
@ -20,7 +21,7 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
@@ -2389,12 +2391,11 @@
@@ -2389,12 +2391,11 @@ if test "$ok" = "yes" -a "${SHLIB_SUFFIX
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
@ -34,7 +35,7 @@
fi
DBGX='${TK_DBGX}'
@@ -2600,6 +2601,7 @@
@@ -2600,6 +2601,7 @@ s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
s%@TCL_DBGX@%$TCL_DBGX%g
s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g