diff -ruN --exclude=CVS /usr/ports/devel/subversion/Makefile /home/clsung/ports/devel/subversion/Makefile --- /usr/ports/devel/subversion/Makefile Mon Sep 27 05:32:10 2004 +++ /home/clsung/ports/devel/subversion/Makefile Thu Oct 14 13:14:30 2004 @@ -5,7 +5,7 @@ # $FreeBSD: ports/devel/subversion/Makefile,v 1.69 2004/09/26 07:36:59 lev Exp $ PORTNAME= subversion -PORTVERSION= 1.0.8 +PORTVERSION= 1.1.0 CATEGORIES= devel MASTER_SITES= http://subversion.tigris.org/tarballs/ @@ -16,7 +16,6 @@ INSTALLS_SHLIB= yes -USE_SIZE= yes USE_BZIP2= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes @@ -72,7 +71,6 @@ .endif .if defined(WITH_PYTHON) -USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" SWIG_BINDINGS+= python PLIST_SUB+= WITH_PYTHON="" @@ -243,13 +241,7 @@ 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 + ${MAKE} swig-pl .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ @@ -280,9 +272,7 @@ .endif .if defined(WITH_PERL) cd ${WRKSRC} ; \ - ${MAKE} install-swig-pl-lib - cd ${WRKSRC}/subversion/bindings/swig/perl ; \ - ${MAKE} install + ${MAKE} install-swig-pl .endif .if defined(WITH_PYTHON) cd ${WRKSRC} ; \ diff -ruN --exclude=CVS /usr/ports/devel/subversion/distinfo /home/clsung/ports/devel/subversion/distinfo --- /usr/ports/devel/subversion/distinfo Mon Sep 27 05:32:10 2004 +++ /home/clsung/ports/devel/subversion/distinfo Sun Oct 3 09:50:26 2004 @@ -1,2 +1,2 @@ -MD5 (subversion-1.0.8.tar.bz2) = b2378b7d9d00653249877531a61ef1db -SIZE (subversion-1.0.8.tar.bz2) = 5978990 +MD5 (subversion-1.1.0.tar.bz2) = a91b0d79b8c8ab8747587037c044c6c9 +SIZE (subversion-1.1.0.tar.bz2) = 6747545 diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/build-outputs.mk.patch /home/clsung/ports/devel/subversion/files/build-outputs.mk.patch --- /usr/ports/devel/subversion/files/build-outputs.mk.patch Thu Oct 9 20:50:16 2003 +++ /home/clsung/ports/devel/subversion/files/build-outputs.mk.patch Sun Oct 3 09:50:26 2004 @@ -1,11 +1,3 @@ --- build-outputs.mk.orig Wed Oct 8 16:01:40 2003 +++ build-outputs.mk Wed Oct 8 16:02:00 2003 -@@ -447,7 +447,7 @@ - cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT) - cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT) - cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT) -- cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT) -+ cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.bin$(EXEEXT) - - install-fs-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la - $(MKDIR) $(DESTDIR)$(fs_libdir) +@@ -0,0 +0,0 @@ diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL /home/clsung/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL --- /usr/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL Thu Feb 5 23:20:42 2004 +++ /home/clsung/ports/devel/subversion/files/patch-subversion::bindings::swig::perl::Makefile.PL Sun Oct 3 09:50:26 2004 @@ -1,11 +1,3 @@ ---- subversion/bindings/swig/perl/Makefile.PL.orig Sat Jan 24 20:46:46 2004 -+++ subversion/bindings/swig/perl/Makefile.PL Sat Jan 31 21:40:23 2004 -@@ -41,7 +41,7 @@ - - my %config = ( - ABSTRACT => 'Perl bindings for Subversion', -- CCFLAGS => join(' ', $apr_cflags, $apu_cflags, -+ CCFLAGS => join(' ', $ENV{'CCFLAGS'} || '', $apr_cflags, $apu_cflags, - `$perl_path -MExtUtils::Embed -e ccopts`, - ' -I.. -I../../../include -g'), - OBJECT => q/$(O_FILES)/, +--- configure.orig Thu Oct 9 09:10:22 2003 ++++ configure Thu Oct 9 09:10:30 2003 +@@ -0,0 +0,0 @@ diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-svnperl-memoryleak /home/clsung/ports/devel/subversion/files/patch-svnperl-memoryleak --- /usr/ports/devel/subversion/files/patch-svnperl-memoryleak Thu Jan 1 08:00:00 1970 +++ /home/clsung/ports/devel/subversion/files/patch-svnperl-memoryleak Sun Oct 3 09:50:26 2004 @@ -0,0 +1,3 @@ +--- configure.orig Thu Oct 9 09:10:22 2003 ++++ configure Thu Oct 9 09:10:30 2003 +@@ -0,0 +0,0 @@ diff -ruN --exclude=CVS /usr/ports/devel/subversion/files/patch-svnperl-noruntime /home/clsung/ports/devel/subversion/files/patch-svnperl-noruntime --- /usr/ports/devel/subversion/files/patch-svnperl-noruntime Fri Aug 20 04:40:29 2004 +++ /home/clsung/ports/devel/subversion/files/patch-svnperl-noruntime Sun Oct 3 09:50:26 2004 @@ -1,82 +1,3 @@ ---- 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 - +--- configure.orig Thu Oct 9 09:10:22 2003 ++++ configure Thu Oct 9 09:10:30 2003 +@@ -0,0 +0,0 @@ diff -ruN --exclude=CVS /usr/ports/devel/subversion/pkg-plist /home/clsung/ports/devel/subversion/pkg-plist --- /usr/ports/devel/subversion/pkg-plist Mon Sep 27 05:32:10 2004 +++ /home/clsung/ports/devel/subversion/pkg-plist Sun Oct 3 09:50:26 2004 @@ -73,9 +73,7 @@ lib/libsvn_wc-1.a lib/libsvn_wc-1.so lib/libsvn_wc-1.so.0 -%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.a %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so -%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.a %%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