[pkgsrc/trunk]: pkgsrc/devel/subversion Make this patch match the change i co...

[epg <epg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/941975b81e91
branches:  trunk
changeset: 460567:941975b81e91
user:      epg <epg%pkgsrc.org@localhost>
date:      Sun Aug 31 22:09:51 2003 +0000

description:
Make this patch match the change i committed upstream.

diffstat:

 devel/subversion/distinfo         |   4 ++--
 devel/subversion/patches/patch-ad |  31 +++++++++++++------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diffs (52 lines):

diff -r eeba0487a8fc -r 941975b81e91 devel/subversion/distinfo
--- a/devel/subversion/distinfo Sun Aug 31 22:03:30 2003 +0000
+++ b/devel/subversion/distinfo Sun Aug 31 22:09:51 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2003/08/29 01:58:49 epg Exp $
+$NetBSD: distinfo,v 1.14 2003/08/31 22:09:51 epg Exp $
 
 SHA1 (subversion-0.28.1.tar.gz) = 6a113d76e9994244d075d7edafd377283d14f2ab
 Size (subversion-0.28.1.tar.gz) = 7324504 bytes
 SHA1 (patch-aa) = a4cbb157bd0f3c5d0e0061be6d68903a8357d92d
 SHA1 (patch-ac) = 6f57283a7b0088d596461b31ebf2838be3f440c6
-SHA1 (patch-ad) = 51b87256105182c02cd02a9530378d3caedd845b
+SHA1 (patch-ad) = 3c203f02fbe1f38c973c2c4ab30d8d0ee332dd43
 SHA1 (patch-ae) = c44ab54dccdec60fa83a86464bef1eba68597615
diff -r eeba0487a8fc -r 941975b81e91 devel/subversion/patches/patch-ad
--- a/devel/subversion/patches/patch-ad Sun Aug 31 22:03:30 2003 +0000
+++ b/devel/subversion/patches/patch-ad Sun Aug 31 22:09:51 2003 +0000
@@ -1,21 +1,16 @@
-$NetBSD: patch-ad,v 1.6 2003/08/15 23:42:59 epg Exp $
+$NetBSD: patch-ad,v 1.7 2003/08/31 22:09:52 epg Exp $
 
---- Makefile.in.orig   Thu Aug 14 07:21:35 2003
+--- Makefile.in.orig   Thu Aug 28 11:47:57 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@
+@@ -149,9 +149,9 @@ RUN_SWIG_PL = $(SWIG) -c -perl $(SWIG_IN
+ RUN_SWIG_JAVA = cd ${SWIG_SRC_DIR}/java/org/tigris/subversion/swig && $(SWIG) -c -java -package 'org.tigris.subversion.swig' $(SWIG_INCLUDES) -o ${abs_builddir}/$@
  
- SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
+ # Compilation of SWIG-generated C source code
+-COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
++COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
+ COMPILE_JAVA_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_JAVA_COMPILE) -DSWIGJAVA $(SWIG_INCLUDES) $(SWIG_JAVA_INCLUDES) -prefer-pic -c -o $@
+-COMPILE_PL_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PL_COMPILE) $(SWIG_INCLUDES) $(SWIG_PL_INCLUDES) -prefer-pic -c -o $@
++COMPILE_PL_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PL_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PL_INCLUDES) -prefer-pic -c -o $@
+ 
+ # these commands link the wrapper objects into an extension library/module
+ LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module