Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1494942711149450"
MIME-Version: 1.0
Date: Tue, 16 May 2017 13:51:51 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/textproc
To: pkgsrc-changes@NetBSD.org
Reply-To: dholland@netbsd.org
Message-Id: <20170516135151.43FD3FBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1494942711149450
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dholland
Date:		Tue May 16 13:51:51 UTC 2017

Modified Files:
	pkgsrc/textproc/libxslt: distinfo
	pkgsrc/textproc/py-libxslt/files: setup.py
Removed Files:
	pkgsrc/textproc/libxslt/patches: patch-python_setup.py

Log Message:
Fix previous. Turns out we provided setup.py (!), but it had no rcsid
so I didn't notice.

Fix rpath handling. Needs to link to libxml2mod.so explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/textproc/libxslt/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/libxslt/patches/patch-python_setup.py
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-libxslt/files/setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1494942711149450
Content-Disposition: inline
Content-Length: 2311
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/libxslt/distinfo
diff -u pkgsrc/textproc/libxslt/distinfo:1.58 pkgsrc/textproc/libxslt/distinfo:1.59
--- pkgsrc/textproc/libxslt/distinfo:1.58	Mon May 15 18:07:40 2017
+++ pkgsrc/textproc/libxslt/distinfo	Tue May 16 13:51:50 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2017/05/15 18:07:40 dholland Exp $
+$NetBSD: distinfo,v 1.59 2017/05/16 13:51:50 dholland Exp $
 
 SHA1 (libxslt-1.1.29.tar.gz) = edcaeabb3555ae44853bdc406ee9521fb65c620d
 RMD160 (libxslt-1.1.29.tar.gz) = 40a5202b3967db6b01cd6c0e722a9e459cac7960
@@ -6,4 +6,3 @@ SHA512 (libxslt-1.1.29.tar.gz) = a1ce555
 Size (libxslt-1.1.29.tar.gz) = 3428524 bytes
 SHA1 (patch-ae) = 40ce3940a93b6a2dc804f62676909d3313e0ea52
 SHA1 (patch-ah) = f92809ab34e53962ec8b62e50ded7a27c89f10f8
-SHA1 (patch-python_setup.py) = 20b257926a8626bce44ca0448d618619a7d69995

Index: pkgsrc/textproc/py-libxslt/files/setup.py
diff -u pkgsrc/textproc/py-libxslt/files/setup.py:1.3 pkgsrc/textproc/py-libxslt/files/setup.py:1.4
--- pkgsrc/textproc/py-libxslt/files/setup.py:1.3	Tue May 16 13:48:05 2017
+++ pkgsrc/textproc/py-libxslt/files/setup.py	Tue May 16 13:51:51 2017
@@ -1,6 +1,6 @@
 #!/usr/bin/python -u
 #
-# $NetBSD: setup.py,v 1.3 2017/05/16 13:48:05 dholland Exp $
+# $NetBSD: setup.py,v 1.4 2017/05/16 13:51:51 dholland Exp $
 # Setup script for libxslt
 #
 import sys, os
@@ -54,7 +54,7 @@ if xml_includes == "":
 iconv_includes="@LIBICONVDIR@/include"
 
 # those are added in the linker search path for libraries
-libdirs = ["@LIBXML2DIR@/lib"]
+libdirs = ["@LIBXML2DIR@/lib", "@PYSHLIBDIR@"]
 
 xml_files = ["libxml2-api.xml", "libxml2-python-api.xml",
              "libxml.c", "libxml.py", "libxml_wrap.h", "types.c",
@@ -133,7 +133,7 @@ descr = "libxml2 package"
 modules = []
 c_files = []
 includes= [xml_includes, iconv_includes]
-libs    = [] + platformLibs
+libs    = ["xml2mod"] + platformLibs
 macros  = []
 if with_threads:
     macros.append(('_REENTRANT','1'))
@@ -162,7 +162,8 @@ if with_xslt == 1:
 extens=[]
 if with_xslt == 1:
     extens.append(Extension('libxsltmod', xslt_c_files, include_dirs=includes,
-			    library_dirs=libdirs, 
+			    library_dirs=libdirs,
+			    runtime_library_dirs=libdirs,
                             libraries=libs, define_macros=macros))
 
 if missing("MANIFEST"):


--_----------=_1494942711149450--