Add missing string.h. Fix return values. Fix rpath.

3 files changed, 185 insertions, 18 deletions

diff --git a/textproc/tcl-expat/distinfo b/textproc/tcl-expat/distinfo
index a8d93aa334d..93b097a26b0 100644
--- a/textproc/tcl-expat/distinfo
+++ b/textproc/tcl-expat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/08/21 21:58:14 marino Exp $
+$NetBSD: distinfo,v 1.8 2013/01/11 23:35:12 joerg Exp $
 
 SHA1 (TclExpat-1.1.tar.gz) = 232bb47305a471dc0f8bc52e684a04b7cf703b80
 RMD160 (TclExpat-1.1.tar.gz) = 2d133137d51ffd0ca7ad638433836f97782b4e29
 Size (TclExpat-1.1.tar.gz) = 268538 bytes
-SHA1 (patch-aa) = 25310d22fee902214d45fd7a3c441bcfa216f8f8
-SHA1 (patch-ab) = 9985adb007741c36182d093a18c210c0230ac566
+SHA1 (patch-aa) = 48873f49c7a0766c0a452c64b7b17434eb4090e3
+SHA1 (patch-ab) = b634ad113025fbbdaef76c82b837a5c769fec8dc
diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa
index 00a5007d195..b7430205752 100644
--- a/textproc/tcl-expat/patches/patch-aa
+++ b/textproc/tcl-expat/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2012/08/21 21:58:14 marino Exp $
+$NetBSD: patch-aa,v 1.7 2013/01/11 23:35:12 joerg Exp $
 
 libtcl85 is hard-coded in the patch, just like it's predecessor.
 
@@ -50,7 +50,7 @@ libtcl85 is hard-coded in the patch, just like it's predecessor.
 -${OBJS}:
 -	cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
 +$(LIB):		tclexpat.o
-+	$(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath ${PREFIX}/lib -lexpat -ltcl85 -module -avoid-version
++	$(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath "$$(echo $(TCL_PACKAGE_PATH) | cut -f 1 -d :)" -Wl,-rpath,${PREFIX}/lib -lexpat -ltcl85 -module -avoid-version
  
  tclexpat.o:	tclexpat.c
 -	$(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c
diff --git a/textproc/tcl-expat/patches/patch-ab b/textproc/tcl-expat/patches/patch-ab
index 78e4d323fcf..20b5d373fdc 100644
--- a/textproc/tcl-expat/patches/patch-ab
+++ b/textproc/tcl-expat/patches/patch-ab
@@ -1,16 +1,32 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
---- tclexpat.c.orig	Sat Aug 22 03:35:44 1998
-+++ tclexpat.c	Fri Sep 28 18:52:35 2001
-@@ -19,7 +19,7 @@
+$NetBSD: patch-ab,v 1.2 2013/01/11 23:35:12 joerg Exp $
+--- tclexpat.c.orig	1998-08-22 07:35:44.000000000 +0000
++++ tclexpat.c
+@@ -19,7 +19,8 @@
   */
  
  #include <tcl.h>
 -#include "xmlparse.h"
 +#include <expat.h>
++#include <string.h>
  
  /*
   * The structure below is used to refer to an expat parser object.
-@@ -847,11 +847,11 @@
+@@ -814,12 +814,12 @@ TclExpatElementStartHandler(userData, na
+      */
+ 
+     expat->continueCount++;
+-    return;
++    return NULL;
+   }
+ 
+   if (expat->elementstartcommand == NULL || 
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -847,18 +847,18 @@ TclExpatElementStartHandler(userData, na
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -24,7 +40,31 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -917,11 +917,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -894,13 +894,13 @@ TclExpatElementEndHandler(userData, name
+ 
+     if (!--(expat->continueCount)) {
+       expat->status = TCL_OK;
+-      return;
++      return NULL;
+     }
+   }
+ 
+   if (expat->elementendcommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -917,18 +917,18 @@ TclExpatElementEndHandler(userData, name
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -38,7 +78,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -976,11 +976,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -959,7 +959,7 @@ TclExpatCharacterDataHandler(userData, s
+ 
+   if (expat->datacommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -976,18 +976,18 @@ TclExpatCharacterDataHandler(userData, s
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -52,7 +109,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1036,11 +1036,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -1018,7 +1018,7 @@ TclExpatProcessingInstructionHandler(use
+ 
+   if (expat->picommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -1036,18 +1036,18 @@ TclExpatProcessingInstructionHandler(use
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -66,7 +140,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1095,11 +1095,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -1078,7 +1078,7 @@ TclExpatDefaultHandler(userData, s, len)
+ 
+   if (expat->defaultcommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -1095,18 +1095,18 @@ TclExpatDefaultHandler(userData, s, len)
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -80,7 +171,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1169,11 +1169,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -1140,7 +1140,7 @@ TclExpatUnparsedDeclHandler(userData, en
+ 
+   if (expat->unparsedcommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -1169,18 +1169,18 @@ TclExpatUnparsedDeclHandler(userData, en
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -94,7 +202,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1241,11 +1241,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -1213,7 +1213,7 @@ TclExpatNotationDeclHandler(userData, no
+ 
+   if (expat->notationcommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -1241,18 +1241,18 @@ TclExpatNotationDeclHandler(userData, no
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -108,7 +233,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1306,11 +1306,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*
+@@ -1287,7 +1287,7 @@ TclExpatUnknownEncodingHandler(encodingH
+ 
+   if (expat->unknownencodingcommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return 0;
+   }
+ 
+   /*
+@@ -1306,18 +1306,18 @@ TclExpatUnknownEncodingHandler(encodingH
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -122,7 +264,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
-@@ -1370,11 +1370,11 @@
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return 0;
+ }
+ 
+ /*
+@@ -1350,7 +1350,7 @@ TclExpatExternalEntityRefHandler(parser,
+ 
+   if (expat->externalentitycommand == NULL ||
+       expat->status != TCL_OK) {
+-    return;
++    return NULL;
+   }
+ 
+   /*
+@@ -1370,18 +1370,18 @@ TclExpatExternalEntityRefHandler(parser,
     * It would be desirable to be able to terminate parsing
     * if the return result is TCL_ERROR or TCL_BREAK.
     */
@@ -136,3 +295,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/09/28 23:37:09 jwise Exp $
  
    Tcl_DecrRefCount(cmdPtr);
    Tcl_Release((ClientData) expat->interp);
+ 
+   TclExpatHandlerResult(expat, result);
+ 
+-  return;
++  return NULL;
+ }
+ 
+ /*