diff options
| author | epg <epg> | 2003-08-15 23:42:58 +0000 |
|---|---|---|
| committer | epg <epg> | 2003-08-15 23:42:58 +0000 |
| commit | 84739f4d3306a433feb83e761d5217c4c04e1774 (patch) | |
| tree | d9032dcce42bdd372178f8bce983275c9bf2bdfb /devel/subversion | |
| parent | ccc04f11e06e4272cc83a40dd22e2703aa509c7b (diff) | |
| download | pkgsrc-84739f4d3306a433feb83e761d5217c4c04e1774.tar.gz | |
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.
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/distinfo | 4 | ||||
| -rw-r--r-- | devel/subversion/patches/patch-ad | 33 |
2 files changed, 21 insertions, 16 deletions
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@ |