summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/p5-subversion/Makefile5
-rw-r--r--devel/py-subversion/Makefile3
-rw-r--r--devel/subversion-base/Makefile3
-rw-r--r--devel/subversion/Makefile5
-rw-r--r--devel/subversion/Makefile.version4
-rw-r--r--devel/subversion/distinfo8
-rw-r--r--devel/subversion/patches/patch-ae16
-rw-r--r--www/ap2-subversion/Makefile3
8 files changed, 22 insertions, 25 deletions
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 8f2649bb12f..768f8391bdf 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2003/12/04 17:12:40 recht Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/06 03:01:57 epg Exp $
PKGNAME= p5-subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Perl bindings for Subversion
.include "../../devel/subversion/Makefile.common"
+CONFIGURE_ENV+= PERL=${PERL5}
+
BUILDLINK_PKGSRCDIR.perl= ../../lang/perl58
PERL5_REQD= 5.8.0
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 6d7f0c54987..0fc21770b56 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 17:12:40 recht Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/06 03:01:57 epg Exp $
PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Python bindings and tools for Subversion
.include "../../devel/subversion/Makefile.common"
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 3954dbac806..6229a6817c5 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/12/04 17:12:40 recht Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/06 03:01:58 epg Exp $
PKGNAME= subversion-base-${SVNVER}
-PKGREVISION= 1
COMMENT= Version control system, base programs and libraries
PLIST_SUBST+= INSTALL_INFO=${INSTALL_INFO}
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 054c81b2629..d952da00330 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2003/12/04 17:12:40 recht Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/06 03:01:57 epg Exp $
PKGNAME= subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Version control system, meta-package
DEPENDS+= subversion-base-${SVNVER}:../../devel/subversion-base
DEPENDS+= p5-subversion-${SVNVER}:../../devel/p5-subversion
-DEPENDS+= ap2-subversion-${SVNVER}nb1:../../www/ap2-subversion
+DEPENDS+= ap2-subversion-${SVNVER}:../../www/ap2-subversion
# We depend on py-subversion via its buildlink2.mk so we don't
# have to worry about which Python version it uses.
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 435877b324a..67dbdc16c7a 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.10 2003/12/03 15:20:44 epg Exp $
+# $NetBSD: Makefile.version,v 1.11 2003/12/06 03:01:57 epg Exp $
.if !defined(SVNVER)
-SVNVER= 0.33.1
+SVNVER= 0.34.0
.endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 62c00e1ee54..0aaa9b02940 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2003/12/03 15:20:44 epg Exp $
+$NetBSD: distinfo,v 1.20 2003/12/06 03:01:57 epg Exp $
-SHA1 (subversion-0.33.1.tar.gz) = ef83269cd2499a7e43a2db3cae48de506a2be323
-Size (subversion-0.33.1.tar.gz) = 7744097 bytes
+SHA1 (subversion-0.34.0.tar.gz) = 00af9b3a860ae842f0708369936ba4e120ec0a40
+Size (subversion-0.34.0.tar.gz) = 7423143 bytes
SHA1 (patch-aa) = 00bd9a667459a704c6454e581c2cc5b1cfc197a9
SHA1 (patch-ac) = 7f0669a6f684583ff0ca4a443be356ae2fca06db
-SHA1 (patch-ae) = 5779f16e09024c0433617b0806b2236d9bc00a49
+SHA1 (patch-ae) = 3d07f9a929fca2d4521bcaa6b2dce7aa74e12351
SHA1 (patch-ag) = 79106ed622c67c5921eabc4a3254948d131a4a3e
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
index df878481cfc..d2d3f8c7b51 100644
--- a/devel/subversion/patches/patch-ae
+++ b/devel/subversion/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
+$NetBSD: patch-ae,v 1.6 2003/12/06 03:01:57 epg Exp $
---- configure.orig 2003-11-18 01:58:09.000000000 -0500
+--- configure.orig Wed Dec 3 17:40:04 2003
+++ configure
-@@ -21072,8 +21072,9 @@ echo "$as_me: WARNING: swig bindings req
+@@ -10494,8 +10494,9 @@ echo "$as_me: WARNING: swig bindings req
esac
if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
### TODO: When it's ready, add the swig-java-lib rule here.
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
echo "$as_me:$LINENO: checking for swig library directory" >&5
echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -21160,7 +21161,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
+@@ -10582,7 +10583,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
fi
if test "$PERL" != "none" -a "$SWIG_SUITABLE" = "yes"; then
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
SWIG_PL_COMPILE="`$PERL -MConfig -e 'print $Config{cc}'` \$(SWIG_PL_INCLUDES)"
SWIG_PL_LINK="`$PERL -MConfig -e 'print $Config{ld}'` `$PERL -MConfig -e 'print $Config{lddlflags}'` `$PERL -MExtUtils::Embed -e ldopts`"
fi
-@@ -21254,8 +21255,9 @@ echo "$as_me: WARNING: swig bindings req
+@@ -10676,8 +10677,9 @@ echo "$as_me: WARNING: swig bindings req
esac
if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
### TODO: When it's ready, add the swig-java-lib rule here.
@@ -35,7 +35,7 @@ $NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
echo "$as_me:$LINENO: checking for swig library directory" >&5
echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -21342,7 +21344,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
+@@ -10764,7 +10766,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
fi
if test "$PERL" != "none" -a "$SWIG_SUITABLE" = "yes"; then
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
SWIG_PL_COMPILE="`$PERL -MConfig -e 'print $Config{cc}'` \$(SWIG_PL_INCLUDES)"
SWIG_PL_LINK="`$PERL -MConfig -e 'print $Config{ld}'` `$PERL -MConfig -e 'print $Config{lddlflags}'` `$PERL -MExtUtils::Embed -e ldopts`"
fi
-@@ -21439,8 +21441,9 @@ echo "$as_me: WARNING: swig bindings req
+@@ -10861,8 +10863,9 @@ echo "$as_me: WARNING: swig bindings req
esac
if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
### TODO: When it's ready, add the swig-java-lib rule here.
@@ -56,7 +56,7 @@ $NetBSD: patch-ae,v 1.5 2003/12/03 15:20:44 epg Exp $
echo "$as_me:$LINENO: checking for swig library directory" >&5
echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -21527,7 +21530,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
+@@ -10949,7 +10952,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
fi
if test "$PERL" != "none" -a "$SWIG_SUITABLE" = "yes"; then
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 230e4512c5c..458a04ec979 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/12/04 17:12:40 recht Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/06 03:01:58 epg Exp $
PKGNAME= ap2-subversion-${SVNVER}
-PKGREVISION= 2
COMMENT= WebDAV server (Apache module) for Subversion
.include "../../devel/subversion/Makefile.common"