aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/subversion-devel/Makefile45
-rw-r--r--devel/subversion-devel/distinfo4
-rw-r--r--devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in204
-rw-r--r--devel/subversion-freebsd/Makefile45
-rw-r--r--devel/subversion-freebsd/distinfo4
-rw-r--r--devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in204
-rw-r--r--devel/subversion/Makefile45
-rw-r--r--devel/subversion/distinfo4
-rw-r--r--devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in204
-rw-r--r--devel/subversion16/Makefile45
-rw-r--r--devel/subversion16/distinfo4
-rw-r--r--devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in204
12 files changed, 620 insertions, 392 deletions
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 98f4b2ad06ba..1b13ada96bf1 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.4
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -43,6 +43,15 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.include <bsd.port.pre.mk>
SVNREPOS?= /home/svn/repos
+SVNFSTYPE?= bdb
+
+.if make(repository)
+WITH_REPOSITORY_CREATION= yes
+.endif
+
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET= _mkrepos
+.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
@@ -250,8 +259,9 @@ pre-extract:
@${ECHO_MSG} " subdirectories of your repository"
@${ECHO_MSG} "* the above subdirectories are writable by this group"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'"
- @${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP"
+ @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+ @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
+ @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP nad SVNFSTYPE"
@${ECHO_MSG} ""
.endif
@${ECHO_MSG} ""
@@ -318,7 +328,7 @@ pre-install:
${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
.endif
-post-install:
+post-install: ${MKREPOS_TARGET}
@${MKDIR} ${PREFIX}/share/subversion
cd ${WRKSRC}/tools ; \
tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
@@ -351,8 +361,15 @@ post-install:
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
-.if defined(WITH_REPOSITORY_CREATION) && !exists(${SVNREPOS})
-. if defined(WITH_SVNSERVE_WRAPPER)
+
+repository: _mkrepos
+
+_SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock
+SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,}
+
+_mkrepos: .USE
+.if !exists(${SVNREPOS})
+.if defined(WITH_SVNSERVE_WRAPPER)
@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
else \
@@ -365,21 +382,23 @@ post-install:
${FALSE}; \
fi; \
fi
-. endif
+.endif
@${MKDIR} ${SVNREPOS}
- @${PREFIX}/bin/svnadmin create ${SVNREPOS}
- @${CHGRP} ${SVNGROUP} ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
- @${CHMOD} g+w ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
+ @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
+.if defined(WITH_SVNSERVE_WRAPPER)
+ @${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+ @${CHMOD} g+w ${SVNGRPFILES}
@for i in ${SVNREPOS}/db/* ; do \
i=$${i##*/}; \
case $$i in \
- DB_CONFIG) ;; \
- *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \
- ${CHMOD} g+w ${SVNREPOS}/db/$$i; \
+ DB_CONFIG|fs-type|uuid) ;; \
+ *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
;; \
esac; \
done
.endif
+.endif
post-deinstall:
.if defined(WITH_MOD_DAV_SVN)
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 83fec4ee9a16..a9bf3cf6b701 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.3.tar.bz2) = a09c2b2fa1a09566c024547954a48478
-SIZE (subversion-1.1.3.tar.bz2) = 6793419
+MD5 (subversion-1.1.4.tar.bz2) = 6e557ae65b6b8d7577cc7704ede85a23
+SIZE (subversion-1.1.4.tar.bz2) = 6737067
diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
index 868ff9a558e4..e043f63bf5a1 100644
--- a/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
+++ b/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
@@ -1,83 +1,121 @@
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 20:32:08.000000000 +0400
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2004-11-05 11:51:01.000000000 +0300
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
-+use strict;
- use ExtUtils::MakeMaker;
- use Config;
- use Cwd 'abs_path';
-@@ -15,6 +16,12 @@
- my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
- my $swig_builddir = "${svnlib_builddir}/bindings/swig";
-
-+my $top_builddir = '../../../../..';
-+my $top_srcdir = '@top_srcdir@';
-+my $svnlib_srcdir = "${top_srcdir}/subversion";
-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
-+
-+
- my $swig_version = @SWIG_VERSION@;
- my $swig = '@SWIG@';
-
-@@ -41,15 +48,14 @@
-
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
-- INC => join(' ',$apr_cflags, $apu_cflags,
-+ INC => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
- " -I$swig_srcdir -g"),
- OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
- (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-- @ldmodules, '-lsvn_swig_perl-1',
-- `$swig -perl -ldflags`)],
-+ @ldmodules)],
- test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
- );
-
-@@ -64,6 +70,7 @@
- "\$(INST_LIBDIR)/$_.pm") }
- map { perlish $_ }
- ('base', 'core', @modules)},
-+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
- MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
- "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
- map { perlish $_ }
-@@ -88,18 +95,22 @@
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
-
-- my $flags;
-+ my ($flags, $flags_runtime);
- if ($swig_version >= 103020) {
- $flags = '-noruntime -noproxy';
-+ $flags_runtime = '-runtime -noproxy';
- } else {
-+ # XXX: prehaps deprecated
- $flags = '-c';
- }
-
-- my $swig_command = "$swig $flags -nopm -perl " .
-+ my ($swig_command, $swig_command_runtime) =
-+ map {"$swig $_ -nopm -perl " .
- "-I$swig_srcdir " .
- "-I$swig_srcdir/perl/libsvn_swig_perl".
- " -I$svnlib_srcdir/include" .
-- $apr_cflags;
-+ $apr_cflags}
-+ ($flags, $flags_runtime);
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-@@ -137,7 +148,7 @@
- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
-
- core.c :: $swig_srcdir/core.i
--\t$swig_command -o core.c $swig_srcdir/core.i
-+\t$swig_command_runtime -o core.c $swig_srcdir/core.i
-
- $swig_modules_command
-
+*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005
+--- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005
+***************
+*** 1,4 ****
+! #!/usr/bin/perl
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+--- 1,5 ----
+! #!/usr/bin/perl -w
+! use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+***************
+*** 15,20 ****
+--- 16,27 ----
+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+ my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+
++ my $top_builddir = '../../../../..';
++ my $top_srcdir = '@top_srcdir@';
++ my $svnlib_srcdir = "${top_srcdir}/subversion";
++ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
++
++
+ my $swig_version = @SWIG_VERSION@;
+ my $swig = '@SWIG@';
+
+***************
+*** 48,55 ****
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules, '-lsvn_swig_perl-1',
+! `$swig -perl -ldflags`)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+--- 55,61 ----
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+***************
+*** 64,69 ****
+--- 70,76 ----
+ "\$(INST_LIBDIR)/$_.pm") }
+ map { perlish $_ }
+ ('base', 'core', @modules)},
++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
+ MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
+ "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
+ map { perlish $_ }
+***************
+*** 88,107 ****
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my $flags;
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my $swig_command = "$swig $flags -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags;
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+--- 95,118 ----
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my ($flags, $flags_runtime);
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
++ $flags_runtime = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
++ $flags_runtime = '-runtime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my ($swig_command, $swig_command_runtime) =
+! map { "$swig $_ -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags }
+! ($flags, $flags_runtime);
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+***************
+*** 139,145 ****
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
+--- 150,156 ----
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command_runtime -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 98f4b2ad06ba..1b13ada96bf1 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.4
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -43,6 +43,15 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.include <bsd.port.pre.mk>
SVNREPOS?= /home/svn/repos
+SVNFSTYPE?= bdb
+
+.if make(repository)
+WITH_REPOSITORY_CREATION= yes
+.endif
+
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET= _mkrepos
+.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
@@ -250,8 +259,9 @@ pre-extract:
@${ECHO_MSG} " subdirectories of your repository"
@${ECHO_MSG} "* the above subdirectories are writable by this group"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'"
- @${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP"
+ @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+ @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
+ @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP nad SVNFSTYPE"
@${ECHO_MSG} ""
.endif
@${ECHO_MSG} ""
@@ -318,7 +328,7 @@ pre-install:
${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
.endif
-post-install:
+post-install: ${MKREPOS_TARGET}
@${MKDIR} ${PREFIX}/share/subversion
cd ${WRKSRC}/tools ; \
tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
@@ -351,8 +361,15 @@ post-install:
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
-.if defined(WITH_REPOSITORY_CREATION) && !exists(${SVNREPOS})
-. if defined(WITH_SVNSERVE_WRAPPER)
+
+repository: _mkrepos
+
+_SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock
+SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,}
+
+_mkrepos: .USE
+.if !exists(${SVNREPOS})
+.if defined(WITH_SVNSERVE_WRAPPER)
@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
else \
@@ -365,21 +382,23 @@ post-install:
${FALSE}; \
fi; \
fi
-. endif
+.endif
@${MKDIR} ${SVNREPOS}
- @${PREFIX}/bin/svnadmin create ${SVNREPOS}
- @${CHGRP} ${SVNGROUP} ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
- @${CHMOD} g+w ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
+ @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
+.if defined(WITH_SVNSERVE_WRAPPER)
+ @${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+ @${CHMOD} g+w ${SVNGRPFILES}
@for i in ${SVNREPOS}/db/* ; do \
i=$${i##*/}; \
case $$i in \
- DB_CONFIG) ;; \
- *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \
- ${CHMOD} g+w ${SVNREPOS}/db/$$i; \
+ DB_CONFIG|fs-type|uuid) ;; \
+ *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
;; \
esac; \
done
.endif
+.endif
post-deinstall:
.if defined(WITH_MOD_DAV_SVN)
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 83fec4ee9a16..a9bf3cf6b701 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.3.tar.bz2) = a09c2b2fa1a09566c024547954a48478
-SIZE (subversion-1.1.3.tar.bz2) = 6793419
+MD5 (subversion-1.1.4.tar.bz2) = 6e557ae65b6b8d7577cc7704ede85a23
+SIZE (subversion-1.1.4.tar.bz2) = 6737067
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
index 868ff9a558e4..e043f63bf5a1 100644
--- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
+++ b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
@@ -1,83 +1,121 @@
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 20:32:08.000000000 +0400
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2004-11-05 11:51:01.000000000 +0300
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
-+use strict;
- use ExtUtils::MakeMaker;
- use Config;
- use Cwd 'abs_path';
-@@ -15,6 +16,12 @@
- my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
- my $swig_builddir = "${svnlib_builddir}/bindings/swig";
-
-+my $top_builddir = '../../../../..';
-+my $top_srcdir = '@top_srcdir@';
-+my $svnlib_srcdir = "${top_srcdir}/subversion";
-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
-+
-+
- my $swig_version = @SWIG_VERSION@;
- my $swig = '@SWIG@';
-
-@@ -41,15 +48,14 @@
-
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
-- INC => join(' ',$apr_cflags, $apu_cflags,
-+ INC => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
- " -I$swig_srcdir -g"),
- OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
- (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-- @ldmodules, '-lsvn_swig_perl-1',
-- `$swig -perl -ldflags`)],
-+ @ldmodules)],
- test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
- );
-
-@@ -64,6 +70,7 @@
- "\$(INST_LIBDIR)/$_.pm") }
- map { perlish $_ }
- ('base', 'core', @modules)},
-+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
- MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
- "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
- map { perlish $_ }
-@@ -88,18 +95,22 @@
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
-
-- my $flags;
-+ my ($flags, $flags_runtime);
- if ($swig_version >= 103020) {
- $flags = '-noruntime -noproxy';
-+ $flags_runtime = '-runtime -noproxy';
- } else {
-+ # XXX: prehaps deprecated
- $flags = '-c';
- }
-
-- my $swig_command = "$swig $flags -nopm -perl " .
-+ my ($swig_command, $swig_command_runtime) =
-+ map {"$swig $_ -nopm -perl " .
- "-I$swig_srcdir " .
- "-I$swig_srcdir/perl/libsvn_swig_perl".
- " -I$svnlib_srcdir/include" .
-- $apr_cflags;
-+ $apr_cflags}
-+ ($flags, $flags_runtime);
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-@@ -137,7 +148,7 @@
- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
-
- core.c :: $swig_srcdir/core.i
--\t$swig_command -o core.c $swig_srcdir/core.i
-+\t$swig_command_runtime -o core.c $swig_srcdir/core.i
-
- $swig_modules_command
-
+*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005
+--- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005
+***************
+*** 1,4 ****
+! #!/usr/bin/perl
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+--- 1,5 ----
+! #!/usr/bin/perl -w
+! use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+***************
+*** 15,20 ****
+--- 16,27 ----
+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+ my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+
++ my $top_builddir = '../../../../..';
++ my $top_srcdir = '@top_srcdir@';
++ my $svnlib_srcdir = "${top_srcdir}/subversion";
++ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
++
++
+ my $swig_version = @SWIG_VERSION@;
+ my $swig = '@SWIG@';
+
+***************
+*** 48,55 ****
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules, '-lsvn_swig_perl-1',
+! `$swig -perl -ldflags`)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+--- 55,61 ----
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+***************
+*** 64,69 ****
+--- 70,76 ----
+ "\$(INST_LIBDIR)/$_.pm") }
+ map { perlish $_ }
+ ('base', 'core', @modules)},
++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
+ MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
+ "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
+ map { perlish $_ }
+***************
+*** 88,107 ****
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my $flags;
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my $swig_command = "$swig $flags -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags;
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+--- 95,118 ----
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my ($flags, $flags_runtime);
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
++ $flags_runtime = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
++ $flags_runtime = '-runtime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my ($swig_command, $swig_command_runtime) =
+! map { "$swig $_ -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags }
+! ($flags, $flags_runtime);
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+***************
+*** 139,145 ****
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
+--- 150,156 ----
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command_runtime -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 98f4b2ad06ba..1b13ada96bf1 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.4
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -43,6 +43,15 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.include <bsd.port.pre.mk>
SVNREPOS?= /home/svn/repos
+SVNFSTYPE?= bdb
+
+.if make(repository)
+WITH_REPOSITORY_CREATION= yes
+.endif
+
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET= _mkrepos
+.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
@@ -250,8 +259,9 @@ pre-extract:
@${ECHO_MSG} " subdirectories of your repository"
@${ECHO_MSG} "* the above subdirectories are writable by this group"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'"
- @${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP"
+ @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+ @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
+ @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP nad SVNFSTYPE"
@${ECHO_MSG} ""
.endif
@${ECHO_MSG} ""
@@ -318,7 +328,7 @@ pre-install:
${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
.endif
-post-install:
+post-install: ${MKREPOS_TARGET}
@${MKDIR} ${PREFIX}/share/subversion
cd ${WRKSRC}/tools ; \
tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
@@ -351,8 +361,15 @@ post-install:
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
-.if defined(WITH_REPOSITORY_CREATION) && !exists(${SVNREPOS})
-. if defined(WITH_SVNSERVE_WRAPPER)
+
+repository: _mkrepos
+
+_SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock
+SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,}
+
+_mkrepos: .USE
+.if !exists(${SVNREPOS})
+.if defined(WITH_SVNSERVE_WRAPPER)
@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
else \
@@ -365,21 +382,23 @@ post-install:
${FALSE}; \
fi; \
fi
-. endif
+.endif
@${MKDIR} ${SVNREPOS}
- @${PREFIX}/bin/svnadmin create ${SVNREPOS}
- @${CHGRP} ${SVNGROUP} ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
- @${CHMOD} g+w ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
+ @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
+.if defined(WITH_SVNSERVE_WRAPPER)
+ @${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+ @${CHMOD} g+w ${SVNGRPFILES}
@for i in ${SVNREPOS}/db/* ; do \
i=$${i##*/}; \
case $$i in \
- DB_CONFIG) ;; \
- *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \
- ${CHMOD} g+w ${SVNREPOS}/db/$$i; \
+ DB_CONFIG|fs-type|uuid) ;; \
+ *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
;; \
esac; \
done
.endif
+.endif
post-deinstall:
.if defined(WITH_MOD_DAV_SVN)
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 83fec4ee9a16..a9bf3cf6b701 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.3.tar.bz2) = a09c2b2fa1a09566c024547954a48478
-SIZE (subversion-1.1.3.tar.bz2) = 6793419
+MD5 (subversion-1.1.4.tar.bz2) = 6e557ae65b6b8d7577cc7704ede85a23
+SIZE (subversion-1.1.4.tar.bz2) = 6737067
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
index 868ff9a558e4..e043f63bf5a1 100644
--- a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
+++ b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
@@ -1,83 +1,121 @@
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 20:32:08.000000000 +0400
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2004-11-05 11:51:01.000000000 +0300
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
-+use strict;
- use ExtUtils::MakeMaker;
- use Config;
- use Cwd 'abs_path';
-@@ -15,6 +16,12 @@
- my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
- my $swig_builddir = "${svnlib_builddir}/bindings/swig";
-
-+my $top_builddir = '../../../../..';
-+my $top_srcdir = '@top_srcdir@';
-+my $svnlib_srcdir = "${top_srcdir}/subversion";
-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
-+
-+
- my $swig_version = @SWIG_VERSION@;
- my $swig = '@SWIG@';
-
-@@ -41,15 +48,14 @@
-
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
-- INC => join(' ',$apr_cflags, $apu_cflags,
-+ INC => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
- " -I$swig_srcdir -g"),
- OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
- (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-- @ldmodules, '-lsvn_swig_perl-1',
-- `$swig -perl -ldflags`)],
-+ @ldmodules)],
- test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
- );
-
-@@ -64,6 +70,7 @@
- "\$(INST_LIBDIR)/$_.pm") }
- map { perlish $_ }
- ('base', 'core', @modules)},
-+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
- MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
- "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
- map { perlish $_ }
-@@ -88,18 +95,22 @@
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
-
-- my $flags;
-+ my ($flags, $flags_runtime);
- if ($swig_version >= 103020) {
- $flags = '-noruntime -noproxy';
-+ $flags_runtime = '-runtime -noproxy';
- } else {
-+ # XXX: prehaps deprecated
- $flags = '-c';
- }
-
-- my $swig_command = "$swig $flags -nopm -perl " .
-+ my ($swig_command, $swig_command_runtime) =
-+ map {"$swig $_ -nopm -perl " .
- "-I$swig_srcdir " .
- "-I$swig_srcdir/perl/libsvn_swig_perl".
- " -I$svnlib_srcdir/include" .
-- $apr_cflags;
-+ $apr_cflags}
-+ ($flags, $flags_runtime);
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-@@ -137,7 +148,7 @@
- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
-
- core.c :: $swig_srcdir/core.i
--\t$swig_command -o core.c $swig_srcdir/core.i
-+\t$swig_command_runtime -o core.c $swig_srcdir/core.i
-
- $swig_modules_command
-
+*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005
+--- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005
+***************
+*** 1,4 ****
+! #!/usr/bin/perl
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+--- 1,5 ----
+! #!/usr/bin/perl -w
+! use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+***************
+*** 15,20 ****
+--- 16,27 ----
+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+ my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+
++ my $top_builddir = '../../../../..';
++ my $top_srcdir = '@top_srcdir@';
++ my $svnlib_srcdir = "${top_srcdir}/subversion";
++ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
++
++
+ my $swig_version = @SWIG_VERSION@;
+ my $swig = '@SWIG@';
+
+***************
+*** 48,55 ****
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules, '-lsvn_swig_perl-1',
+! `$swig -perl -ldflags`)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+--- 55,61 ----
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+***************
+*** 64,69 ****
+--- 70,76 ----
+ "\$(INST_LIBDIR)/$_.pm") }
+ map { perlish $_ }
+ ('base', 'core', @modules)},
++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
+ MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
+ "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
+ map { perlish $_ }
+***************
+*** 88,107 ****
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my $flags;
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my $swig_command = "$swig $flags -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags;
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+--- 95,118 ----
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my ($flags, $flags_runtime);
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
++ $flags_runtime = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
++ $flags_runtime = '-runtime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my ($swig_command, $swig_command_runtime) =
+! map { "$swig $_ -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags }
+! ($flags, $flags_runtime);
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+***************
+*** 139,145 ****
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
+--- 150,156 ----
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command_runtime -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 98f4b2ad06ba..1b13ada96bf1 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= subversion
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.4
CATEGORIES= devel
MASTER_SITES= http://subversion.tigris.org/tarballs/
@@ -43,6 +43,15 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.include <bsd.port.pre.mk>
SVNREPOS?= /home/svn/repos
+SVNFSTYPE?= bdb
+
+.if make(repository)
+WITH_REPOSITORY_CREATION= yes
+.endif
+
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET= _mkrepos
+.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
@@ -250,8 +259,9 @@ pre-extract:
@${ECHO_MSG} " subdirectories of your repository"
@${ECHO_MSG} "* the above subdirectories are writable by this group"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'"
- @${ECHO_MSG} "You could change these settings by defining SVNREPOS and SVNGROUP"
+ @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
+ @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
+ @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP nad SVNFSTYPE"
@${ECHO_MSG} ""
.endif
@${ECHO_MSG} ""
@@ -318,7 +328,7 @@ pre-install:
${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
.endif
-post-install:
+post-install: ${MKREPOS_TARGET}
@${MKDIR} ${PREFIX}/share/subversion
cd ${WRKSRC}/tools ; \
tar --exclude '*.in' -cf - * | tar -C ${PREFIX}/share/subversion -xf -
@@ -351,8 +361,15 @@ post-install:
.if defined(WITH_SVNSERVE_WRAPPER)
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
-.if defined(WITH_REPOSITORY_CREATION) && !exists(${SVNREPOS})
-. if defined(WITH_SVNSERVE_WRAPPER)
+
+repository: _mkrepos
+
+_SVNGRPFILES= dav db locks locks/db.lock locks/db-logs.lock
+SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,}
+
+_mkrepos: .USE
+.if !exists(${SVNREPOS})
+.if defined(WITH_SVNSERVE_WRAPPER)
@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
else \
@@ -365,21 +382,23 @@ post-install:
${FALSE}; \
fi; \
fi
-. endif
+.endif
@${MKDIR} ${SVNREPOS}
- @${PREFIX}/bin/svnadmin create ${SVNREPOS}
- @${CHGRP} ${SVNGROUP} ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
- @${CHMOD} g+w ${SVNREPOS}/db ${SVNREPOS}/locks/db.lock ${SVNREPOS}/dav
+ @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
+.if defined(WITH_SVNSERVE_WRAPPER)
+ @${CHGRP} ${SVNGROUP} ${SVNGRPFILES}
+ @${CHMOD} g+w ${SVNGRPFILES}
@for i in ${SVNREPOS}/db/* ; do \
i=$${i##*/}; \
case $$i in \
- DB_CONFIG) ;; \
- *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \
- ${CHMOD} g+w ${SVNREPOS}/db/$$i; \
+ DB_CONFIG|fs-type|uuid) ;; \
+ *) ${CHGRP} -R ${SVNGROUP} ${SVNREPOS}/db/$$i; \
+ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \
;; \
esac; \
done
.endif
+.endif
post-deinstall:
.if defined(WITH_MOD_DAV_SVN)
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 83fec4ee9a16..a9bf3cf6b701 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.3.tar.bz2) = a09c2b2fa1a09566c024547954a48478
-SIZE (subversion-1.1.3.tar.bz2) = 6793419
+MD5 (subversion-1.1.4.tar.bz2) = 6e557ae65b6b8d7577cc7704ede85a23
+SIZE (subversion-1.1.4.tar.bz2) = 6737067
diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
index 868ff9a558e4..e043f63bf5a1 100644
--- a/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
+++ b/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
@@ -1,83 +1,121 @@
---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2004-09-14 20:32:08.000000000 +0400
-+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2004-11-05 11:51:01.000000000 +0300
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl -w
-+use strict;
- use ExtUtils::MakeMaker;
- use Config;
- use Cwd 'abs_path';
-@@ -15,6 +16,12 @@
- my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
- my $swig_builddir = "${svnlib_builddir}/bindings/swig";
-
-+my $top_builddir = '../../../../..';
-+my $top_srcdir = '@top_srcdir@';
-+my $svnlib_srcdir = "${top_srcdir}/subversion";
-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
-+
-+
- my $swig_version = @SWIG_VERSION@;
- my $swig = '@SWIG@';
-
-@@ -41,15 +48,14 @@
-
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
-- INC => join(' ',$apr_cflags, $apu_cflags,
-+ INC => join(' ',$ENV{'CCFLAGS'} || '',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
- " -I$swig_srcdir -g"),
- OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
- (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-- @ldmodules, '-lsvn_swig_perl-1',
-- `$swig -perl -ldflags`)],
-+ @ldmodules)],
- test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
- );
-
-@@ -64,6 +70,7 @@
- "\$(INST_LIBDIR)/$_.pm") }
- map { perlish $_ }
- ('base', 'core', @modules)},
-+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
- MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
- "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
- map { perlish $_ }
-@@ -88,18 +95,22 @@
- my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
- my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
-
-- my $flags;
-+ my ($flags, $flags_runtime);
- if ($swig_version >= 103020) {
- $flags = '-noruntime -noproxy';
-+ $flags_runtime = '-runtime -noproxy';
- } else {
-+ # XXX: prehaps deprecated
- $flags = '-c';
- }
-
-- my $swig_command = "$swig $flags -nopm -perl " .
-+ my ($swig_command, $swig_command_runtime) =
-+ map {"$swig $_ -nopm -perl " .
- "-I$swig_srcdir " .
- "-I$swig_srcdir/perl/libsvn_swig_perl".
- " -I$svnlib_srcdir/include" .
-- $apr_cflags;
-+ $apr_cflags}
-+ ($flags, $flags_runtime);
-
- my $swig_modules_command = join ('',
- map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
-@@ -137,7 +148,7 @@
- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
-
- core.c :: $swig_srcdir/core.i
--\t$swig_command -o core.c $swig_srcdir/core.i
-+\t$swig_command_runtime -o core.c $swig_srcdir/core.i
-
- $swig_modules_command
-
+*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005
+--- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005
+***************
+*** 1,4 ****
+! #!/usr/bin/perl
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+--- 1,5 ----
+! #!/usr/bin/perl -w
+! use strict;
+ use ExtUtils::MakeMaker;
+ use Config;
+ use Cwd 'abs_path';
+***************
+*** 15,20 ****
+--- 16,27 ----
+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+ my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+
++ my $top_builddir = '../../../../..';
++ my $top_srcdir = '@top_srcdir@';
++ my $svnlib_srcdir = "${top_srcdir}/subversion";
++ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
++
++
+ my $swig_version = @SWIG_VERSION@;
+ my $swig = '@SWIG@';
+
+***************
+*** 48,55 ****
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules, '-lsvn_swig_perl-1',
+! `$swig -perl -ldflags`)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+--- 55,61 ----
+ OBJECT => q/$(O_FILES)/,
+ LIBS => [join(' ', $apr_ldflags,
+ (map {$_ = abs_path($_); "-L$_"} @ldpaths),
+! @ldmodules)],
+ test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
+ );
+
+***************
+*** 64,69 ****
+--- 70,76 ----
+ "\$(INST_LIBDIR)/$_.pm") }
+ map { perlish $_ }
+ ('base', 'core', @modules)},
++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
+ MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
+ "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
+ map { perlish $_ }
+***************
+*** 88,107 ****
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my $flags;
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my $swig_command = "$swig $flags -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags;
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+--- 95,118 ----
+ my $module_c_files = join (' ',map { "svn_$_.c"} @modules);
+ my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules);
+
+! my ($flags, $flags_runtime);
+ if ($swig_version >= 103024) {
+ $flags = '-noproxy';
++ $flags_runtime = '-noproxy';
+ } elsif ($swig_version >= 103020) {
+ $flags = '-noruntime -noproxy';
++ $flags_runtime = '-runtime -noproxy';
+ } else {
+ $flags = '-c';
+ }
+
+! my ($swig_command, $swig_command_runtime) =
+! map { "$swig $_ -nopm -perl " .
+ "-I$swig_srcdir " .
+ "-I$swig_srcdir/perl/libsvn_swig_perl".
+ " -I$svnlib_srcdir/include" .
+! $apr_cflags }
+! ($flags, $flags_runtime);
+
+ my $swig_modules_command = join ('',
+ map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ".
+***************
+*** 139,145 ****
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
+--- 150,156 ----
+ $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@
+
+ core.c :: $swig_srcdir/core.i
+! \t$swig_command_runtime -o core.c $swig_srcdir/core.i
+
+ $swig_modules_command
+
generated by cgit (git 2.34.1) at 2024-12-22 13:58:17 +0800