fix build using solaris ld which is more picky about not ignoring bogus

stuff in the symbol file, by copying to an alternate file and patching.
based on info from http://www.mail-archive.com/xml@gnome.org/msg07624.html

3 files changed, 80 insertions, 2 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index c63b3e53c11..69bb1b3e5d0 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2010/04/13 16:14:03 drochner Exp $
+# $NetBSD: Makefile,v 1.85 2010/09/08 13:53:00 tez Exp $
 
 DISTNAME=	libxslt-1.1.26
 CATEGORIES=	textproc
@@ -30,6 +30,13 @@ TEST_TARGET=		check
 CPPFLAGS+=	-Dsocklen_t=int
 .endif
 
+post-extract:
+	cp ${WRKSRC}/libxslt/libxslt.syms ${WRKSRC}/libxslt/libxslt_solaris.syms
+
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+=	rename:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms
+.endif
+
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.27
 
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index ad5dd764043..17dd2b6eec3 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2010/04/13 16:14:03 drochner Exp $
+$NetBSD: distinfo,v 1.52 2010/09/08 13:53:00 tez Exp $
 
 SHA1 (libxslt-1.1.26.tar.gz) = 69f74df8228b504a87e2b257c2d5238281c65154
 RMD160 (libxslt-1.1.26.tar.gz) = fc7630352ae5772d25fc8132a373d477fb8d8d5f
@@ -6,3 +6,4 @@ Size (libxslt-1.1.26.tar.gz) = 3401513 bytes
 SHA1 (patch-aa) = 6a6b05d3166ce722a6da867fa1701179b9bfa6c2
 SHA1 (patch-ae) = ea154e23704cbd73e3199271e2d0d4a80b2832e8
 SHA1 (patch-ag) = 956ad89edc6dbbca499fb5b82cf2ed98589362a9
+SHA1 (patch-ah) = 61a9e9a142d6ffc3d378eebeca2b3b91148d7e78
diff --git a/textproc/libxslt/patches/patch-ah b/textproc/libxslt/patches/patch-ah
new file mode 100644
index 00000000000..cd899d1b2b6
--- /dev/null
+++ b/textproc/libxslt/patches/patch-ah
@@ -0,0 +1,70 @@
+$NetBSD: patch-ah,v 1.1 2010/09/08 13:53:00 tez Exp $
+
+fix syms file for stricter solaris ld
+
+--- libxslt/libxslt_solaris.syms.orig	2010-08-23 15:27:58.923572700 -0500
++++ libxslt/libxslt_solaris.syms	2010-08-23 15:32:43.661353200 -0500
+@@ -107,7 +107,7 @@
+   xsltFreeCompMatchList;
+   xsltFreeTemplateHashes;
+   xsltGetTemplate;
+-  xsltMatchPattern;
++#  xsltMatchPattern;
+   xsltTestCompMatchList;
+ 
+ # preproc
+@@ -406,7 +406,7 @@
+     global:
+ 
+ # xsltInternals
+-  xsltConstNamespaceNameXSLT; # variable
++#  xsltConstNamespaceNameXSLT; # variable
+   xsltExtensionInstructionResultFinalize;
+   xsltExtensionInstructionResultRegister;
+   xsltInitCtxtKey;
+@@ -415,24 +415,24 @@
+   xsltInit;
+ 
+ # xsltInternals
+-  xsltParseAnyXSLTElem;
+-  xsltParseSequenceConstructor;
+-  xsltPointerListAddSize;
+-  xsltPointerListClear;
+-  xsltPointerListCreate;
+-  xsltPointerListFree;
++#  xsltParseAnyXSLTElem;
++#  xsltParseSequenceConstructor;
++#  xsltPointerListAddSize;
++#  xsltPointerListClear;
++#  xsltPointerListCreate;
++#  xsltPointerListFree;
+   xsltRegisterLocalRVT;
+   xsltReleaseRVT;
+-  xsltRestoreDocumentNamespaces;
++#  xsltRestoreDocumentNamespaces;
+ 
+ # extensions
+-  xsltStyleStylesheetLevelGetExtData;
++#  xsltStyleStylesheetLevelGetExtData;
+ 
+ # xsltInternals
+-  xsltTransStorageAdd;
+-  xsltTransStorageRemove;
++#  xsltTransStorageAdd;
++#  xsltTransStorageRemove;
+   xsltUninit;
+-  xsltXSLTAttrMarker; # variable
++#  xsltXSLTAttrMarker; # variable
+ } LIBXML2_1.1.9;
+ 
+ LIBXML2_1.1.20 {
+@@ -475,5 +475,9 @@
+ 
+ # transform
+   xsltProcessOneNode;
++
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++    local:
++  *;
+ } LIBXML2_1.1.25;
+