ports/87432: [PORT UPDATE] devel/monotone 0.23

[Lapo Luchini]

>Number:         87432
>Category:       ports
>Synopsis:       [PORT UPDATE] devel/monotone 0.23
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 10:30:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Lapo Luchini
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD cyberx.home.lapo.it 5.4-STABLE FreeBSD 5.4-STABLE #49: Tue Apr 12 19:26:08 CEST 2005 root at cyberx.home.lapo.it:/usr/obj/usr/src/sys/CYBERX i386


	
>Description:

New upstream release.
- patch to monotone.cc is the same but applied in a different context
- sanity.hh seems not to depend on gettext() anymore

>How-To-Repeat:
>Fix:

--- monotone-0.23.diff begins here ---
diff -ruN monotone/Makefile monotone-0.23/Makefile
--- monotone/Makefile	Wed Sep 14 22:58:05 2005
+++ monotone-0.23/Makefile	Fri Oct 14 11:26:47 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monotone
-PORTVERSION=	0.22
+PORTVERSION=	0.23
 CATEGORIES=	devel
 MASTER_SITES=	http://www.venge.net/monotone/downloads/ \
 		http://norton.kettering.edu/freebsd/
diff -ruN monotone/distinfo monotone-0.23/distinfo
--- monotone/distinfo	Wed Sep 14 22:58:05 2005
+++ monotone-0.23/distinfo	Fri Oct 14 11:26:51 2005
@@ -1,2 +1,2 @@
-MD5 (monotone-0.22.tar.gz) = ee0f25577b8a640df3015113e67bb718
-SIZE (monotone-0.22.tar.gz) = 5038069
+MD5 (monotone-0.23.tar.gz) = 6d9e909480c2be0b23e2820c3a42e6f1
+SIZE (monotone-0.23.tar.gz) = 5300093
diff -ruN monotone/files/patch-monotone.cc monotone-0.23/files/patch-monotone.cc
--- monotone/files/patch-monotone.cc	Sat Feb 12 22:11:43 2005
+++ monotone-0.23/files/patch-monotone.cc	Fri Oct 14 11:32:08 2005
@@ -1,13 +1,13 @@
---- monotone.cc.orig	Fri Dec 31 03:16:53 2004
-+++ monotone.cc	Wed Jan 26 22:20:17 2005
-@@ -140,8 +140,10 @@
+--- 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_CTYPE, "");
-   setlocale(LC_MESSAGES, "");
+   setlocale(LC_ALL, "");
 +#ifdef ENABLE_NLS
    bindtextdomain(PACKAGE, LOCALEDIR);
    textdomain(PACKAGE);
 +#endif
  
-   L(F("set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n")
-     % (setlocale(LC_CTYPE, NULL) == NULL ? "n/a" : setlocale(LC_CTYPE, NULL))
+ 
+   // we want to catch any early informative_failures due to charset
diff -ruN monotone/files/patch-sanity.hh monotone-0.23/files/patch-sanity.hh
--- monotone/files/patch-sanity.hh	Sat Feb 12 22:11:43 2005
+++ monotone-0.23/files/patch-sanity.hh	Thu Jan  1 01:00:00 1970
@@ -1,15 +0,0 @@
---- 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__)
--- monotone-0.23.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: