Index: head/devel/subversion/Makefile =================================================================== --- head/devel/subversion/Makefile (revision 116725) +++ head/devel/subversion/Makefile (revision 116726) @@ -1,287 +1,329 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system -LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon \ - expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 INSTALLS_SHLIB= yes USE_SIZE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE} MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 MANCOMPRESSED= no +TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README +.if !defined(NOPORTDOCS) +PORTDOCS= ${TXT_DOCS} +.endif + .include SVNREPOS?= /home/svn/repos .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif +.if !defined(WITHOUT_NEON) +LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ +CONFIGURE_ARGS+= --with-neon=${LOCALBASE} +PLIST_SUB+= WITHOUT_NEON="" +.else +CONFIGURE_ARGS+= --without-neon +PLIST_SUB+= WITHOUT_NEON="@comment " +.endif + .if defined(WITH_PERL) .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif SWIG_BINDINGS+= perl USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ SVN::Delta.3 \ SVN::Ra.3 \ SVN::Repos.3 \ SVN::Wc.3 .else PLIST_SUB+= WITH_PERL="@comment " .endif .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= python PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 DEPENDS_ARGS+= SWIG_LANGUAGES='${SWIG_BINDINGS}' CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} .else CONFIGURE_ARGS+= --with-swig=no .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www .else PLIST_SUB+= MOD_DAV_SVN="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn .endif .if defined(WITH_APACHE2_APR) APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} DEPENDS_ARGS+= WITH_BERKELEYDB=db4 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_PORT= www/apache2 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) -#LDFLAGS+= -rpath ${LOCALBASE}/lib/apache2 -rpath ${LOCALBASE}/libexec/apache2 -#CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .else LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr-svn CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \ --with-apr-util=${LOCALBASE} APR_APU_DIR= ${LOCALBASE}/bin APR_PORT= devel/apr OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif +.if defined(WITH_BOOK_HTML) +PORTDOCS+= book +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +.endif + pre-extract: @${ECHO_MSG} "" +.if defined(WITHOUT_NEON) + @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." +.else + @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." + @${ECHO_MSG} "To disable it define WITHOUT_NEON" +.endif + @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." .else @${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG." .endif @${ECHO_MSG} "" .if defined(WITH_PERL) @${ECHO_MSG} "Build with perl bindings." @${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time." .else @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" .endif @${ECHO_MSG} "" .if defined(WITH_PYTHON) @${ECHO_MSG} "Build with Python bindings." .else @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" @${ECHO_MSG} "by defining WITH_MOD_DAV_SVN. This option implies" @${ECHO_MSG} "the WITH_APACHE2_APR option." .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "by defining WITH_APACHE2_APR." .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." .else @${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)" @${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER." .endif @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${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} "" .endif @${ECHO_MSG} "" +.if defined(WITH_BOOK_HTML) + @${ECHO_MSG} "Subversion Book (HTML) enabled." +.else + @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" + @${ECHO_MSG} "WITH_BOOK_HTML." +.endif + @${ECHO_MSG} "" post-extract: @${RM} -r ${WRKSRC}/neon @${RM} -r ${WRKSRC}/apr @${RM} -r ${WRKSRC}/apr-util post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in pre-configure: @if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi @if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please, rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi post-build: .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \ CCFLAGS="${CCFLAGS}" CC="${CC}" \ ${PERL} Makefile.PL PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \ ${MAKE} all .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} swig-py .endif +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book/tools/ ; \ + ${LN} -s ${PREFIX}/share/xsl/docbook xsl + cd ${WRKSRC}/doc/book ; \ + ${MAKE} all-html +.endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + for f in ${TXT_DOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book ; \ + ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.endif .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} install-swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${MAKE} install .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} install-swig-py .endif .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) @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 \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi . 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 @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG) ;; \ *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif .include Property changes on: head/devel/subversion/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.66 \ No newline at end of property +1.67 \ No newline at end of property Index: head/devel/subversion/files/patch-book-Makefile =================================================================== --- head/devel/subversion/files/patch-book-Makefile (revision 116725) +++ head/devel/subversion/files/patch-book-Makefile (revision 116726) @@ -1,24 +1,31 @@ ---- doc/book/Makefile.orig Mon May 19 17:06:16 2003 -+++ doc/book/Makefile Mon May 19 17:22:14 2003 -@@ -98,7 +98,7 @@ +--- doc/book/Makefile.orig Fri Feb 20 01:57:40 2004 ++++ doc/book/Makefile Wed Jul 7 19:58:29 2004 +@@ -1,5 +1,5 @@ + XSLTPROC = xsltproc +-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion ++#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion + INSTALL = install + + ## You shouldn't normally need to edit anything below here. +@@ -114,7 +114,7 @@ $(BOOK_INSTALL_DIR): $(INSTALL) -d $(BOOK_INSTALL_DIR) -install-book-html: $(BOOK_HTML_TARGET) +install-book-html: $(INSTALL) -d $(BOOK_INSTALL_DIR)/images $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR) $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) -@@ -111,10 +111,10 @@ +@@ -126,10 +126,10 @@ $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) - $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images + $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images -install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) +install-book-pdf: $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) -install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) +install-book-ps: $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) book-clean: Property changes on: head/devel/subversion/files/patch-book-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/subversion/files/patch-svnperl-memoryleak =================================================================== --- head/devel/subversion/files/patch-svnperl-memoryleak (nonexistent) +++ head/devel/subversion/files/patch-svnperl-memoryleak (revision 116726) @@ -0,0 +1,195 @@ +--- subversion/bindings/swig/svn_types.i (revision 10171) ++++ subversion/bindings/swig/svn_types.i (revision 10172) +@@ -316,7 +316,7 @@ + %typemap(perl5, in) (svn_commit_callback_t callback, void *callback_baton) { + $1 = svn_swig_pl_thunk_commit_callback; + $2 = (void *)$input; +- SvREFCNT_inc($input); ++ svn_swig_pl_hold_ref_in_pool (_global_pool, $input); + }; + + /* ----------------------------------------------------------------------- +--- subversion/bindings/swig/swigutil_pl.c (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.c (revision 10172) +@@ -1385,3 +1385,16 @@ apr_file_t *svn_swig_pl_make_file (SV *f + } + return apr_file; + } ++ ++static apr_status_t cleanup_refcnt (void *data) ++{ ++ SV *sv = data; ++ SvREFCNT_dec (sv); ++ return APR_SUCCESS; ++} ++ ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv) ++{ ++ SvREFCNT_inc(sv); ++ apr_pool_cleanup_register (pool, sv, cleanup_refcnt, apr_pool_cleanup_null); ++} +--- subversion/bindings/swig/swigutil_pl.h (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.h (revision 10172) +@@ -231,6 +231,7 @@ SV *svn_swig_pl_from_stream (svn_stream_ + /* apr_file_t * */ + apr_file_t *svn_swig_pl_make_file (SV *file, apr_pool_t *pool); + ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv); + + #ifdef __cplusplus + } +--- subversion/bindings/swig/perl/t/5delta.t (revision 10171) ++++ subversion/bindings/swig/perl/t/5delta.t (revision 10172) +@@ -4,27 +4,19 @@ use Test::More tests => 2; + require SVN::Core; + require SVN::Delta; + +-SKIP: { +- eval { require IO::String }; ++my ($srctext, $tgttext, $result) = ('abcd===eflfjgjkx', 'abcd=--ef==lfjffgjx', ''); + +- skip "IO::String not installed", 2 if $@; +- my $srctext = 'abcd===eflfjgjkx'; +- my $tgttext = 'abcd=--ef==lfjffgjx'; ++open my $source, '<', \$srctext; ++open my $target, '<', \$tgttext; ++open my $aresult, '>', \$result; + +- my $source = IO::String->new ($srctext); +- my $target = IO::String->new ($tgttext); ++my $txstream = SVN::TxDelta::new ($source, $target); + +- my $result = ''; +- my $aresult = IO::String->new (\$result); ++isa_ok ($txstream, '_p_svn_txdelta_stream_t'); ++open my $asource, '<', \$srctext; ++my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)]; + +- my $txstream = SVN::TxDelta::new ($source, $target); ++SVN::TxDelta::send_txstream ($txstream, @$handle); + +- isa_ok ($txstream, '_p_svn_txdelta_stream_t'); +- my $handle = [SVN::TxDelta::apply (IO::String->new ($srctext), +- $aresult, undef, undef)]; ++is ($result, $tgttext, 'delta self test'); + +- SVN::TxDelta::send_txstream ($txstream, @$handle); +- +- is ($result, $tgttext, 'delta self test'); +- +-} +--- subversion/bindings/swig/perl/t/1repos.t (revision 10171) ++++ subversion/bindings/swig/perl/t/1repos.t (revision 10172) +@@ -1,6 +1,6 @@ + #!/usr/bin/perl -w + +-use Test::More tests => 5; ++use Test::More tests => 6; + use File::Temp qw(tempdir); + use File::Path qw(rmtree); + use strict; +@@ -64,15 +64,20 @@ is_deeply (\@history, [['/tags/foo/filea + 'repos_history'); + + { ++my $pool = SVN::Pool->new_default; ++my $something = bless {}, 'something'; + $editor = SVN::Delta::Editor-> + new (SVN::Repos::get_commit_editor($repos, "file://$repospath", +- '/', 'root', 'FOO', \&committed)); ++ '/', 'root', 'FOO', sub {committed(@_); ++ $something; ++ })); + + my $rootbaton = $editor->open_root(2); + $editor->delete_entry('tags', 2, $rootbaton); + + $editor->close_edit(); + } ++ok ($main::something_destroyed, 'callback properly destroyed'); + + cmp_ok($fs->youngest_rev, '==', 3); + +@@ -80,3 +85,11 @@ END { + diag "cleanup"; + rmtree($repospath); + } ++ ++package something; ++ ++sub DESTROY { ++ $main::something_destroyed++; ++} ++ ++1; +--- subversion/bindings/swig/perl/Delta.pm (revision 10171) ++++ subversion/bindings/swig/perl/Delta.pm (revision 10172) +@@ -143,8 +143,8 @@ sub AUTOLOAD { + return unless $_[0]->{_editor}; + my $class = ref($_[0]); + my $func = $AUTOLOAD; +- $func =~ s/^${class}::(SUPER::)?//; +- return if $func =~ m/^[A-Z]/; ++ $func =~ s/.*:://; ++ return unless $func =~ m/[^A-Z]/; + + my %ebaton = ( set_target_revision => 1, + open_root => 1, +--- subversion/bindings/swig/perl/Base.pm (revision 10171) ++++ subversion/bindings/swig/perl/Base.pm (revision 10172) +@@ -7,7 +7,7 @@ SVN::Base - Base class for importing sym + =head1 SYNOPSIS + + # Load the svn_ra_* functions into the SVN::Ra namespace. +- pacakge SVN::Ra; ++ package SVN::Ra; + use SVN::Base qw(Ra svn_ra_); + + # Load svn_config_t structure accessors in the magic namcespace +--- subversion/bindings/swig/perl/Ra.pm (revision 10171) ++++ subversion/bindings/swig/perl/Ra.pm (revision 10172) +@@ -63,26 +63,25 @@ require SVN::Client; + + my $ralib = init_ra_libs; + ++# Ra methods that returns reporter ++my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update); + our $AUTOLOAD; + + sub AUTOLOAD { + my $class = ref($_[0]); +- $AUTOLOAD =~ s/^${class}::(SUPER::)?//; +- return if $AUTOLOAD =~ m/^[A-Z]/; ++ my $method = $AUTOLOAD; ++ $method =~ s/.*:://; ++ return unless $method =~ m/[^A-Z]/; + + my $self = shift; + no strict 'refs'; + + die "no such method $AUTOLOAD" +- unless $self->can("plugin_invoke_$AUTOLOAD"); ++ unless $self->can("plugin_invoke_$method"); + +- my @ret = &{"plugin_invoke_$AUTOLOAD"}(@{$self}{qw/ra session/}, @_, +- $self->{pool}); +- +- return $ret[0] unless $#ret; +- +- return ($AUTOLOAD eq 'get_commit_editor') ? @ret : +- bless [@ret], 'SVN::Ra::Reporter'; ++ my @ret = &{"plugin_invoke_$method"}(@{$self}{qw/ra session/}, @_); ++ return bless [@ret], 'SVN::Ra::Reporter' if $reporter{$method}; ++ return $#ret == 0 ? $ret[0] : @ret; + } + + sub new { +@@ -106,7 +105,7 @@ sub new { + [SVN::Client::get_username_provider()]); + } + +- my $pool = $self->{pool} ||= SVN::Core::pool_create(undef); ++ my $pool = $self->{pool} ||= SVN::Pool->new; + + $self->{ra} = get_ra_library ($ralib, $self->{url}); + my $callback = 'SVN::Ra::Callbacks'; Property changes on: head/devel/subversion/files/patch-svnperl-memoryleak ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion/files/patch-svnperl-noruntime =================================================================== --- head/devel/subversion/files/patch-svnperl-noruntime (nonexistent) +++ head/devel/subversion/files/patch-svnperl-noruntime (revision 116726) @@ -0,0 +1,82 @@ +--- subversion/bindings/swig/perl/Base.pm (revision 10173) ++++ subversion/bindings/swig/perl/Base.pm (revision 10174) +@@ -60,6 +60,7 @@ sub import { + package SVN::_$pkg; + require DynaLoader; + bootstrap SVN::_$pkg; ++sub dl_load_flags { 0x01 } + 1; + ' or die $@; + }; +--- subversion/bindings/swig/perl/Makefile.PL (revision 10173) ++++ subversion/bindings/swig/perl/Makefile.PL (revision 10174) +@@ -1,4 +1,5 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Cwd 'abs_path'; + use Config; +@@ -8,6 +9,12 @@ if ($^O ne 'VMS') { + $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; + } + ++my $top_builddir = '../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ ++ + my $swig_version; + open TOPMAKE, "<../../../../Makefile"; + while () { +@@ -50,8 +57,7 @@ my %config = ( + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `swig -perl -ldflags`)], ++ @ldmodules)], + ); + + sub perlish { +@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co + PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a", + clean => { FILES => "*.hi *.c *.bs". + join(' Makefile.','',@modules) } + ); +@@ -84,15 +91,19 @@ sub MY::postamble { + my $module_c_files = join (' ',map { "svn_$_.c"} @modules); + my $module_make_commands = join ('',map {"\tmake -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 " . +- "-I.. -I../../../include $apr_cflags"; ++ my ($swig_command, $swig_command_runtime) = ++ map {"swig $_ -nopm -perl " . ++ "-I.. -I../../../include $apr_cflags" } ++ ($flags, $flags_runtime); + + my $swig_modules_command = join ('', + map {"\nsvn_$_.c : ../svn_$_.i ". +@@ -127,7 +138,7 @@ modules :: $module_c_files + $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ + + core.c :: ../core.i +-\t$swig_command -module SVN::_Core -o core.c ../core.i ++\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i + + $swig_modules_command + Property changes on: head/devel/subversion/files/patch-svnperl-noruntime ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion/pkg-plist =================================================================== --- head/devel/subversion/pkg-plist (revision 116725) +++ head/devel/subversion/pkg-plist (revision 116726) @@ -1,195 +1,187 @@ bin/svn bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin bin/svnversion include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_config.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h @dirrm include/subversion-1 lib/libsvn_client-1.a lib/libsvn_client-1.la lib/libsvn_client-1.so lib/libsvn_client-1.so.0 lib/libsvn_delta-1.a lib/libsvn_delta-1.la lib/libsvn_delta-1.so lib/libsvn_delta-1.so.0 lib/libsvn_diff-1.a lib/libsvn_diff-1.la lib/libsvn_diff-1.so lib/libsvn_diff-1.so.0 lib/libsvn_fs-1.a lib/libsvn_fs-1.la lib/libsvn_fs-1.so lib/libsvn_fs-1.so.0 lib/libsvn_ra-1.a lib/libsvn_ra-1.la lib/libsvn_ra-1.so lib/libsvn_ra-1.so.0 -lib/libsvn_ra_dav-1.a -lib/libsvn_ra_dav-1.la -lib/libsvn_ra_dav-1.so -lib/libsvn_ra_dav-1.so.0 +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la lib/libsvn_ra_local-1.so lib/libsvn_ra_local-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_ra_svn-1.so lib/libsvn_ra_svn-1.so.0 lib/libsvn_repos-1.a lib/libsvn_repos-1.la lib/libsvn_repos-1.so lib/libsvn_repos-1.so.0 lib/libsvn_subr-1.a lib/libsvn_subr-1.la lib/libsvn_subr-1.so lib/libsvn_subr-1.so.0 lib/libsvn_wc-1.a lib/libsvn_wc-1.la lib/libsvn_wc-1.so lib/libsvn_wc-1.so.0 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so %%WITH_PERL%%lib/libsvn_swig_perl-1.a %%WITH_PERL%%lib/libsvn_swig_perl-1.la %%WITH_PERL%%lib/libsvn_swig_perl-1.so %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN %%WITH_PYTHON%%lib/libsvn_swig_py-1.a %%WITH_PYTHON%%lib/libsvn_swig_py-1.la %%WITH_PYTHON%%lib/libsvn_swig_py-1.so %%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion Property changes on: head/devel/subversion/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/devel/subversion-devel/Makefile =================================================================== --- head/devel/subversion-devel/Makefile (revision 116725) +++ head/devel/subversion-devel/Makefile (revision 116726) @@ -1,287 +1,329 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system -LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon \ - expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 INSTALLS_SHLIB= yes USE_SIZE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE} MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 MANCOMPRESSED= no +TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README +.if !defined(NOPORTDOCS) +PORTDOCS= ${TXT_DOCS} +.endif + .include SVNREPOS?= /home/svn/repos .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif +.if !defined(WITHOUT_NEON) +LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ +CONFIGURE_ARGS+= --with-neon=${LOCALBASE} +PLIST_SUB+= WITHOUT_NEON="" +.else +CONFIGURE_ARGS+= --without-neon +PLIST_SUB+= WITHOUT_NEON="@comment " +.endif + .if defined(WITH_PERL) .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif SWIG_BINDINGS+= perl USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ SVN::Delta.3 \ SVN::Ra.3 \ SVN::Repos.3 \ SVN::Wc.3 .else PLIST_SUB+= WITH_PERL="@comment " .endif .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= python PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 DEPENDS_ARGS+= SWIG_LANGUAGES='${SWIG_BINDINGS}' CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} .else CONFIGURE_ARGS+= --with-swig=no .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www .else PLIST_SUB+= MOD_DAV_SVN="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn .endif .if defined(WITH_APACHE2_APR) APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} DEPENDS_ARGS+= WITH_BERKELEYDB=db4 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_PORT= www/apache2 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) -#LDFLAGS+= -rpath ${LOCALBASE}/lib/apache2 -rpath ${LOCALBASE}/libexec/apache2 -#CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .else LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr-svn CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \ --with-apr-util=${LOCALBASE} APR_APU_DIR= ${LOCALBASE}/bin APR_PORT= devel/apr OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif +.if defined(WITH_BOOK_HTML) +PORTDOCS+= book +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +.endif + pre-extract: @${ECHO_MSG} "" +.if defined(WITHOUT_NEON) + @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." +.else + @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." + @${ECHO_MSG} "To disable it define WITHOUT_NEON" +.endif + @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." .else @${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG." .endif @${ECHO_MSG} "" .if defined(WITH_PERL) @${ECHO_MSG} "Build with perl bindings." @${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time." .else @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" .endif @${ECHO_MSG} "" .if defined(WITH_PYTHON) @${ECHO_MSG} "Build with Python bindings." .else @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" @${ECHO_MSG} "by defining WITH_MOD_DAV_SVN. This option implies" @${ECHO_MSG} "the WITH_APACHE2_APR option." .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "by defining WITH_APACHE2_APR." .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." .else @${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)" @${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER." .endif @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${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} "" .endif @${ECHO_MSG} "" +.if defined(WITH_BOOK_HTML) + @${ECHO_MSG} "Subversion Book (HTML) enabled." +.else + @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" + @${ECHO_MSG} "WITH_BOOK_HTML." +.endif + @${ECHO_MSG} "" post-extract: @${RM} -r ${WRKSRC}/neon @${RM} -r ${WRKSRC}/apr @${RM} -r ${WRKSRC}/apr-util post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in pre-configure: @if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi @if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please, rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi post-build: .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \ CCFLAGS="${CCFLAGS}" CC="${CC}" \ ${PERL} Makefile.PL PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \ ${MAKE} all .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} swig-py .endif +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book/tools/ ; \ + ${LN} -s ${PREFIX}/share/xsl/docbook xsl + cd ${WRKSRC}/doc/book ; \ + ${MAKE} all-html +.endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + for f in ${TXT_DOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book ; \ + ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.endif .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} install-swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${MAKE} install .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} install-swig-py .endif .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) @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 \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi . 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 @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG) ;; \ *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif .include Property changes on: head/devel/subversion-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.66 \ No newline at end of property +1.67 \ No newline at end of property Index: head/devel/subversion-devel/files/patch-book-Makefile =================================================================== --- head/devel/subversion-devel/files/patch-book-Makefile (revision 116725) +++ head/devel/subversion-devel/files/patch-book-Makefile (revision 116726) @@ -1,24 +1,31 @@ ---- doc/book/Makefile.orig Mon May 19 17:06:16 2003 -+++ doc/book/Makefile Mon May 19 17:22:14 2003 -@@ -98,7 +98,7 @@ +--- doc/book/Makefile.orig Fri Feb 20 01:57:40 2004 ++++ doc/book/Makefile Wed Jul 7 19:58:29 2004 +@@ -1,5 +1,5 @@ + XSLTPROC = xsltproc +-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion ++#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion + INSTALL = install + + ## You shouldn't normally need to edit anything below here. +@@ -114,7 +114,7 @@ $(BOOK_INSTALL_DIR): $(INSTALL) -d $(BOOK_INSTALL_DIR) -install-book-html: $(BOOK_HTML_TARGET) +install-book-html: $(INSTALL) -d $(BOOK_INSTALL_DIR)/images $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR) $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) -@@ -111,10 +111,10 @@ +@@ -126,10 +126,10 @@ $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) - $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images + $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images -install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) +install-book-pdf: $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) -install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) +install-book-ps: $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) book-clean: Property changes on: head/devel/subversion-devel/files/patch-book-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/subversion-devel/files/patch-svnperl-memoryleak =================================================================== --- head/devel/subversion-devel/files/patch-svnperl-memoryleak (nonexistent) +++ head/devel/subversion-devel/files/patch-svnperl-memoryleak (revision 116726) @@ -0,0 +1,195 @@ +--- subversion/bindings/swig/svn_types.i (revision 10171) ++++ subversion/bindings/swig/svn_types.i (revision 10172) +@@ -316,7 +316,7 @@ + %typemap(perl5, in) (svn_commit_callback_t callback, void *callback_baton) { + $1 = svn_swig_pl_thunk_commit_callback; + $2 = (void *)$input; +- SvREFCNT_inc($input); ++ svn_swig_pl_hold_ref_in_pool (_global_pool, $input); + }; + + /* ----------------------------------------------------------------------- +--- subversion/bindings/swig/swigutil_pl.c (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.c (revision 10172) +@@ -1385,3 +1385,16 @@ apr_file_t *svn_swig_pl_make_file (SV *f + } + return apr_file; + } ++ ++static apr_status_t cleanup_refcnt (void *data) ++{ ++ SV *sv = data; ++ SvREFCNT_dec (sv); ++ return APR_SUCCESS; ++} ++ ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv) ++{ ++ SvREFCNT_inc(sv); ++ apr_pool_cleanup_register (pool, sv, cleanup_refcnt, apr_pool_cleanup_null); ++} +--- subversion/bindings/swig/swigutil_pl.h (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.h (revision 10172) +@@ -231,6 +231,7 @@ SV *svn_swig_pl_from_stream (svn_stream_ + /* apr_file_t * */ + apr_file_t *svn_swig_pl_make_file (SV *file, apr_pool_t *pool); + ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv); + + #ifdef __cplusplus + } +--- subversion/bindings/swig/perl/t/5delta.t (revision 10171) ++++ subversion/bindings/swig/perl/t/5delta.t (revision 10172) +@@ -4,27 +4,19 @@ use Test::More tests => 2; + require SVN::Core; + require SVN::Delta; + +-SKIP: { +- eval { require IO::String }; ++my ($srctext, $tgttext, $result) = ('abcd===eflfjgjkx', 'abcd=--ef==lfjffgjx', ''); + +- skip "IO::String not installed", 2 if $@; +- my $srctext = 'abcd===eflfjgjkx'; +- my $tgttext = 'abcd=--ef==lfjffgjx'; ++open my $source, '<', \$srctext; ++open my $target, '<', \$tgttext; ++open my $aresult, '>', \$result; + +- my $source = IO::String->new ($srctext); +- my $target = IO::String->new ($tgttext); ++my $txstream = SVN::TxDelta::new ($source, $target); + +- my $result = ''; +- my $aresult = IO::String->new (\$result); ++isa_ok ($txstream, '_p_svn_txdelta_stream_t'); ++open my $asource, '<', \$srctext; ++my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)]; + +- my $txstream = SVN::TxDelta::new ($source, $target); ++SVN::TxDelta::send_txstream ($txstream, @$handle); + +- isa_ok ($txstream, '_p_svn_txdelta_stream_t'); +- my $handle = [SVN::TxDelta::apply (IO::String->new ($srctext), +- $aresult, undef, undef)]; ++is ($result, $tgttext, 'delta self test'); + +- SVN::TxDelta::send_txstream ($txstream, @$handle); +- +- is ($result, $tgttext, 'delta self test'); +- +-} +--- subversion/bindings/swig/perl/t/1repos.t (revision 10171) ++++ subversion/bindings/swig/perl/t/1repos.t (revision 10172) +@@ -1,6 +1,6 @@ + #!/usr/bin/perl -w + +-use Test::More tests => 5; ++use Test::More tests => 6; + use File::Temp qw(tempdir); + use File::Path qw(rmtree); + use strict; +@@ -64,15 +64,20 @@ is_deeply (\@history, [['/tags/foo/filea + 'repos_history'); + + { ++my $pool = SVN::Pool->new_default; ++my $something = bless {}, 'something'; + $editor = SVN::Delta::Editor-> + new (SVN::Repos::get_commit_editor($repos, "file://$repospath", +- '/', 'root', 'FOO', \&committed)); ++ '/', 'root', 'FOO', sub {committed(@_); ++ $something; ++ })); + + my $rootbaton = $editor->open_root(2); + $editor->delete_entry('tags', 2, $rootbaton); + + $editor->close_edit(); + } ++ok ($main::something_destroyed, 'callback properly destroyed'); + + cmp_ok($fs->youngest_rev, '==', 3); + +@@ -80,3 +85,11 @@ END { + diag "cleanup"; + rmtree($repospath); + } ++ ++package something; ++ ++sub DESTROY { ++ $main::something_destroyed++; ++} ++ ++1; +--- subversion/bindings/swig/perl/Delta.pm (revision 10171) ++++ subversion/bindings/swig/perl/Delta.pm (revision 10172) +@@ -143,8 +143,8 @@ sub AUTOLOAD { + return unless $_[0]->{_editor}; + my $class = ref($_[0]); + my $func = $AUTOLOAD; +- $func =~ s/^${class}::(SUPER::)?//; +- return if $func =~ m/^[A-Z]/; ++ $func =~ s/.*:://; ++ return unless $func =~ m/[^A-Z]/; + + my %ebaton = ( set_target_revision => 1, + open_root => 1, +--- subversion/bindings/swig/perl/Base.pm (revision 10171) ++++ subversion/bindings/swig/perl/Base.pm (revision 10172) +@@ -7,7 +7,7 @@ SVN::Base - Base class for importing sym + =head1 SYNOPSIS + + # Load the svn_ra_* functions into the SVN::Ra namespace. +- pacakge SVN::Ra; ++ package SVN::Ra; + use SVN::Base qw(Ra svn_ra_); + + # Load svn_config_t structure accessors in the magic namcespace +--- subversion/bindings/swig/perl/Ra.pm (revision 10171) ++++ subversion/bindings/swig/perl/Ra.pm (revision 10172) +@@ -63,26 +63,25 @@ require SVN::Client; + + my $ralib = init_ra_libs; + ++# Ra methods that returns reporter ++my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update); + our $AUTOLOAD; + + sub AUTOLOAD { + my $class = ref($_[0]); +- $AUTOLOAD =~ s/^${class}::(SUPER::)?//; +- return if $AUTOLOAD =~ m/^[A-Z]/; ++ my $method = $AUTOLOAD; ++ $method =~ s/.*:://; ++ return unless $method =~ m/[^A-Z]/; + + my $self = shift; + no strict 'refs'; + + die "no such method $AUTOLOAD" +- unless $self->can("plugin_invoke_$AUTOLOAD"); ++ unless $self->can("plugin_invoke_$method"); + +- my @ret = &{"plugin_invoke_$AUTOLOAD"}(@{$self}{qw/ra session/}, @_, +- $self->{pool}); +- +- return $ret[0] unless $#ret; +- +- return ($AUTOLOAD eq 'get_commit_editor') ? @ret : +- bless [@ret], 'SVN::Ra::Reporter'; ++ my @ret = &{"plugin_invoke_$method"}(@{$self}{qw/ra session/}, @_); ++ return bless [@ret], 'SVN::Ra::Reporter' if $reporter{$method}; ++ return $#ret == 0 ? $ret[0] : @ret; + } + + sub new { +@@ -106,7 +105,7 @@ sub new { + [SVN::Client::get_username_provider()]); + } + +- my $pool = $self->{pool} ||= SVN::Core::pool_create(undef); ++ my $pool = $self->{pool} ||= SVN::Pool->new; + + $self->{ra} = get_ra_library ($ralib, $self->{url}); + my $callback = 'SVN::Ra::Callbacks'; Property changes on: head/devel/subversion-devel/files/patch-svnperl-memoryleak ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion-devel/files/patch-svnperl-noruntime =================================================================== --- head/devel/subversion-devel/files/patch-svnperl-noruntime (nonexistent) +++ head/devel/subversion-devel/files/patch-svnperl-noruntime (revision 116726) @@ -0,0 +1,82 @@ +--- subversion/bindings/swig/perl/Base.pm (revision 10173) ++++ subversion/bindings/swig/perl/Base.pm (revision 10174) +@@ -60,6 +60,7 @@ sub import { + package SVN::_$pkg; + require DynaLoader; + bootstrap SVN::_$pkg; ++sub dl_load_flags { 0x01 } + 1; + ' or die $@; + }; +--- subversion/bindings/swig/perl/Makefile.PL (revision 10173) ++++ subversion/bindings/swig/perl/Makefile.PL (revision 10174) +@@ -1,4 +1,5 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Cwd 'abs_path'; + use Config; +@@ -8,6 +9,12 @@ if ($^O ne 'VMS') { + $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; + } + ++my $top_builddir = '../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ ++ + my $swig_version; + open TOPMAKE, "<../../../../Makefile"; + while () { +@@ -50,8 +57,7 @@ my %config = ( + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `swig -perl -ldflags`)], ++ @ldmodules)], + ); + + sub perlish { +@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co + PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a", + clean => { FILES => "*.hi *.c *.bs". + join(' Makefile.','',@modules) } + ); +@@ -84,15 +91,19 @@ sub MY::postamble { + my $module_c_files = join (' ',map { "svn_$_.c"} @modules); + my $module_make_commands = join ('',map {"\tmake -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 " . +- "-I.. -I../../../include $apr_cflags"; ++ my ($swig_command, $swig_command_runtime) = ++ map {"swig $_ -nopm -perl " . ++ "-I.. -I../../../include $apr_cflags" } ++ ($flags, $flags_runtime); + + my $swig_modules_command = join ('', + map {"\nsvn_$_.c : ../svn_$_.i ". +@@ -127,7 +138,7 @@ modules :: $module_c_files + $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ + + core.c :: ../core.i +-\t$swig_command -module SVN::_Core -o core.c ../core.i ++\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i + + $swig_modules_command + Property changes on: head/devel/subversion-devel/files/patch-svnperl-noruntime ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion-devel/pkg-plist =================================================================== --- head/devel/subversion-devel/pkg-plist (revision 116725) +++ head/devel/subversion-devel/pkg-plist (revision 116726) @@ -1,195 +1,187 @@ bin/svn bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin bin/svnversion include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_config.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h @dirrm include/subversion-1 lib/libsvn_client-1.a lib/libsvn_client-1.la lib/libsvn_client-1.so lib/libsvn_client-1.so.0 lib/libsvn_delta-1.a lib/libsvn_delta-1.la lib/libsvn_delta-1.so lib/libsvn_delta-1.so.0 lib/libsvn_diff-1.a lib/libsvn_diff-1.la lib/libsvn_diff-1.so lib/libsvn_diff-1.so.0 lib/libsvn_fs-1.a lib/libsvn_fs-1.la lib/libsvn_fs-1.so lib/libsvn_fs-1.so.0 lib/libsvn_ra-1.a lib/libsvn_ra-1.la lib/libsvn_ra-1.so lib/libsvn_ra-1.so.0 -lib/libsvn_ra_dav-1.a -lib/libsvn_ra_dav-1.la -lib/libsvn_ra_dav-1.so -lib/libsvn_ra_dav-1.so.0 +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la lib/libsvn_ra_local-1.so lib/libsvn_ra_local-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_ra_svn-1.so lib/libsvn_ra_svn-1.so.0 lib/libsvn_repos-1.a lib/libsvn_repos-1.la lib/libsvn_repos-1.so lib/libsvn_repos-1.so.0 lib/libsvn_subr-1.a lib/libsvn_subr-1.la lib/libsvn_subr-1.so lib/libsvn_subr-1.so.0 lib/libsvn_wc-1.a lib/libsvn_wc-1.la lib/libsvn_wc-1.so lib/libsvn_wc-1.so.0 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so %%WITH_PERL%%lib/libsvn_swig_perl-1.a %%WITH_PERL%%lib/libsvn_swig_perl-1.la %%WITH_PERL%%lib/libsvn_swig_perl-1.so %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN %%WITH_PYTHON%%lib/libsvn_swig_py-1.a %%WITH_PYTHON%%lib/libsvn_swig_py-1.la %%WITH_PYTHON%%lib/libsvn_swig_py-1.so %%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion Property changes on: head/devel/subversion-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/devel/subversion-freebsd/Makefile =================================================================== --- head/devel/subversion-freebsd/Makefile (revision 116725) +++ head/devel/subversion-freebsd/Makefile (revision 116726) @@ -1,287 +1,329 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system -LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon \ - expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 INSTALLS_SHLIB= yes USE_SIZE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE} MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 MANCOMPRESSED= no +TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README +.if !defined(NOPORTDOCS) +PORTDOCS= ${TXT_DOCS} +.endif + .include SVNREPOS?= /home/svn/repos .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif +.if !defined(WITHOUT_NEON) +LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ +CONFIGURE_ARGS+= --with-neon=${LOCALBASE} +PLIST_SUB+= WITHOUT_NEON="" +.else +CONFIGURE_ARGS+= --without-neon +PLIST_SUB+= WITHOUT_NEON="@comment " +.endif + .if defined(WITH_PERL) .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif SWIG_BINDINGS+= perl USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ SVN::Delta.3 \ SVN::Ra.3 \ SVN::Repos.3 \ SVN::Wc.3 .else PLIST_SUB+= WITH_PERL="@comment " .endif .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= python PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 DEPENDS_ARGS+= SWIG_LANGUAGES='${SWIG_BINDINGS}' CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} .else CONFIGURE_ARGS+= --with-swig=no .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www .else PLIST_SUB+= MOD_DAV_SVN="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn .endif .if defined(WITH_APACHE2_APR) APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} DEPENDS_ARGS+= WITH_BERKELEYDB=db4 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_PORT= www/apache2 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) -#LDFLAGS+= -rpath ${LOCALBASE}/lib/apache2 -rpath ${LOCALBASE}/libexec/apache2 -#CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .else LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr-svn CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \ --with-apr-util=${LOCALBASE} APR_APU_DIR= ${LOCALBASE}/bin APR_PORT= devel/apr OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif +.if defined(WITH_BOOK_HTML) +PORTDOCS+= book +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +.endif + pre-extract: @${ECHO_MSG} "" +.if defined(WITHOUT_NEON) + @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." +.else + @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." + @${ECHO_MSG} "To disable it define WITHOUT_NEON" +.endif + @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." .else @${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG." .endif @${ECHO_MSG} "" .if defined(WITH_PERL) @${ECHO_MSG} "Build with perl bindings." @${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time." .else @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" .endif @${ECHO_MSG} "" .if defined(WITH_PYTHON) @${ECHO_MSG} "Build with Python bindings." .else @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" @${ECHO_MSG} "by defining WITH_MOD_DAV_SVN. This option implies" @${ECHO_MSG} "the WITH_APACHE2_APR option." .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "by defining WITH_APACHE2_APR." .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." .else @${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)" @${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER." .endif @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${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} "" .endif @${ECHO_MSG} "" +.if defined(WITH_BOOK_HTML) + @${ECHO_MSG} "Subversion Book (HTML) enabled." +.else + @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" + @${ECHO_MSG} "WITH_BOOK_HTML." +.endif + @${ECHO_MSG} "" post-extract: @${RM} -r ${WRKSRC}/neon @${RM} -r ${WRKSRC}/apr @${RM} -r ${WRKSRC}/apr-util post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in pre-configure: @if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi @if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please, rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi post-build: .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \ CCFLAGS="${CCFLAGS}" CC="${CC}" \ ${PERL} Makefile.PL PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \ ${MAKE} all .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} swig-py .endif +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book/tools/ ; \ + ${LN} -s ${PREFIX}/share/xsl/docbook xsl + cd ${WRKSRC}/doc/book ; \ + ${MAKE} all-html +.endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + for f in ${TXT_DOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book ; \ + ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.endif .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} install-swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${MAKE} install .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} install-swig-py .endif .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) @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 \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi . 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 @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG) ;; \ *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif .include Property changes on: head/devel/subversion-freebsd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.66 \ No newline at end of property +1.67 \ No newline at end of property Index: head/devel/subversion-freebsd/files/patch-book-Makefile =================================================================== --- head/devel/subversion-freebsd/files/patch-book-Makefile (revision 116725) +++ head/devel/subversion-freebsd/files/patch-book-Makefile (revision 116726) @@ -1,24 +1,31 @@ ---- doc/book/Makefile.orig Mon May 19 17:06:16 2003 -+++ doc/book/Makefile Mon May 19 17:22:14 2003 -@@ -98,7 +98,7 @@ +--- doc/book/Makefile.orig Fri Feb 20 01:57:40 2004 ++++ doc/book/Makefile Wed Jul 7 19:58:29 2004 +@@ -1,5 +1,5 @@ + XSLTPROC = xsltproc +-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion ++#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion + INSTALL = install + + ## You shouldn't normally need to edit anything below here. +@@ -114,7 +114,7 @@ $(BOOK_INSTALL_DIR): $(INSTALL) -d $(BOOK_INSTALL_DIR) -install-book-html: $(BOOK_HTML_TARGET) +install-book-html: $(INSTALL) -d $(BOOK_INSTALL_DIR)/images $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR) $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) -@@ -111,10 +111,10 @@ +@@ -126,10 +126,10 @@ $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) - $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images + $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images -install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) +install-book-pdf: $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) -install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) +install-book-ps: $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) book-clean: Property changes on: head/devel/subversion-freebsd/files/patch-book-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/subversion-freebsd/files/patch-svnperl-memoryleak =================================================================== --- head/devel/subversion-freebsd/files/patch-svnperl-memoryleak (nonexistent) +++ head/devel/subversion-freebsd/files/patch-svnperl-memoryleak (revision 116726) @@ -0,0 +1,195 @@ +--- subversion/bindings/swig/svn_types.i (revision 10171) ++++ subversion/bindings/swig/svn_types.i (revision 10172) +@@ -316,7 +316,7 @@ + %typemap(perl5, in) (svn_commit_callback_t callback, void *callback_baton) { + $1 = svn_swig_pl_thunk_commit_callback; + $2 = (void *)$input; +- SvREFCNT_inc($input); ++ svn_swig_pl_hold_ref_in_pool (_global_pool, $input); + }; + + /* ----------------------------------------------------------------------- +--- subversion/bindings/swig/swigutil_pl.c (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.c (revision 10172) +@@ -1385,3 +1385,16 @@ apr_file_t *svn_swig_pl_make_file (SV *f + } + return apr_file; + } ++ ++static apr_status_t cleanup_refcnt (void *data) ++{ ++ SV *sv = data; ++ SvREFCNT_dec (sv); ++ return APR_SUCCESS; ++} ++ ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv) ++{ ++ SvREFCNT_inc(sv); ++ apr_pool_cleanup_register (pool, sv, cleanup_refcnt, apr_pool_cleanup_null); ++} +--- subversion/bindings/swig/swigutil_pl.h (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.h (revision 10172) +@@ -231,6 +231,7 @@ SV *svn_swig_pl_from_stream (svn_stream_ + /* apr_file_t * */ + apr_file_t *svn_swig_pl_make_file (SV *file, apr_pool_t *pool); + ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv); + + #ifdef __cplusplus + } +--- subversion/bindings/swig/perl/t/5delta.t (revision 10171) ++++ subversion/bindings/swig/perl/t/5delta.t (revision 10172) +@@ -4,27 +4,19 @@ use Test::More tests => 2; + require SVN::Core; + require SVN::Delta; + +-SKIP: { +- eval { require IO::String }; ++my ($srctext, $tgttext, $result) = ('abcd===eflfjgjkx', 'abcd=--ef==lfjffgjx', ''); + +- skip "IO::String not installed", 2 if $@; +- my $srctext = 'abcd===eflfjgjkx'; +- my $tgttext = 'abcd=--ef==lfjffgjx'; ++open my $source, '<', \$srctext; ++open my $target, '<', \$tgttext; ++open my $aresult, '>', \$result; + +- my $source = IO::String->new ($srctext); +- my $target = IO::String->new ($tgttext); ++my $txstream = SVN::TxDelta::new ($source, $target); + +- my $result = ''; +- my $aresult = IO::String->new (\$result); ++isa_ok ($txstream, '_p_svn_txdelta_stream_t'); ++open my $asource, '<', \$srctext; ++my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)]; + +- my $txstream = SVN::TxDelta::new ($source, $target); ++SVN::TxDelta::send_txstream ($txstream, @$handle); + +- isa_ok ($txstream, '_p_svn_txdelta_stream_t'); +- my $handle = [SVN::TxDelta::apply (IO::String->new ($srctext), +- $aresult, undef, undef)]; ++is ($result, $tgttext, 'delta self test'); + +- SVN::TxDelta::send_txstream ($txstream, @$handle); +- +- is ($result, $tgttext, 'delta self test'); +- +-} +--- subversion/bindings/swig/perl/t/1repos.t (revision 10171) ++++ subversion/bindings/swig/perl/t/1repos.t (revision 10172) +@@ -1,6 +1,6 @@ + #!/usr/bin/perl -w + +-use Test::More tests => 5; ++use Test::More tests => 6; + use File::Temp qw(tempdir); + use File::Path qw(rmtree); + use strict; +@@ -64,15 +64,20 @@ is_deeply (\@history, [['/tags/foo/filea + 'repos_history'); + + { ++my $pool = SVN::Pool->new_default; ++my $something = bless {}, 'something'; + $editor = SVN::Delta::Editor-> + new (SVN::Repos::get_commit_editor($repos, "file://$repospath", +- '/', 'root', 'FOO', \&committed)); ++ '/', 'root', 'FOO', sub {committed(@_); ++ $something; ++ })); + + my $rootbaton = $editor->open_root(2); + $editor->delete_entry('tags', 2, $rootbaton); + + $editor->close_edit(); + } ++ok ($main::something_destroyed, 'callback properly destroyed'); + + cmp_ok($fs->youngest_rev, '==', 3); + +@@ -80,3 +85,11 @@ END { + diag "cleanup"; + rmtree($repospath); + } ++ ++package something; ++ ++sub DESTROY { ++ $main::something_destroyed++; ++} ++ ++1; +--- subversion/bindings/swig/perl/Delta.pm (revision 10171) ++++ subversion/bindings/swig/perl/Delta.pm (revision 10172) +@@ -143,8 +143,8 @@ sub AUTOLOAD { + return unless $_[0]->{_editor}; + my $class = ref($_[0]); + my $func = $AUTOLOAD; +- $func =~ s/^${class}::(SUPER::)?//; +- return if $func =~ m/^[A-Z]/; ++ $func =~ s/.*:://; ++ return unless $func =~ m/[^A-Z]/; + + my %ebaton = ( set_target_revision => 1, + open_root => 1, +--- subversion/bindings/swig/perl/Base.pm (revision 10171) ++++ subversion/bindings/swig/perl/Base.pm (revision 10172) +@@ -7,7 +7,7 @@ SVN::Base - Base class for importing sym + =head1 SYNOPSIS + + # Load the svn_ra_* functions into the SVN::Ra namespace. +- pacakge SVN::Ra; ++ package SVN::Ra; + use SVN::Base qw(Ra svn_ra_); + + # Load svn_config_t structure accessors in the magic namcespace +--- subversion/bindings/swig/perl/Ra.pm (revision 10171) ++++ subversion/bindings/swig/perl/Ra.pm (revision 10172) +@@ -63,26 +63,25 @@ require SVN::Client; + + my $ralib = init_ra_libs; + ++# Ra methods that returns reporter ++my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update); + our $AUTOLOAD; + + sub AUTOLOAD { + my $class = ref($_[0]); +- $AUTOLOAD =~ s/^${class}::(SUPER::)?//; +- return if $AUTOLOAD =~ m/^[A-Z]/; ++ my $method = $AUTOLOAD; ++ $method =~ s/.*:://; ++ return unless $method =~ m/[^A-Z]/; + + my $self = shift; + no strict 'refs'; + + die "no such method $AUTOLOAD" +- unless $self->can("plugin_invoke_$AUTOLOAD"); ++ unless $self->can("plugin_invoke_$method"); + +- my @ret = &{"plugin_invoke_$AUTOLOAD"}(@{$self}{qw/ra session/}, @_, +- $self->{pool}); +- +- return $ret[0] unless $#ret; +- +- return ($AUTOLOAD eq 'get_commit_editor') ? @ret : +- bless [@ret], 'SVN::Ra::Reporter'; ++ my @ret = &{"plugin_invoke_$method"}(@{$self}{qw/ra session/}, @_); ++ return bless [@ret], 'SVN::Ra::Reporter' if $reporter{$method}; ++ return $#ret == 0 ? $ret[0] : @ret; + } + + sub new { +@@ -106,7 +105,7 @@ sub new { + [SVN::Client::get_username_provider()]); + } + +- my $pool = $self->{pool} ||= SVN::Core::pool_create(undef); ++ my $pool = $self->{pool} ||= SVN::Pool->new; + + $self->{ra} = get_ra_library ($ralib, $self->{url}); + my $callback = 'SVN::Ra::Callbacks'; Property changes on: head/devel/subversion-freebsd/files/patch-svnperl-memoryleak ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion-freebsd/files/patch-svnperl-noruntime =================================================================== --- head/devel/subversion-freebsd/files/patch-svnperl-noruntime (nonexistent) +++ head/devel/subversion-freebsd/files/patch-svnperl-noruntime (revision 116726) @@ -0,0 +1,82 @@ +--- subversion/bindings/swig/perl/Base.pm (revision 10173) ++++ subversion/bindings/swig/perl/Base.pm (revision 10174) +@@ -60,6 +60,7 @@ sub import { + package SVN::_$pkg; + require DynaLoader; + bootstrap SVN::_$pkg; ++sub dl_load_flags { 0x01 } + 1; + ' or die $@; + }; +--- subversion/bindings/swig/perl/Makefile.PL (revision 10173) ++++ subversion/bindings/swig/perl/Makefile.PL (revision 10174) +@@ -1,4 +1,5 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Cwd 'abs_path'; + use Config; +@@ -8,6 +9,12 @@ if ($^O ne 'VMS') { + $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; + } + ++my $top_builddir = '../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ ++ + my $swig_version; + open TOPMAKE, "<../../../../Makefile"; + while () { +@@ -50,8 +57,7 @@ my %config = ( + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `swig -perl -ldflags`)], ++ @ldmodules)], + ); + + sub perlish { +@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co + PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a", + clean => { FILES => "*.hi *.c *.bs". + join(' Makefile.','',@modules) } + ); +@@ -84,15 +91,19 @@ sub MY::postamble { + my $module_c_files = join (' ',map { "svn_$_.c"} @modules); + my $module_make_commands = join ('',map {"\tmake -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 " . +- "-I.. -I../../../include $apr_cflags"; ++ my ($swig_command, $swig_command_runtime) = ++ map {"swig $_ -nopm -perl " . ++ "-I.. -I../../../include $apr_cflags" } ++ ($flags, $flags_runtime); + + my $swig_modules_command = join ('', + map {"\nsvn_$_.c : ../svn_$_.i ". +@@ -127,7 +138,7 @@ modules :: $module_c_files + $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ + + core.c :: ../core.i +-\t$swig_command -module SVN::_Core -o core.c ../core.i ++\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i + + $swig_modules_command + Property changes on: head/devel/subversion-freebsd/files/patch-svnperl-noruntime ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion-freebsd/pkg-plist =================================================================== --- head/devel/subversion-freebsd/pkg-plist (revision 116725) +++ head/devel/subversion-freebsd/pkg-plist (revision 116726) @@ -1,195 +1,187 @@ bin/svn bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin bin/svnversion include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_config.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h @dirrm include/subversion-1 lib/libsvn_client-1.a lib/libsvn_client-1.la lib/libsvn_client-1.so lib/libsvn_client-1.so.0 lib/libsvn_delta-1.a lib/libsvn_delta-1.la lib/libsvn_delta-1.so lib/libsvn_delta-1.so.0 lib/libsvn_diff-1.a lib/libsvn_diff-1.la lib/libsvn_diff-1.so lib/libsvn_diff-1.so.0 lib/libsvn_fs-1.a lib/libsvn_fs-1.la lib/libsvn_fs-1.so lib/libsvn_fs-1.so.0 lib/libsvn_ra-1.a lib/libsvn_ra-1.la lib/libsvn_ra-1.so lib/libsvn_ra-1.so.0 -lib/libsvn_ra_dav-1.a -lib/libsvn_ra_dav-1.la -lib/libsvn_ra_dav-1.so -lib/libsvn_ra_dav-1.so.0 +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la lib/libsvn_ra_local-1.so lib/libsvn_ra_local-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_ra_svn-1.so lib/libsvn_ra_svn-1.so.0 lib/libsvn_repos-1.a lib/libsvn_repos-1.la lib/libsvn_repos-1.so lib/libsvn_repos-1.so.0 lib/libsvn_subr-1.a lib/libsvn_subr-1.la lib/libsvn_subr-1.so lib/libsvn_subr-1.so.0 lib/libsvn_wc-1.a lib/libsvn_wc-1.la lib/libsvn_wc-1.so lib/libsvn_wc-1.so.0 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so %%WITH_PERL%%lib/libsvn_swig_perl-1.a %%WITH_PERL%%lib/libsvn_swig_perl-1.la %%WITH_PERL%%lib/libsvn_swig_perl-1.so %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN %%WITH_PYTHON%%lib/libsvn_swig_py-1.a %%WITH_PYTHON%%lib/libsvn_swig_py-1.la %%WITH_PYTHON%%lib/libsvn_swig_py-1.so %%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion Property changes on: head/devel/subversion-freebsd/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/devel/subversion16/Makefile =================================================================== --- head/devel/subversion16/Makefile (revision 116725) +++ head/devel/subversion16/Makefile (revision 116726) @@ -1,287 +1,329 @@ # New ports collection makefile for: subversion # Date created: 10 September 2001 # Whom: rooneg@electricjellyfish.net # # $FreeBSD$ PORTNAME= subversion PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system -LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon \ - expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 INSTALLS_SHLIB= yes USE_SIZE= yes USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-ssl --with-neon=${LOCALBASE} MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1 MAN5= svnserve.conf.5 MAN8= svnserve.8 MANCOMPRESSED= no +TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README +.if !defined(NOPORTDOCS) +PORTDOCS= ${TXT_DOCS} +.endif + .include SVNREPOS?= /home/svn/repos .if defined(WITH_MAINTAINER_DEBUG) CONFIGURE_ARGS+=--enable-maintainer-mode \ --enable-debug CFLAGS+= -g .endif +.if !defined(WITHOUT_NEON) +LIB_DEPENDS+= neon.24:${PORTSDIR}/www/neon \ +CONFIGURE_ARGS+= --with-neon=${LOCALBASE} +PLIST_SUB+= WITHOUT_NEON="" +.else +CONFIGURE_ARGS+= --without-neon +PLIST_SUB+= WITHOUT_NEON="@comment " +.endif + .if defined(WITH_PERL) .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif SWIG_BINDINGS+= perl USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ SVN::Delta.3 \ SVN::Ra.3 \ SVN::Repos.3 \ SVN::Wc.3 .else PLIST_SUB+= WITH_PERL="@comment " .endif .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= python PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " .endif .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 DEPENDS_ARGS+= SWIG_LANGUAGES='${SWIG_BINDINGS}' CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} .else CONFIGURE_ARGS+= --with-swig=no .endif .if defined(WITH_MOD_DAV_SVN) WITH_APACHE2_APR= yes CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DAV_SVN="" SVNGROUP?= www .else PLIST_SUB+= MOD_DAV_SVN="@comment " PKGDEINSTALL= NONEXISTENT SVNGROUP?= svn .endif .if defined(WITH_APACHE2_APR) APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} DEPENDS_ARGS+= WITH_BERKELEYDB=db4 CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ --with-apr-util=${LOCALBASE}/lib/apache2/apu-config APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_PORT= www/apache2 OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) -#LDFLAGS+= -rpath ${LOCALBASE}/lib/apache2 -rpath ${LOCALBASE}/libexec/apache2 -#CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .else LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr-svn CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \ --with-apr-util=${LOCALBASE} APR_APU_DIR= ${LOCALBASE}/bin APR_PORT= devel/apr OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes .endif .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " .endif +.if defined(WITH_BOOK_HTML) +PORTDOCS+= book +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +.endif + pre-extract: @${ECHO_MSG} "" +.if defined(WITHOUT_NEON) + @${ECHO_MSG} "WebDAV/Delta-V repository access module disabled." +.else + @${ECHO_MSG} "WebDAV/Delta-V repository access module enabled." + @${ECHO_MSG} "To disable it define WITHOUT_NEON" +.endif + @${ECHO_MSG} "" .if defined(WITH_MAINTAINER_DEBUG) @${ECHO_MSG} "Build debug version." .else @${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG." .endif @${ECHO_MSG} "" .if defined(WITH_PERL) @${ECHO_MSG} "Build with perl bindings." @${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time." .else @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" .endif @${ECHO_MSG} "" .if defined(WITH_PYTHON) @${ECHO_MSG} "Build with Python bindings." .else @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled." .else @${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X" @${ECHO_MSG} "by defining WITH_MOD_DAV_SVN. This option implies" @${ECHO_MSG} "the WITH_APACHE2_APR option." .endif @${ECHO_MSG} "" .if defined(WITH_APACHE2_APR) @${ECHO_MSG} "Using APR from www/apache2. If you have the devel/apr" @${ECHO_MSG} "port/package installed, you may need to remove it." .else @${ECHO_MSG} "You can link subversion against the APR built with" @${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port," @${ECHO_MSG} "by defining WITH_APACHE2_APR." .endif @${ECHO_MSG} "" .if defined(WITH_SVNSERVE_WRAPPER) @${ECHO_MSG} "svnserve wrapper enabled." .else @${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)" @${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER." .endif @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${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} "" .endif @${ECHO_MSG} "" +.if defined(WITH_BOOK_HTML) + @${ECHO_MSG} "Subversion Book (HTML) enabled." +.else + @${ECHO_MSG} "You can install the Subversion Book (HTML) by defining" + @${ECHO_MSG} "WITH_BOOK_HTML." +.endif + @${ECHO_MSG} "" post-extract: @${RM} -r ${WRKSRC}/neon @${RM} -r ${WRKSRC}/apr @${RM} -r ${WRKSRC}/apr-util post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${PREFIX}/etc/subversion#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .endif @${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in pre-configure: @if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \ ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi @if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please, rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi post-build: .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${SETENV} APR_CONFIG="${APR_APU_DIR}/apr-config" APU_CONFIG="${APR_APU_DIR}/apu-config" \ CCFLAGS="${CCFLAGS}" CC="${CC}" \ ${PERL} Makefile.PL PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" ; \ ${MAKE} all .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} swig-py .endif +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book/tools/ ; \ + ${LN} -s ${PREFIX}/share/xsl/docbook xsl + cd ${WRKSRC}/doc/book ; \ + ${MAKE} all-html +.endif .if defined(WITH_MOD_DAV_SVN) pre-install: ${APXS} -e -S LIBEXECDIR=${PREFIX}/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - for f in BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + for f in ${TXT_DOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ done +.if defined(WITH_BOOK_HTML) + cd ${WRKSRC}/doc/book ; \ + ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR} +.endif .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ ${MAKE} install-swig-pl-lib cd ${WRKSRC}/subversion/bindings/swig/perl ; \ ${MAKE} install .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ ${MAKE} install-swig-py .endif .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) @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 \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi . 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 @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG) ;; \ *) ${CHGRP} ${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif post-deinstall: .if defined(WITH_MOD_DAV_SVN) @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .endif .include Property changes on: head/devel/subversion16/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.66 \ No newline at end of property +1.67 \ No newline at end of property Index: head/devel/subversion16/files/patch-book-Makefile =================================================================== --- head/devel/subversion16/files/patch-book-Makefile (revision 116725) +++ head/devel/subversion16/files/patch-book-Makefile (revision 116726) @@ -1,24 +1,31 @@ ---- doc/book/Makefile.orig Mon May 19 17:06:16 2003 -+++ doc/book/Makefile Mon May 19 17:22:14 2003 -@@ -98,7 +98,7 @@ +--- doc/book/Makefile.orig Fri Feb 20 01:57:40 2004 ++++ doc/book/Makefile Wed Jul 7 19:58:29 2004 +@@ -1,5 +1,5 @@ + XSLTPROC = xsltproc +-INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion ++#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion + INSTALL = install + + ## You shouldn't normally need to edit anything below here. +@@ -114,7 +114,7 @@ $(BOOK_INSTALL_DIR): $(INSTALL) -d $(BOOK_INSTALL_DIR) -install-book-html: $(BOOK_HTML_TARGET) +install-book-html: $(INSTALL) -d $(BOOK_INSTALL_DIR)/images $(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR) $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) -@@ -111,10 +111,10 @@ +@@ -126,10 +126,10 @@ $(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR) - $(INSTALL) $(BOOK_DIR)/images/*.png $(BOOK_INSTALL_DIR)/images + $(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images -install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) +install-book-pdf: $(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR) -install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) +install-book-ps: $(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR) book-clean: Property changes on: head/devel/subversion16/files/patch-book-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/subversion16/files/patch-svnperl-memoryleak =================================================================== --- head/devel/subversion16/files/patch-svnperl-memoryleak (nonexistent) +++ head/devel/subversion16/files/patch-svnperl-memoryleak (revision 116726) @@ -0,0 +1,195 @@ +--- subversion/bindings/swig/svn_types.i (revision 10171) ++++ subversion/bindings/swig/svn_types.i (revision 10172) +@@ -316,7 +316,7 @@ + %typemap(perl5, in) (svn_commit_callback_t callback, void *callback_baton) { + $1 = svn_swig_pl_thunk_commit_callback; + $2 = (void *)$input; +- SvREFCNT_inc($input); ++ svn_swig_pl_hold_ref_in_pool (_global_pool, $input); + }; + + /* ----------------------------------------------------------------------- +--- subversion/bindings/swig/swigutil_pl.c (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.c (revision 10172) +@@ -1385,3 +1385,16 @@ apr_file_t *svn_swig_pl_make_file (SV *f + } + return apr_file; + } ++ ++static apr_status_t cleanup_refcnt (void *data) ++{ ++ SV *sv = data; ++ SvREFCNT_dec (sv); ++ return APR_SUCCESS; ++} ++ ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv) ++{ ++ SvREFCNT_inc(sv); ++ apr_pool_cleanup_register (pool, sv, cleanup_refcnt, apr_pool_cleanup_null); ++} +--- subversion/bindings/swig/swigutil_pl.h (revision 10171) ++++ subversion/bindings/swig/swigutil_pl.h (revision 10172) +@@ -231,6 +231,7 @@ SV *svn_swig_pl_from_stream (svn_stream_ + /* apr_file_t * */ + apr_file_t *svn_swig_pl_make_file (SV *file, apr_pool_t *pool); + ++void svn_swig_pl_hold_ref_in_pool (apr_pool_t *pool, SV *sv); + + #ifdef __cplusplus + } +--- subversion/bindings/swig/perl/t/5delta.t (revision 10171) ++++ subversion/bindings/swig/perl/t/5delta.t (revision 10172) +@@ -4,27 +4,19 @@ use Test::More tests => 2; + require SVN::Core; + require SVN::Delta; + +-SKIP: { +- eval { require IO::String }; ++my ($srctext, $tgttext, $result) = ('abcd===eflfjgjkx', 'abcd=--ef==lfjffgjx', ''); + +- skip "IO::String not installed", 2 if $@; +- my $srctext = 'abcd===eflfjgjkx'; +- my $tgttext = 'abcd=--ef==lfjffgjx'; ++open my $source, '<', \$srctext; ++open my $target, '<', \$tgttext; ++open my $aresult, '>', \$result; + +- my $source = IO::String->new ($srctext); +- my $target = IO::String->new ($tgttext); ++my $txstream = SVN::TxDelta::new ($source, $target); + +- my $result = ''; +- my $aresult = IO::String->new (\$result); ++isa_ok ($txstream, '_p_svn_txdelta_stream_t'); ++open my $asource, '<', \$srctext; ++my $handle = [SVN::TxDelta::apply ($asource, $aresult, undef, undef)]; + +- my $txstream = SVN::TxDelta::new ($source, $target); ++SVN::TxDelta::send_txstream ($txstream, @$handle); + +- isa_ok ($txstream, '_p_svn_txdelta_stream_t'); +- my $handle = [SVN::TxDelta::apply (IO::String->new ($srctext), +- $aresult, undef, undef)]; ++is ($result, $tgttext, 'delta self test'); + +- SVN::TxDelta::send_txstream ($txstream, @$handle); +- +- is ($result, $tgttext, 'delta self test'); +- +-} +--- subversion/bindings/swig/perl/t/1repos.t (revision 10171) ++++ subversion/bindings/swig/perl/t/1repos.t (revision 10172) +@@ -1,6 +1,6 @@ + #!/usr/bin/perl -w + +-use Test::More tests => 5; ++use Test::More tests => 6; + use File::Temp qw(tempdir); + use File::Path qw(rmtree); + use strict; +@@ -64,15 +64,20 @@ is_deeply (\@history, [['/tags/foo/filea + 'repos_history'); + + { ++my $pool = SVN::Pool->new_default; ++my $something = bless {}, 'something'; + $editor = SVN::Delta::Editor-> + new (SVN::Repos::get_commit_editor($repos, "file://$repospath", +- '/', 'root', 'FOO', \&committed)); ++ '/', 'root', 'FOO', sub {committed(@_); ++ $something; ++ })); + + my $rootbaton = $editor->open_root(2); + $editor->delete_entry('tags', 2, $rootbaton); + + $editor->close_edit(); + } ++ok ($main::something_destroyed, 'callback properly destroyed'); + + cmp_ok($fs->youngest_rev, '==', 3); + +@@ -80,3 +85,11 @@ END { + diag "cleanup"; + rmtree($repospath); + } ++ ++package something; ++ ++sub DESTROY { ++ $main::something_destroyed++; ++} ++ ++1; +--- subversion/bindings/swig/perl/Delta.pm (revision 10171) ++++ subversion/bindings/swig/perl/Delta.pm (revision 10172) +@@ -143,8 +143,8 @@ sub AUTOLOAD { + return unless $_[0]->{_editor}; + my $class = ref($_[0]); + my $func = $AUTOLOAD; +- $func =~ s/^${class}::(SUPER::)?//; +- return if $func =~ m/^[A-Z]/; ++ $func =~ s/.*:://; ++ return unless $func =~ m/[^A-Z]/; + + my %ebaton = ( set_target_revision => 1, + open_root => 1, +--- subversion/bindings/swig/perl/Base.pm (revision 10171) ++++ subversion/bindings/swig/perl/Base.pm (revision 10172) +@@ -7,7 +7,7 @@ SVN::Base - Base class for importing sym + =head1 SYNOPSIS + + # Load the svn_ra_* functions into the SVN::Ra namespace. +- pacakge SVN::Ra; ++ package SVN::Ra; + use SVN::Base qw(Ra svn_ra_); + + # Load svn_config_t structure accessors in the magic namcespace +--- subversion/bindings/swig/perl/Ra.pm (revision 10171) ++++ subversion/bindings/swig/perl/Ra.pm (revision 10172) +@@ -63,26 +63,25 @@ require SVN::Client; + + my $ralib = init_ra_libs; + ++# Ra methods that returns reporter ++my %reporter = map { $_ => 1 } qw(do_diff do_switch do_status do_update); + our $AUTOLOAD; + + sub AUTOLOAD { + my $class = ref($_[0]); +- $AUTOLOAD =~ s/^${class}::(SUPER::)?//; +- return if $AUTOLOAD =~ m/^[A-Z]/; ++ my $method = $AUTOLOAD; ++ $method =~ s/.*:://; ++ return unless $method =~ m/[^A-Z]/; + + my $self = shift; + no strict 'refs'; + + die "no such method $AUTOLOAD" +- unless $self->can("plugin_invoke_$AUTOLOAD"); ++ unless $self->can("plugin_invoke_$method"); + +- my @ret = &{"plugin_invoke_$AUTOLOAD"}(@{$self}{qw/ra session/}, @_, +- $self->{pool}); +- +- return $ret[0] unless $#ret; +- +- return ($AUTOLOAD eq 'get_commit_editor') ? @ret : +- bless [@ret], 'SVN::Ra::Reporter'; ++ my @ret = &{"plugin_invoke_$method"}(@{$self}{qw/ra session/}, @_); ++ return bless [@ret], 'SVN::Ra::Reporter' if $reporter{$method}; ++ return $#ret == 0 ? $ret[0] : @ret; + } + + sub new { +@@ -106,7 +105,7 @@ sub new { + [SVN::Client::get_username_provider()]); + } + +- my $pool = $self->{pool} ||= SVN::Core::pool_create(undef); ++ my $pool = $self->{pool} ||= SVN::Pool->new; + + $self->{ra} = get_ra_library ($ralib, $self->{url}); + my $callback = 'SVN::Ra::Callbacks'; Property changes on: head/devel/subversion16/files/patch-svnperl-memoryleak ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion16/files/patch-svnperl-noruntime =================================================================== --- head/devel/subversion16/files/patch-svnperl-noruntime (nonexistent) +++ head/devel/subversion16/files/patch-svnperl-noruntime (revision 116726) @@ -0,0 +1,82 @@ +--- subversion/bindings/swig/perl/Base.pm (revision 10173) ++++ subversion/bindings/swig/perl/Base.pm (revision 10174) +@@ -60,6 +60,7 @@ sub import { + package SVN::_$pkg; + require DynaLoader; + bootstrap SVN::_$pkg; ++sub dl_load_flags { 0x01 } + 1; + ' or die $@; + }; +--- subversion/bindings/swig/perl/Makefile.PL (revision 10173) ++++ subversion/bindings/swig/perl/Makefile.PL (revision 10174) +@@ -1,4 +1,5 @@ +-#!/usr/bin/perl ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Cwd 'abs_path'; + use Config; +@@ -8,6 +9,12 @@ if ($^O ne 'VMS') { + $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; + } + ++my $top_builddir = '../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ ++ + my $swig_version; + open TOPMAKE, "<../../../../Makefile"; + while () { +@@ -50,8 +57,7 @@ my %config = ( + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-L$_"} @ldpaths), +- @ldmodules, '-lsvn_swig_perl-1', +- `swig -perl -ldflags`)], ++ @ldmodules)], + ); + + sub perlish { +@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co + PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a", + clean => { FILES => "*.hi *.c *.bs". + join(' Makefile.','',@modules) } + ); +@@ -84,15 +91,19 @@ sub MY::postamble { + my $module_c_files = join (' ',map { "svn_$_.c"} @modules); + my $module_make_commands = join ('',map {"\tmake -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 " . +- "-I.. -I../../../include $apr_cflags"; ++ my ($swig_command, $swig_command_runtime) = ++ map {"swig $_ -nopm -perl " . ++ "-I.. -I../../../include $apr_cflags" } ++ ($flags, $flags_runtime); + + my $swig_modules_command = join ('', + map {"\nsvn_$_.c : ../svn_$_.i ". +@@ -127,7 +138,7 @@ modules :: $module_c_files + $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ + + core.c :: ../core.i +-\t$swig_command -module SVN::_Core -o core.c ../core.i ++\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i + + $swig_modules_command + Property changes on: head/devel/subversion16/files/patch-svnperl-noruntime ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/subversion16/pkg-plist =================================================================== --- head/devel/subversion16/pkg-plist (revision 116725) +++ head/devel/subversion16/pkg-plist (revision 116726) @@ -1,195 +1,187 @@ bin/svn bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin bin/svnversion include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_config.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h @dirrm include/subversion-1 lib/libsvn_client-1.a lib/libsvn_client-1.la lib/libsvn_client-1.so lib/libsvn_client-1.so.0 lib/libsvn_delta-1.a lib/libsvn_delta-1.la lib/libsvn_delta-1.so lib/libsvn_delta-1.so.0 lib/libsvn_diff-1.a lib/libsvn_diff-1.la lib/libsvn_diff-1.so lib/libsvn_diff-1.so.0 lib/libsvn_fs-1.a lib/libsvn_fs-1.la lib/libsvn_fs-1.so lib/libsvn_fs-1.so.0 lib/libsvn_ra-1.a lib/libsvn_ra-1.la lib/libsvn_ra-1.so lib/libsvn_ra-1.so.0 -lib/libsvn_ra_dav-1.a -lib/libsvn_ra_dav-1.la -lib/libsvn_ra_dav-1.so -lib/libsvn_ra_dav-1.so.0 +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so +%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0 lib/libsvn_ra_local-1.a lib/libsvn_ra_local-1.la lib/libsvn_ra_local-1.so lib/libsvn_ra_local-1.so.0 lib/libsvn_ra_svn-1.a lib/libsvn_ra_svn-1.la lib/libsvn_ra_svn-1.so lib/libsvn_ra_svn-1.so.0 lib/libsvn_repos-1.a lib/libsvn_repos-1.la lib/libsvn_repos-1.so lib/libsvn_repos-1.so.0 lib/libsvn_subr-1.a lib/libsvn_subr-1.la lib/libsvn_subr-1.so lib/libsvn_subr-1.so.0 lib/libsvn_wc-1.a lib/libsvn_wc-1.la lib/libsvn_wc-1.so lib/libsvn_wc-1.so.0 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so %%WITH_PERL%%lib/libsvn_swig_perl-1.a %%WITH_PERL%%lib/libsvn_swig_perl-1.la %%WITH_PERL%%lib/libsvn_swig_perl-1.so %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Client.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Core.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Delta.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Fs.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Ra.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Repos.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Wc.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client/_Client.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/.packlist %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core/_Core.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta/_Delta.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs/_Fs.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra/_Ra.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos/_Repos.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc/_Wc.so %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Wc %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Repos %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Ra %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Fs %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Delta %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Client %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/_Core %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN %%WITH_PYTHON%%lib/libsvn_swig_py-1.a %%WITH_PYTHON%%lib/libsvn_swig_py-1.la %%WITH_PYTHON%%lib/libsvn_swig_py-1.so %%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/wc.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/__init__.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/client.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn -%%PORTDOCS%%share/doc/subversion/BUGS -%%PORTDOCS%%share/doc/subversion/CHANGES -%%PORTDOCS%%share/doc/subversion/COMMITTERS -%%PORTDOCS%%share/doc/subversion/COPYING -%%PORTDOCS%%share/doc/subversion/HACKING -%%PORTDOCS%%share/doc/subversion/INSTALL -%%PORTDOCS%%share/doc/subversion/README -%%PORTDOCS%%@dirrm share/doc/subversion Property changes on: head/devel/subversion16/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property