head 1.2; access; symbols; locks; strict; comment @# @; 1.2 date 2008.06.19.20.56.13; author rse; state dead; branches; next 1.1; commitid SOWitrk8jjQHmB7t; 1.1 date 2008.04.03.08.18.05; author rse; state Exp; branches; next ; commitid EpiRdQzhKfi4EDXs; desc @@ 1.2 log @remove obsolete package @ text @Index: Makefile.in --- Makefile.in.orig 2008-02-24 04:36:03 +0100 +++ Makefile.in 2008-04-03 09:53:06 +0200 @@@@ -155,7 +155,7 @@@@ LT_COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) # special compilation for files destined for mod_dav_svn -COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@@ -c +COMPILE_APACHE_MOD = @@APXS@@ -c -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" $(CPPFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@@ # special compilation for files destined for libsvn_swig_* (e.g. swigutil_*.c) COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@@ -c @@@@ -170,7 +170,7 @@@@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) # special link rule for mod_dav_svn -LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) +LINK_APACHE_MOD = @@APXS@@ -c -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" $(LDFLAGS) $(APACHE_LDFLAGS) # Compilation of SWIG-generated C source code COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@@ @@@@ -638,7 +638,7 @@@@ ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ $(SWIG_PL_DIR)/native/Makefile Index: apr-util/crypto/getuuid.c --- apr-util/crypto/getuuid.c.orig 2008-03-13 08:00:29 +0100 +++ apr-util/crypto/getuuid.c 2008-04-03 09:53:51 +0200 @@@@ -131,7 +131,7 @@@@ /* crap. this isn't crypto quality, but it will be Good Enough */ - get_system_time(&time_now); + time_now = apr_time_now(); srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff)); return rand() & 0x0FFFF; Index: build-outputs.mk --- build-outputs.mk.orig 2008-03-13 08:00:51 +0100 +++ build-outputs.mk 2008-04-03 09:53:06 +0200 @@@@ -333,7 +333,7 @@@@ mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/authz.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/lock.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mirror.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/reports/dated-rev.lo subversion/mod_dav_svn/reports/file-revs.lo subversion/mod_dav_svn/reports/get-location-segments.lo subversion/mod_dav_svn/reports/get-locations.lo subversion/mod_dav_svn/reports/get-locks.lo subversion/mod_dav_svn/reports/log.lo subversion/mod_dav_svn/reports/mergeinfo.lo subversion/mod_dav_svn/reports/replay.lo subversion/mod_dav_svn/reports/update.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la mod_dav_svn_OBJECTS = activity.lo authz.lo deadprops.lo liveprops.lo lock.lo merge.lo mirror.lo mod_dav_svn.lo reports/dated-rev.lo reports/file-revs.lo reports/get-location-segments.lo reports/get-locations.lo reports/get-locks.lo reports/log.lo reports/mergeinfo.lo reports/replay.lo reports/update.lo repos.lo util.lo version.lo subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS) - cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) + cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(LT_NO_UNDEFINED) $(mod_dav_svn_OBJECTS) ../../subversion/libsvn_repos/libsvn_repos-1.la ../../subversion/libsvn_fs/libsvn_fs-1.la ../../subversion/libsvn_fs_base/libsvn_fs_base-1.la ../../subversion/libsvn_fs_fs/libsvn_fs_fs-1.la ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS) opt_test_PATH = subversion/tests/libsvn_subr opt_test_DEPS = subversion/tests/libsvn_subr/opt-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la Index: configure --- configure.orig 2008-03-13 08:00:53 +0100 +++ configure 2008-04-03 09:53:06 +0200 @@@@ -4958,6 +4958,11 @@@@ ac_sub_cache_file="$ac_dots$cache_file" ;; esac + args="$args --prefix=$prefix/libexec/subversion/neon" + if [ ".$with_ssl" = .yes ]; then + args="$args --with-ssl" + fi + # The eval makes quoting arguments work. if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $args then : Index: subversion/bindings/swig/perl/native/Makefile.PL.in --- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2007-10-22 09:00:25 +0200 +++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-04-03 09:54:42 +0200 @@@@ -23,17 +23,13 @@@@ ra_dav fs_base fs_fs/)); -my @@ldmodules = map {"-lsvn_$_-1"} (@@modules, qw/diff subr/); +my @@ldmodules = map {"-lsvn_$_-1"} (@@modules, qw/diff subr delta ra_dav subr ra_local ra_svn fs_base fs_fs/); my $apr_shlib_path_var = '@@SVN_APR_SHLIB_PATH_VAR@@'; my $cppflags = '@@CPPFLAGS@@'; my $apr_cflags = '@@SVN_APR_INCLUDES@@'; my $apu_cflags = '@@SVN_APRUTIL_INCLUDES@@'; - -# According to the log of r7937, the flags guarded by the conditional break -# the build on FreeBSD if not conditionalized. -my $apr_ldflags = '@@SVN_APR_EXPORT_LIBS@@' - if $^O eq 'darwin' or $^O eq 'cygwin'; +my $apr_ldflags = '@@SVN_APRUTIL_EXPORT_LIBS@@ @@SVN_APR_EXPORT_LIBS@@ -liconv -lz '.`neon-config --libs`.' -lssl -lcrypto -lxml2'; chomp $apr_shlib_path_var; @@@@ -46,9 +42,9 @@@@ " -I$svnlib_builddir", " -I$swig_srcdir -g"), OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, + LIBS => [join(' ', "-L@@l_prefix@@/lib", (map {$_ = abs_path($_); "-L$_"} @@ldpaths), - @@ldmodules, '-lsvn_swig_perl-1', + '-lsvn_swig_perl-1', @@ldmodules, @@ldmodules, @@ldmodules, @@ldmodules, $apr_ldflags, `$swig -perl -ldflags`)], test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } ); @ 1.1 log @new package: subversion15 1.5.0b1 (Source Revision Control System) @ text @@