Fix Python binding, which has been broken since 0.24.

Pass BUILDLINK_CPPFLAGS to subversion-python build so building with a
Python package using pth will work.

4 files changed, 53 insertions, 29 deletions

diff --git a/devel/subversion-python/Makefile b/devel/subversion-python/Makefile
index 6a396406c92..6f9b402ead6 100644
--- a/devel/subversion-python/Makefile
+++ b/devel/subversion-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/05/30 11:43:31 epg Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/15 23:42:59 epg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 COMMENT=	Python bindings and tools for Subversion
@@ -14,13 +14,15 @@ PYTHON_PATCH_SCRIPTS=	tools/cvs2svn/cvs2svn.py tools/hook-scripts/mailer.py
 ALL_TARGET=		swig-py-lib swig-py
 INSTALL_TARGET=		install-swig-py-lib install-swig-py
 
-MAKE_ENV+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/svn
+MAKE_ENV+=		EXTRA_CPPFLAGS=${BUILDLINK_CPPFLAGS}
+MAKEFLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn		\
+			swig_pydir_extra=${LOCALBASE}/${PYSITELIB}/svn
 
 TEST_TARGET=		all check
 
 post-install:
-	${RM} ${LOCALBASE}/${PYSITELIB}/svn/*.a
-	${RM} ${LOCALBASE}/${PYSITELIB}/svn/*.la
+	${RM} ${LOCALBASE}/${PYSITELIB}/libsvn/*.a
+	${RM} ${LOCALBASE}/${PYSITELIB}/libsvn/*.la
 	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/python
 	${INSTALL_DATA} ${WRKSRC}/tools/examples/*.py ${SVNEXAMPLES}/python
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer.py \
diff --git a/devel/subversion-python/PLIST b/devel/subversion-python/PLIST
index c66d9778fa1..03c95ba4447 100644
--- a/devel/subversion-python/PLIST
+++ b/devel/subversion-python/PLIST
@@ -1,10 +1,33 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/18 13:26:27 epg Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/15 23:42:59 epg Exp $
 bin/cvs2svn
 lib/libsvn_swig_py-1.a
 lib/libsvn_swig_py-1.la
 lib/libsvn_swig_py-1.so
 lib/libsvn_swig_py-1.so.0
 lib/libsvn_swig_py-1.so.0.0
+${PYSITELIB}/libsvn/__init__.py
+${PYSITELIB}/libsvn/__init__.pyc
+${PYSITELIB}/libsvn/_client.so
+${PYSITELIB}/libsvn/_core.so
+${PYSITELIB}/libsvn/_delta.so
+${PYSITELIB}/libsvn/_fs.so
+${PYSITELIB}/libsvn/_ra.so
+${PYSITELIB}/libsvn/_repos.so
+${PYSITELIB}/libsvn/_wc.so
+${PYSITELIB}/libsvn/client.py
+${PYSITELIB}/libsvn/client.pyc
+${PYSITELIB}/libsvn/core.py
+${PYSITELIB}/libsvn/core.pyc
+${PYSITELIB}/libsvn/delta.py
+${PYSITELIB}/libsvn/delta.pyc
+${PYSITELIB}/libsvn/fs.py
+${PYSITELIB}/libsvn/fs.pyc
+${PYSITELIB}/libsvn/ra.py
+${PYSITELIB}/libsvn/ra.pyc
+${PYSITELIB}/libsvn/repos.py
+${PYSITELIB}/libsvn/repos.pyc
+${PYSITELIB}/libsvn/wc.py
+${PYSITELIB}/libsvn/wc.pyc
 ${PYSITELIB}/rcsparse/__init__.py
 ${PYSITELIB}/rcsparse/common.py
 ${PYSITELIB}/rcsparse/compat.py
@@ -13,13 +36,6 @@ ${PYSITELIB}/rcsparse/default.py
 ${PYSITELIB}/rcsparse/texttools.py
 ${PYSITELIB}/svn/__init__.py
 ${PYSITELIB}/svn/__init__.pyc
-${PYSITELIB}/svn/_client.so
-${PYSITELIB}/svn/_core.so
-${PYSITELIB}/svn/_delta.so
-${PYSITELIB}/svn/_fs.so
-${PYSITELIB}/svn/_ra.so
-${PYSITELIB}/svn/_repos.so
-${PYSITELIB}/svn/_wc.so
 ${PYSITELIB}/svn/client.py
 ${PYSITELIB}/svn/client.pyc
 ${PYSITELIB}/svn/core.py
@@ -48,7 +64,8 @@ share/examples/subversion/python/putfile.py
 share/examples/subversion/python/revplist.py
 share/examples/subversion/python/svnlook.py
 share/examples/subversion/python/svnshell.py
-@dirrm share/doc/subversion/cvs2svn
 @dirrm share/examples/subversion/python
+@dirrm share/doc/subversion/cvs2svn
 @dirrm ${PYSITELIB}/svn
 @dirrm ${PYSITELIB}/rcsparse
+@dirrm ${PYSITELIB}/libsvn
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index baf5d25d639..255d0e5732b 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2003/08/15 19:27:44 recht Exp $
+$NetBSD: distinfo,v 1.12 2003/08/15 23:42:58 epg Exp $
 
 SHA1 (subversion-0.27.0.tar.gz) = 9c1844825991ed46dbc5394690b795435851b090
 Size (subversion-0.27.0.tar.gz) = 7326370 bytes
 SHA1 (patch-aa) = 15356102bdef8c5441fd7187bba2d052c9918b58
 SHA1 (patch-ac) = 6f57283a7b0088d596461b31ebf2838be3f440c6
-SHA1 (patch-ad) = fba4b284dd3cceffdb5bfa68917f734e900f67a7
+SHA1 (patch-ad) = 51b87256105182c02cd02a9530378d3caedd845b
 SHA1 (patch-ae) = c44ab54dccdec60fa83a86464bef1eba68597615
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index 98bba9875f6..bae8bf0dc72 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,16 +1,21 @@
-$NetBSD: patch-ad,v 1.5 2003/08/15 19:27:45 recht Exp $
+$NetBSD: patch-ad,v 1.6 2003/08/15 23:42:59 epg Exp $
 
---- Makefile.in.orig	2003-08-14 14:21:35.000000000 +0200
-+++ Makefile.in	2003-08-15 18:05:39.000000000 +0200
-@@ -74,8 +74,9 @@
- swig_pl_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+# XXX pkgsrc: take swig_pydir from the environment
-+#swig_pydir = @libdir@/svn-python/svn
-+swig_pydir_extra = ${swig_pydir}
- swig_javadir = @libdir@/svn-java
- swig_pldir = @libdir@/svn-perl
+--- Makefile.in.orig	Thu Aug 14 07:21:35 2003
++++ Makefile.in
+@@ -107,13 +107,13 @@ SWIG_INCLUDES = -I$(SWIG_SRC_DIR) \
+                 $(SVN_APR_INCLUDES)
+ SWIG_LDFLAGS = @SWIG_LDFLAGS@
+ SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@
+-SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
++SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ $(CPPFLAGS)
+ SWIG_PY_LINK = @SWIG_PY_LINK@
+ SWIG_JAVA_INCLUDES = @SWIG_JAVA_INCLUDES@
+-SWIG_JAVA_COMPILE = $(CC) -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -fPIC
++SWIG_JAVA_COMPILE = $(CC) -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -fPIC $(CPPFLAGS)
+ SWIG_JAVA_LINK = $(CC) -shared
+ SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
+-SWIG_PL_COMPILE = @SWIG_PL_COMPILE@
++SWIG_PL_COMPILE = @SWIG_PL_COMPILE@  $(CPPFLAGS)
+ SWIG_PL_LINK = @SWIG_PL_LINK@
  
+ SVN_APR_INCLUDES = @SVN_APR_INCLUDES@