Attachment #87882 for bug #124581

View | Details | Raw Unified | Return to bug 124581
Collapse All | Expand All




#

PORTNAME=	rvm
PORTVERSION=	1.02
PORTREVISION=	1
CATEGORIES=	archivers
MASTER_SITES=	SF
DISTNAME=	${PORTNAME}_${PORTVERSION}
DISTNAME=	rvm_${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	An archive manager that uses rsync to manage backups

Lines 1-3 Link Here

(-)archivers/rvm/distinfo (-3 / +3 lines)
1	MD5 (rvm_1.01.tar.gz) = af8330e0819329b09a527c2f177d0164	1	MD5 (rvm_1.02.tar.gz) = 7fadc784416c80438530d560dadbdecd
2	SHA256 (rvm_1.01.tar.gz) = 5cde986f6d4c3690aaa8d1701df55b3711610f747775db5ccf684f3cf16e181e	2	SHA256 (rvm_1.02.tar.gz) = dfa6aa08487b0d361d2044c01da2d34ade007b8da20985ec27a93f72a188cbed
3	SIZE (rvm_1.01.tar.gz) = 234247	3	SIZE (rvm_1.02.tar.gz) = 285832




--- 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; }
-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; }
-else
-	if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling

-
-_ACEOF
-rm -f conftest$ac_exeext
-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'
-  { (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; }
-		ac_cv_cxx_exception_on_failed_alloc=yes
-
-else

-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ 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 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
-
-else
-	{ echo "$as_me:$LINENO: WARNING:

-
-	" >&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




--- ./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




--- ./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);




--- ./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;

Return to bug 124581

Lines 7-18 Link Here

(-)archivers/rvm/Makefile (-5 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= rvm	9	PORTNAME= rvm
10	PORTVERSION= 1.01	10	PORTVERSION= 1.02
11	PORTREVISION= 1
12	CATEGORIES= archivers	11	CATEGORIES= archivers
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= SF
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	DISTNAME= ${PORTNAME}_${PORTVERSION}
15	DISTNAME= rvm_${PORTVERSION}
16		14
17	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
18	COMMENT= An archive manager that uses rsync to manage backups	16	COMMENT= An archive manager that uses rsync to manage backups

Lines 1-16 Link Here

(-)archivers/rvm/files/patch-configure (-20 / +32 lines)
1	--- configure.orig Mon Nov 14 19:34:54 2005	1	--- configure.orig 2008-02-15 22:53:06.000000000 +0900
2	+++ configure Sun Jan 29 16:34:06 2006	2	+++ configure 2008-06-10 21:44:37.000000000 +0900
3	@@ -8613,104 +8613,9 @@	3	@@ -9502,116 +9502,6 @@
4		4
5	fi	5	fi
6		6
7	-	7	-
8	-	8	-
9	-echo "$as_me:$LINENO: checking if the stl throws an exception at memory allocation failure" >&5	9	-{ echo "$as_me:$LINENO: checking if the stl throws an exception at memory allocation failure" >&5
10	-echo $ECHO_N "checking if the stl throws an exception at memory allocation failure... $ECHO_C" >&6	10	-echo $ECHO_N "checking if the stl throws an exception at memory allocation failure... $ECHO_C" >&6; }
11	-if test "${ac_cv_cxx_exception_on_failed_alloc+set}" = set; then	11	-if test "${ac_cv_cxx_exception_on_failed_alloc+set}" = set; then
12	- echo "$as_me:$LINENO: result: (cached) $ac_cv_cxx_exception_on_failed_alloc" >&5	12	- { echo "$as_me:$LINENO: result: (cached) $ac_cv_cxx_exception_on_failed_alloc" >&5
13	-echo "${ECHO_T}(cached) $ac_cv_cxx_exception_on_failed_alloc" >&6	13	-echo "${ECHO_T}(cached) $ac_cv_cxx_exception_on_failed_alloc" >&6; }
14	-else	14	-else
15	- if test "$cross_compiling" = yes; then	15	- if test "$cross_compiling" = yes; then
16	- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling	16	- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
Lines 46-63 Link Here
46	-	46	-
47	-_ACEOF	47	-_ACEOF
48	-rm -f conftest$ac_exeext	48	-rm -f conftest$ac_exeext
49	-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5	49	-if { (ac_try="$ac_link"
50	- (eval $ac_link) 2>&5	50	-case "(($ac_try" in
		51	- \" \| \` \| \\) ac_try_echo=\$ac_try;;
		52	- *) ac_try_echo=$ac_try;;
		53	-esac
		54	-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
		55	- (eval "$ac_link") 2>&5
51	- ac_status=$?	56	- ac_status=$?
52	- echo "$as_me:$LINENO: \$? = $ac_status" >&5	57	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
53	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'	58	- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
54	- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	59	- { (case "(($ac_try" in
55	- (eval $ac_try) 2>&5	60	- \" \| \` \| \\) ac_try_echo=\$ac_try;;
		61	- *) ac_try_echo=$ac_try;;
		62	-esac
		63	-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
		64	- (eval "$ac_try") 2>&5
56	- ac_status=$?	65	- ac_status=$?
57	- echo "$as_me:$LINENO: \$? = $ac_status" >&5	66	- echo "$as_me:$LINENO: \$? = $ac_status" >&5
58	- (exit $ac_status); }; }; then	67	- (exit $ac_status); }; }; then
59	- echo "$as_me:$LINENO: result: yes" >&5	68	- { echo "$as_me:$LINENO: result: yes" >&5
60	-echo "${ECHO_T}yes" >&6	69	-echo "${ECHO_T}yes" >&6; }
61	- ac_cv_cxx_exception_on_failed_alloc=yes	70	- ac_cv_cxx_exception_on_failed_alloc=yes
62	-	71	-
63	-else	72	-else
Lines 66-84 Link Here
66	-sed 's/^/\| /' conftest.$ac_ext >&5	75	-sed 's/^/\| /' conftest.$ac_ext >&5
67	-	76	-
68	-( exit $ac_status )	77	-( exit $ac_status )
69	-echo "$as_me:$LINENO: result: no" >&5	78	-{ echo "$as_me:$LINENO: result: no" >&5
70	-echo "${ECHO_T}no" >&6	79	-echo "${ECHO_T}no" >&6; }
71	- ac_cv_cxx_exception_on_failed_alloc=no	80	- ac_cv_cxx_exception_on_failed_alloc=no
72	-	81	-
73	-fi	82	-fi
74	-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext	83	-rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
75	-fi	84	-fi
		85	-
		86	-
76	-fi	87	-fi
77	-if test $ac_cv_cxx_exception_on_failed_alloc = yes; then	88	-if test $ac_cv_cxx_exception_on_failed_alloc = yes; then
78	-	89	-
79	cat >>confdefs.h <<\_ACEOF	90	-cat >>confdefs.h <<\_ACEOF
80	#define HAVE_EXCEPTION_ON_ALLOC_FAILURE 1	91	-#define HAVE_EXCEPTION_ON_ALLOC_FAILURE 1
81	_ACEOF	92	-_ACEOF
82	-	93	-
83	-else	94	-else
84	- { echo "$as_me:$LINENO: WARNING:	95	- { echo "$as_me:$LINENO: WARNING:
Lines 102-107 Link Here
102	-	113	-
103	- " >&2;}	114	- " >&2;}
104	-fi	115	-fi
105		116	-
106	# Extract the first word of "rsync", so it can be a program name with args.	117	# Extract the first word of "rsync", so it can be a program name with args.
107	set dummy rsync; ac_word=$2	118	set dummy rsync; ac_word=$2
		119	{ echo "$as_me:$LINENO: checking for $ac_word" >&5

Lines 1-29 Link Here

(-)archivers/rvm/files/patch-estring.h (-29 lines)
1	--- ./estring.h.orig 2007-07-14 11:31:16.000000000 +0200
2	+++ ./estring.h 2007-07-14 11:35:07.000000000 +0200
3	@@ -255,21 +255,21 @@
4	estring_value m_value;
5
6	template <class T>
7	- void estring::T_fraction_to_strings(const T& a_t,
8	+ void T_fraction_to_strings(const T& a_t,
9	value_type& a_ws, value_type& a_fs);
10
11	template <class T>
12	- void estring::T_integral_to_string(const T& a_t, value_type& a_str);
13	+ void T_integral_to_string(const T& a_t, value_type& a_str);
14
15	template <class T>
16	- void estring::T_string_to_integral(const value_type& a_str, T& a_t) const;
17	+ void T_string_to_integral(const value_type& a_str, T& a_t) const;
18
19	template <class T>
20	- void estring::T_string_to_signed_integral(const value_type& a_str, T& a_t)
21	+ void T_string_to_signed_integral(const value_type& a_str, T& a_t)
22	const;
23
24	template <class T>
25	- void estring::T_string_to_fractional(const value_type& a_str, T& a_t) const;
26	+ void T_string_to_fractional(const value_type& a_str, T& a_t) const;
27	};
28
29	#endif

Lines 1-20 Link Here

(-)archivers/rvm/files/patch-rconfig.h (-20 lines)
1	--- ./rconfig.h.orig 2006-06-23 17:27:50.000000000 +0200
2	+++ ./rconfig.h 2007-07-14 11:38:49.000000000 +0200
3	@@ -266,7 +266,7 @@
4	action_type m_action;
5	bool m_default;
6	class timestamp m_timestamp;
7	- class cfgfiles_type m_cfgfiles;
8	+ cfgfiles_type m_cfgfiles;
9	std::string m_link_catalog_dir;
10	std::string m_log_dir;
11	std::string m_rsync_local_path;
12	@@ -366,7 +366,7 @@
13	bool m_default_context;
14
15	const std::string location(void);
16	- void job_parser::read_job(const std::string& a_path);
17	+ void read_job(const std::string& a_path);
18
19	void parse(void);
20	void parse_archive_path(const std::string& a_value);

Lines 1-17 Link Here

(-)archivers/rvm/files/patch-table.h (-17 lines)
1	--- ./table.h.orig 2007-07-14 11:43:40.000000000 +0200
2	+++ ./table.h 2007-07-14 11:43:59.000000000 +0200
3	@@ -121,10 +121,10 @@
4	const table& a_class
5	);
6
7	- size_type table::col_width(const size_type a_x) const;
8	- size_type table::row_width(void) const;
9	- size_type table::col_height(void) const;
10	- size_type table::row_height(const size_type a_y) const;
11	+ size_type col_width(const size_type a_x) const;
12	+ size_type row_width(void) const;
13	+ size_type col_height(void) const;
14	+ size_type row_height(const size_type a_y) const;
15
16	virtual size_type height(void) const;
17	virtual size_type width(void) const;