Import of pkgsrc-2014Q1
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
# $NetBSD: Makefile,v 1.49 2013/06/29 08:56:56 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.53 2013/09/05 07:07:46 adam Exp $
|
||||
|
||||
PKGNAME= subversion-${SVNVER}
|
||||
COMMENT= Version control system, meta-package
|
||||
|
||||
META_PACKAGE= # empty
|
||||
META_PACKAGE= yes
|
||||
|
||||
.include "../../devel/subversion/Makefile.common"
|
||||
|
||||
RUBY_VERSION_SUPPORTED= 18
|
||||
|
||||
DEPENDS+= subversion-base-${SVNVER}{,nb[0-9]*}:../../devel/subversion-base
|
||||
DEPENDS+= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}{,nb[0-9]*}:../../www/ap2-subversion
|
||||
DEPENDS+= p5-subversion-${SVNVER}{,nb[0-9]*}:../../devel/p5-subversion
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.common,v 1.38 2013/02/09 13:22:09 ryoon Exp $
|
||||
# $NetBSD: Makefile.common,v 1.40 2013/11/29 13:49:27 adam Exp $
|
||||
# used by devel/java-subversion/Makefile
|
||||
# used by devel/p5-subversion/Makefile
|
||||
# used by devel/py-subversion/Makefile
|
||||
@@ -7,20 +7,19 @@
|
||||
# used by devel/subversion/Makefile
|
||||
# used by www/ap2-subversion/Makefile
|
||||
|
||||
DISTNAME= subversion-${SVNVER}
|
||||
CATEGORIES= devel scm
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:=subversion/}
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://subversion.apache.org/
|
||||
LICENSE= apache-1.1
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
DISTNAME= subversion-${SVNVER}
|
||||
CATEGORIES= devel scm
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:=subversion/}
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://subversion.apache.org/
|
||||
LICENSE= apache-1.1
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
# People who might update Makefile.version may not be set up to test
|
||||
# ruby/python/perl and java bindings, and testing ap2-subversion is
|
||||
# awkward. If you object to updates without these tests, please
|
||||
# volunteer to test patches and your email address can be recorded
|
||||
# here. (Absent volunteers, breakage of language bindings will not be
|
||||
# considered a terrible occurrence.)
|
||||
# ruby/python/perl and java bindings, and testing ap2-subversion is awkward.
|
||||
# If you object to updates without these tests, please volunteer to test
|
||||
# patches and your email address can be recorded here. (Absent volunteers,
|
||||
# breakage of language bindings will not be considered a terrible occurrence.)
|
||||
MAINTAINER_TEST_VOLUNTEERS=
|
||||
|
||||
.include "../../devel/subversion/Makefile.version"
|
||||
@@ -40,7 +39,7 @@ GNU_CONFIGURE= YES
|
||||
.include "../../devel/subversion-base/options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mserf)
|
||||
CONFIGURE_ARGS+= --with-serf=${BUILDLINK_PREFIX.serf} --without-neon
|
||||
CONFIGURE_ARGS+= --with-serf=${BUILDLINK_PREFIX.serf}
|
||||
.else
|
||||
CONFIGURE_ARGS+= --with-neon=${BUILDLINK_PREFIX.neon}
|
||||
.endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.version,v 1.62 2013/06/29 08:56:56 obache Exp $
|
||||
# $NetBSD: Makefile.version,v 1.68 2014/02/23 09:59:19 adam Exp $
|
||||
|
||||
# When updating subversion, all packages are updated at the same time
|
||||
# to have a consistent set of packages. A particularly tricky aspect
|
||||
@@ -7,5 +7,5 @@
|
||||
# changing the version.
|
||||
|
||||
.if !defined(SVNVER)
|
||||
SVNVER= 1.7.10
|
||||
SVNVER= 1.8.8
|
||||
.endif
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
$NetBSD: distinfo,v 1.84 2013/06/29 08:56:56 obache Exp $
|
||||
$NetBSD: distinfo,v 1.91 2014/02/23 09:59:19 adam Exp $
|
||||
|
||||
SHA1 (subversion-1.7.10.tar.bz2) = a4f3de0a13b034b0eab4d35512c6c91a4abcf4f5
|
||||
RMD160 (subversion-1.7.10.tar.bz2) = 1919161092ef6014cdfcbf52e22a576744468fd2
|
||||
Size (subversion-1.7.10.tar.bz2) = 5952121 bytes
|
||||
SHA1 (subversion-1.8.8.tar.bz2) = 8e9f10b7a9704c90e17cfe76fd56e3fe74c01a7a
|
||||
RMD160 (subversion-1.8.8.tar.bz2) = 0bcf2d904a62ce107ec8461b6fd844fc4cb6b122
|
||||
Size (subversion-1.8.8.tar.bz2) = 6821200 bytes
|
||||
SHA1 (patch-ad) = ae54d77447c2ef746bca21f755aa7c255c9521b9
|
||||
SHA1 (patch-ae) = 9be99291ffb37eb10859a98cb25dee4228136a00
|
||||
SHA1 (patch-ae) = 0e9816be14d0fa33e88e12c8087f7d53dead4ed8
|
||||
SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,19 +1,18 @@
|
||||
$NetBSD: patch-ae,v 1.19 2013/02/09 13:22:10 ryoon Exp $
|
||||
$NetBSD: patch-ae,v 1.21 2013/09/18 12:15:57 obache Exp $
|
||||
|
||||
Second hunk is subversion Revision 1145203. Ensure the
|
||||
Perl extension is built using the Perl compiler flags.
|
||||
* tell location of libraries from subversion base package.
|
||||
|
||||
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2012-09-30 04:02:09.000000000 +0000
|
||||
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2012-12-14 06:05:48.000000000 +0000
|
||||
+++ subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||
@@ -35,9 +35,10 @@ my $svnlib_srcdir = "${top_srcdir}/subve
|
||||
@@ -35,9 +35,11 @@ my $svnlib_srcdir = "${top_srcdir}/subve
|
||||
my $svnlib_builddir = "${top_builddir}/subversion";
|
||||
my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
|
||||
my $swig_builddir = "${svnlib_builddir}/bindings/swig";
|
||||
+my $subversion_base_lib = $ENV{SUBVERSION_BASE_PREFIX} . "/lib";
|
||||
|
||||
my @modules = qw/client delta fs ra repos wc/;
|
||||
-my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
|
||||
+my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", $subversion_base_lib,
|
||||
my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
|
||||
+ $subversion_base_lib,
|
||||
map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
|
||||
@modules, qw/diff subr ra_local ra_svn ra_neon
|
||||
ra_serf fs_base fs_util fs_fs/);
|
||||
@modules, qw/diff subr ra_local ra_svn ra_serf
|
||||
fs_base fs_util fs_fs/);
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh,v 1.1 2013/07/04 19:31:15 wiz Exp $
|
||||
|
||||
Fix unportable test(1) construct.
|
||||
|
||||
--- tools/dev/benchmarks/large_dirs/create_bigdir.sh.orig 2012-05-21 00:23:26.000000000 +0000
|
||||
+++ tools/dev/benchmarks/large_dirs/create_bigdir.sh
|
||||
@@ -199,7 +199,7 @@ while [ $FILECOUNT -lt $MAXCOUNT ]; do
|
||||
run_svn_del ${FILECOUNT} 1
|
||||
|
||||
printf "\tDeleting files ... \t"
|
||||
- if [ "$FILECOUNT" == "1" ] ; then
|
||||
+ if [ "$FILECOUNT" = "1" ] ; then
|
||||
printf " skipped (0 files to delete)\n"
|
||||
else
|
||||
run_svn_del_many ${FILECOUNT}
|
||||
Reference in New Issue
Block a user