Attachment 87882 Details for Bug 124581 – file.diff

[patch] file.diff

file.diff (text/plain), 7.53 KB, created by tkato432 on 2008-06-14 19:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2008-06-14 19:10:01 UTC

Size: 7.53 KB

patch

obsolete

>diff -urN /usr/ports/archivers/rvm/Makefile archivers/rvm/Makefile
>--- /usr/ports/archivers/rvm/Makefile	2008-06-07 00:18:23.000000000 +0900
>+++ archivers/rvm/Makefile	2008-06-10 21:40:43.000000000 +0900
>@@ -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 -urN /usr/ports/archivers/rvm/distinfo archivers/rvm/distinfo
>--- /usr/ports/archivers/rvm/distinfo	2006-12-06 17:52:18.000000000 +0900
>+++ archivers/rvm/distinfo	2008-06-10 21:42:43.000000000 +0900
>@@ -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 -urN /usr/ports/archivers/rvm/files/patch-configure archivers/rvm/files/patch-configure
>--- /usr/ports/archivers/rvm/files/patch-configure	2006-01-30 08:20:45.000000000 +0900
>+++ archivers/rvm/files/patch-configure	2008-06-10 21:44:47.000000000 +0900
>@@ -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 -urN /usr/ports/archivers/rvm/files/patch-estring.h archivers/rvm/files/patch-estring.h
>--- /usr/ports/archivers/rvm/files/patch-estring.h	2007-07-14 19:43:13.000000000 +0900
>+++ archivers/rvm/files/patch-estring.h	1970-01-01 09:00:00.000000000 +0900
>@@ -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 <class T>
>--	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 <class T>
>--	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 <class T>
>--	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 <class T>
>--	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 <class T>
>--	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 -urN /usr/ports/archivers/rvm/files/patch-rconfig.h archivers/rvm/files/patch-rconfig.h
>--- /usr/ports/archivers/rvm/files/patch-rconfig.h	2007-07-15 02:59:07.000000000 +0900
>+++ archivers/rvm/files/patch-rconfig.h	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/archivers/rvm/files/patch-table.h archivers/rvm/files/patch-table.h
>--- /usr/ports/archivers/rvm/files/patch-table.h	2007-07-14 19:43:13.000000000 +0900
>+++ archivers/rvm/files/patch-table.h	1970-01-01 09:00:00.000000000 +0900
>@@ -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;

Actions: View | Diff

Attachments on bug 124581: 87882