From 83a2defac79273ee3d201d0cb73d307e15197daa Mon Sep 17 00:00:00 2001 From: Li-Wen Hsu Date: Sat, 14 Jun 2008 20:21:01 +0000 Subject: - Update to version 1.02 PR: ports/124581 Submitted by: KATO Tsuguru --- archivers/rvm/Makefile | 8 +++--- archivers/rvm/distinfo | 6 ++--- archivers/rvm/files/patch-configure | 52 +++++++++++++++++++++++-------------- archivers/rvm/files/patch-estring.h | 29 --------------------- archivers/rvm/files/patch-rconfig.h | 20 -------------- archivers/rvm/files/patch-table.h | 17 ------------ 6 files changed, 38 insertions(+), 94 deletions(-) delete mode 100644 archivers/rvm/files/patch-estring.h delete mode 100644 archivers/rvm/files/patch-rconfig.h delete mode 100644 archivers/rvm/files/patch-table.h (limited to 'archivers/rvm') diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile index 92f31ae0c44c..ff23fe649892 100644 --- a/archivers/rvm/Makefile +++ b/archivers/rvm/Makefile @@ -7,12 +7,10 @@ # PORTNAME= rvm -PORTVERSION= 1.01 -PORTREVISION= 1 +PORTVERSION= 1.02 CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= rvm_${PORTVERSION} +MASTER_SITES= SF +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= An archive manager that uses rsync to manage backups diff --git a/archivers/rvm/distinfo b/archivers/rvm/distinfo index 77bc72e603b3..dbd5fef36f81 100644 --- a/archivers/rvm/distinfo +++ b/archivers/rvm/distinfo @@ -1,3 +1,3 @@ -MD5 (rvm_1.01.tar.gz) = af8330e0819329b09a527c2f177d0164 -SHA256 (rvm_1.01.tar.gz) = 5cde986f6d4c3690aaa8d1701df55b3711610f747775db5ccf684f3cf16e181e -SIZE (rvm_1.01.tar.gz) = 234247 +MD5 (rvm_1.02.tar.gz) = 7fadc784416c80438530d560dadbdecd +SHA256 (rvm_1.02.tar.gz) = dfa6aa08487b0d361d2044c01da2d34ade007b8da20985ec27a93f72a188cbed +SIZE (rvm_1.02.tar.gz) = 285832 diff --git a/archivers/rvm/files/patch-configure b/archivers/rvm/files/patch-configure index 0ded3b7ee30f..01ed9b5b6909 100644 --- a/archivers/rvm/files/patch-configure +++ b/archivers/rvm/files/patch-configure @@ -1,16 +1,16 @@ ---- configure.orig Mon Nov 14 19:34:54 2005 -+++ configure Sun Jan 29 16:34:06 2006 -@@ -8613,104 +8613,9 @@ +--- configure.orig 2008-02-15 22:53:06.000000000 +0900 ++++ configure 2008-06-10 21:44:37.000000000 +0900 +@@ -9502,116 +9502,6 @@ fi - - --echo "$as_me:$LINENO: checking if the stl throws an exception at memory allocation failure" >&5 --echo $ECHO_N "checking if the stl throws an exception at memory allocation failure... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking if the stl throws an exception at memory allocation failure" >&5 +-echo $ECHO_N "checking if the stl throws an exception at memory allocation failure... $ECHO_C" >&6; } -if test "${ac_cv_cxx_exception_on_failed_alloc+set}" = set; then -- echo "$as_me:$LINENO: result: (cached) $ac_cv_cxx_exception_on_failed_alloc" >&5 --echo "${ECHO_T}(cached) $ac_cv_cxx_exception_on_failed_alloc" >&6 +- { echo "$as_me:$LINENO: result: (cached) $ac_cv_cxx_exception_on_failed_alloc" >&5 +-echo "${ECHO_T}(cached) $ac_cv_cxx_exception_on_failed_alloc" >&6; } -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling @@ -46,18 +46,27 @@ - -_ACEOF -rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } - ac_cv_cxx_exception_on_failed_alloc=yes - -else @@ -66,19 +75,21 @@ -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) --echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 +-{ echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } - ac_cv_cxx_exception_on_failed_alloc=no - -fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +- +- -fi -if test $ac_cv_cxx_exception_on_failed_alloc = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_EXCEPTION_ON_ALLOC_FAILURE 1 - _ACEOF +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_EXCEPTION_ON_ALLOC_FAILURE 1 +-_ACEOF - -else - { echo "$as_me:$LINENO: WARNING: @@ -102,6 +113,7 @@ - - " >&2;} -fi - +- # Extract the first word of "rsync", so it can be a program name with args. set dummy rsync; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 diff --git a/archivers/rvm/files/patch-estring.h b/archivers/rvm/files/patch-estring.h deleted file mode 100644 index 78437860dceb..000000000000 --- a/archivers/rvm/files/patch-estring.h +++ /dev/null @@ -1,29 +0,0 @@ ---- ./estring.h.orig 2007-07-14 11:31:16.000000000 +0200 -+++ ./estring.h 2007-07-14 11:35:07.000000000 +0200 -@@ -255,21 +255,21 @@ - estring_value m_value; - - template -- void estring::T_fraction_to_strings(const T& a_t, -+ void T_fraction_to_strings(const T& a_t, - value_type& a_ws, value_type& a_fs); - - template -- void estring::T_integral_to_string(const T& a_t, value_type& a_str); -+ void T_integral_to_string(const T& a_t, value_type& a_str); - - template -- void estring::T_string_to_integral(const value_type& a_str, T& a_t) const; -+ void T_string_to_integral(const value_type& a_str, T& a_t) const; - - template -- void estring::T_string_to_signed_integral(const value_type& a_str, T& a_t) -+ void T_string_to_signed_integral(const value_type& a_str, T& a_t) - const; - - template -- void estring::T_string_to_fractional(const value_type& a_str, T& a_t) const; -+ void T_string_to_fractional(const value_type& a_str, T& a_t) const; - }; - - #endif diff --git a/archivers/rvm/files/patch-rconfig.h b/archivers/rvm/files/patch-rconfig.h deleted file mode 100644 index eb2847dd2f6f..000000000000 --- a/archivers/rvm/files/patch-rconfig.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ./rconfig.h.orig 2006-06-23 17:27:50.000000000 +0200 -+++ ./rconfig.h 2007-07-14 11:38:49.000000000 +0200 -@@ -266,7 +266,7 @@ - action_type m_action; - bool m_default; - class timestamp m_timestamp; -- class cfgfiles_type m_cfgfiles; -+ cfgfiles_type m_cfgfiles; - std::string m_link_catalog_dir; - std::string m_log_dir; - std::string m_rsync_local_path; -@@ -366,7 +366,7 @@ - bool m_default_context; - - const std::string location(void); -- void job_parser::read_job(const std::string& a_path); -+ void read_job(const std::string& a_path); - - void parse(void); - void parse_archive_path(const std::string& a_value); diff --git a/archivers/rvm/files/patch-table.h b/archivers/rvm/files/patch-table.h deleted file mode 100644 index 64e34f5ec771..000000000000 --- a/archivers/rvm/files/patch-table.h +++ /dev/null @@ -1,17 +0,0 @@ ---- ./table.h.orig 2007-07-14 11:43:40.000000000 +0200 -+++ ./table.h 2007-07-14 11:43:59.000000000 +0200 -@@ -121,10 +121,10 @@ - const table& a_class - ); - -- size_type table::col_width(const size_type a_x) const; -- size_type table::row_width(void) const; -- size_type table::col_height(void) const; -- size_type table::row_height(const size_type a_y) const; -+ size_type col_width(const size_type a_x) const; -+ size_type row_width(void) const; -+ size_type col_height(void) const; -+ size_type row_height(const size_type a_y) const; - - virtual size_type height(void) const; - virtual size_type width(void) const; -- cgit v1.2.3