Attachment #57974 for bug #87432

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

Lines 6-12 Link Here

(-)monotone-0.23/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= monotone	8	PORTNAME= monotone
9	PORTVERSION= 0.22	9	PORTVERSION= 0.23
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.venge.net/monotone/downloads/ \	11	MASTER_SITES= http://www.venge.net/monotone/downloads/ \
12	http://norton.kettering.edu/freebsd/	12	http://norton.kettering.edu/freebsd/

Lines 1-2 Link Here

(-)monotone-0.23/distinfo (-2 / +2 lines)
1	MD5 (monotone-0.22.tar.gz) = ee0f25577b8a640df3015113e67bb718	1	MD5 (monotone-0.23.tar.gz) = 6d9e909480c2be0b23e2820c3a42e6f1
2	SIZE (monotone-0.22.tar.gz) = 5038069	2	SIZE (monotone-0.23.tar.gz) = 5300093




--- monotone.cc.orig    Fri Sep 30 11:50:05 2005
+++ monotone.cc Fri Oct 14 11:31:14 2005
@@ -238,8 +238,10 @@
   // go-go gadget i18n
 
   setlocale(LC_ALL, "");
   setlocale(LC_MESSAGES, "");
+#ifdef ENABLE_NLS
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
+#endif
 
 
   // we want to catch any early informative_failures due to charset




--- sanity.hh.orig	Fri Dec 31 03:16:54 2004
+++ sanity.hh	Wed Jan 26 22:20:17 2005
@@ -64,7 +64,12 @@
 extern sanity global_sanity;
 
 // F is for when you want to build a boost formatter
+#ifdef ENABLE_NLS
 #define F(str) boost::format(gettext(str))
+#else
+#define F(str) boost::format((str))
+#endif
+
 
 // L is for logging, you can log all you want
 #define L(fmt) global_sanity.log(fmt, __FILE__, __LINE__)

Return to bug 87432

Lines 1-13 Link Here

(-)monotone-0.23/files/patch-monotone.cc (-7 / +7 lines)
1	--- monotone.cc.orig Fri Dec 31 03:16:53 2004	1	--- monotone.cc.orig Fri Sep 30 11:50:05 2005
2	+++ monotone.cc Wed Jan 26 22:20:17 2005	2	+++ monotone.cc Fri Oct 14 11:31:14 2005
3	@@ -140,8 +140,10 @@	3	@@ -238,8 +238,10 @@
		4	// go-go gadget i18n
4		5
5	setlocale(LC_CTYPE, "");	6	setlocale(LC_ALL, "");
6	setlocale(LC_MESSAGES, "");
7	+#ifdef ENABLE_NLS	7	+#ifdef ENABLE_NLS
8	bindtextdomain(PACKAGE, LOCALEDIR);	8	bindtextdomain(PACKAGE, LOCALEDIR);
9	textdomain(PACKAGE);	9	textdomain(PACKAGE);
10	+#endif	10	+#endif
11		11
12	L(F("set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n")	12
13	% (setlocale(LC_CTYPE, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL))	13	// we want to catch any early informative_failures due to charset

Lines 1-15 Link Here

(-)monotone-0.23/files/patch-sanity.hh (-15 lines)
1	--- sanity.hh.orig Fri Dec 31 03:16:54 2004
2	+++ sanity.hh Wed Jan 26 22:20:17 2005
3	@@ -64,7 +64,12 @@
4	extern sanity global_sanity;
5
6	// F is for when you want to build a boost formatter
7	+#ifdef ENABLE_NLS
8	#define F(str) boost::format(gettext(str))
9	+#else
10	+#define F(str) boost::format((str))
11	+#endif
12	+
13
14	// L is for logging, you can log all you want
15	#define L(fmt) global_sanity.log(fmt, __FILE__, __LINE__)