Fix parallel building. Patch up another run-time problem, that,

apparently, strikes only under Tk-8.5. Bump PORTREVISION.

3 files changed, 64 insertions, 1 deletions

diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 3ddb93151f5c..0e4f96416d0c 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blt
 PORTVERSION=	2.4z
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/${PORTNAME}/BLT/BLT%20${PORTVERSION} \
 		ftp://ftp.csl.sony.co.jp/pub/kjc/ttt-libs/
diff --git a/x11-toolkits/blt/files/patch-newertcl b/x11-toolkits/blt/files/patch-newertcl
index 5229ec533b8c..c13386c5dd14 100644
--- a/x11-toolkits/blt/files/patch-newertcl
+++ b/x11-toolkits/blt/files/patch-newertcl
@@ -145,6 +145,31 @@
      tagsOption.printProc = Tk_CanvasTagsPrintProc;
  }
 
+The problem, that these two hunks seem to solve is mentioned by other
+people, but no solution is offered anywhere.
+
+	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524149#44
+
+These hunks do seem to fix things, but don't seem right anyway...
+
+--- src/bltHtext.c	2002-07-17 05:56:00.000000000 -0400
++++ src/bltHtext.c	2010-01-23 23:42:09.000000000 -0500
+@@ -3348,5 +3348,5 @@
+      * the text.
+      */
+-    if ((htPtr->first != oldFirst) || (htPtr->last != oldLast)) {
++    if (htPtr->lineArr && ((htPtr->first != oldFirst) || (htPtr->last != oldLast))) {
+ 	int offset;
+ 	int i;
+@@ -3377,5 +3377,6 @@
+ 	}
+     }
+-    DrawPage(htPtr, deltaY);
++    if (htPtr->lineArr)
++	DrawPage(htPtr, deltaY);
+     SendBogusEvent(tkwin);
+ 
+
 The patch below is obtained from RedHat
 	https://bugzilla.redhat.com/show_bug.cgi?id=504388
 When the problem in Tk-8.5 is fixed, the below work-around
diff --git a/x11-toolkits/blt/files/patch-parabuild b/x11-toolkits/blt/files/patch-parabuild
new file mode 100644
index 000000000000..b21793c1054e
--- /dev/null
+++ b/x11-toolkits/blt/files/patch-parabuild
@@ -0,0 +1,38 @@
+--- src/Makefile.in	2002-07-15 05:31:29.000000000 -0400
++++ src/Makefile.in	2010-01-24 14:08:54.000000000 -0500
+@@ -182,7 +182,7 @@
+ $(tcl_only_lib_a):  $(TCL_ONLY_OBJS) $(srcdir)/bltInit.c
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(BLT_LIBRARY)\" \
+-		$(srcdir)/bltInit.c
++		$(srcdir)/bltInit.c -o bltInitTclOnly.o
+ 	$(RM) $@
+-	$(AR) $@ $(TCL_ONLY_OBJS) bltInit.o
++	$(AR) $@ $(TCL_ONLY_OBJS) bltInitTclOnly.o
+ 	$(RANLIB) $@
+ 
+@@ -225,5 +225,5 @@
+ 
+ clean:
+-	$(RM) $(OBJS) bltInit.o $(lib_a) $(tcl_only_lib_a) \
++	$(RM) $(OBJS) bltInit.o bltInitTclOnly.o $(lib_a) $(tcl_only_lib_a) \
+ 		$(bltsh)* $(bltwish)* *pure* .pure*
+ 	(cd shared; $(MAKE) clean) 
+--- src/shared/Makefile.in	2002-05-14 17:37:19.000000000 -0400
++++ src/shared/Makefile.in	2010-01-24 14:10:10.000000000 -0500
+@@ -150,7 +150,7 @@
+ $(tcl_only_lib_so): $(TCL_ONLY_OBJS)
+ 	$(CC) -c $(CC_SWITCHES) -DTCL_ONLY -DBLT_LIBRARY=\"$(scriptdir)\" \
+-		$(srcdir)/bltInit.c
++		$(srcdir)/bltInit.c -o bltInitTclOnly.o
+ 	$(RM) $@
+-	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInit.o $(TCL_ONLY_OBJS) \
++	$(SHLIB_LD) $(SHLIB_LD_FLAGS) -o $@ bltInitTclOnly.o $(TCL_ONLY_OBJS) \
+ 		$(SHLIB_TCL_ONLY_LIB_SPECS)
+ 
+@@ -176,5 +176,5 @@
+ clean:
+ 	$(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \
+-		*pure* .pure* 
++		*pure* .pure* bltInit.o bltInitTclOnly.o
+ 
+ distclean: clean