From lapo@cyberx.home.lapo.it  Wed Apr 12 14:57:50 2006
Return-Path: <lapo@cyberx.home.lapo.it>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 54B9216A405
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 14:57:50 +0000 (UTC)
	(envelope-from lapo@cyberx.home.lapo.it)
Received: from cyberx.home.lapo.it (host71-40.pool8174.interbusiness.it [81.74.40.71])
	by mx1.FreeBSD.org (Postfix) with SMTP id 00FB643D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 14:57:48 +0000 (GMT)
	(envelope-from lapo@cyberx.home.lapo.it)
Received: (qmail 91708 invoked by uid 1001); 12 Apr 2006 14:57:47 -0000
Message-Id: <20060412145747.91707.qmail@cyberx.home.lapo.it>
Date: 12 Apr 2006 14:57:47 -0000
From: Lapo Luchini <lapo@lapo.it>
Reply-To: Lapo Luchini <lapo@lapo.it>
To: FreeBSD-gnats-submit@freebsd.org
Cc: <lapo.luchini@gmail.com>, <ale@FreeBSD.org>
Subject: devel/monotone: upgrade to 0.26
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95656
>Category:       ports
>Synopsis:       devel/monotone: upgrade to 0.26
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jmelo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 12 15:00:28 GMT 2006
>Closed-Date:    Mon Apr 24 14:16:37 GMT 2006
>Last-Modified:  Mon Apr 24 14:16:37 GMT 2006
>Originator:     Lapo Luchini
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD cyberx.home.lapo.it 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #56: Sat Mar 4 20:54:41 CET 2006 root@cyberx.home.lapo.it:/usr/obj/usr/src/sys/CYBERX i386

Upgrade 'devel/monotone' port to release 0.26.
This is a major release with many changes, so an entry in ports/UPDATING
should be probably added:

20060412:
  AFFECTS: users of devel/monotone
  AUTHOR: lapo@lapo.it

  Version 0.26 of monotone has many differences with past versions, there are
  changes in executable name, in repository and workspace format and also
  in the 'netsync' network protocol.
  A centralized "flagday" migration is needed in order to change format.
  Refer to /usr/local/share/doc/monotone/UPGRADE for migration instructions.

--- monotone-0.26.diff begins here ---
diff -ruN monotone.orig/Makefile monotone/Makefile
--- monotone.orig/Makefile	Sat Dec 31 17:40:34 2005
+++ monotone/Makefile	Wed Apr 12 10:01:49 2006
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	monotone
-PORTVERSION=	0.25
+PORTVERSION=	0.26
 CATEGORIES=	devel
-MASTER_SITES=	http://www.venge.net/monotone/downloads/ \
-		http://norton.kettering.edu/freebsd/
+MASTER_SITES=	http://www.venge.net/monotone/downloads/
 
 MAINTAINER=	lapo@lapo.it
 COMMENT=	A distributed version control system with digital signatures
@@ -26,10 +25,10 @@
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		MAKEINFO="makeinfo --no-split"
 
-PLIST_FILES=	bin/monotone
+PLIST_FILES=	bin/mtn
 INFO=		monotone
-MAN1=		monotone.1
-PORTDOCS=	NEWS UPGRADE
+MAN1=		mtn.1
+PORTDOCS=	NEWS UPGRADE monotone.html
 
 .include <bsd.port.pre.mk>
 
@@ -41,9 +40,12 @@
 CONFIGURE_ARGS+=	--disable-nls
 .else
 USE_GETTEXT=	yes
-PLIST_FILES+=	share/locale/fr/LC_MESSAGES/monotone.mo \
+PLIST_FILES+=	share/locale/de/LC_MESSAGES/monotone.mo \
+		share/locale/fr/LC_MESSAGES/monotone.mo \
+		share/locale/it/LC_MESSAGES/monotone.mo \
 		share/locale/ja/LC_MESSAGES/monotone.mo \
-		share/locale/pt_BR/LC_MESSAGES/monotone.mo
+		share/locale/pt_BR/LC_MESSAGES/monotone.mo \
+		share/locale/sv/LC_MESSAGES/monotone.mo
 .endif
 
 post-extract:
diff -ruN monotone.orig/distinfo monotone/distinfo
--- monotone.orig/distinfo	Sat Dec 31 17:40:34 2005
+++ monotone/distinfo	Tue Apr 11 10:42:53 2006
@@ -1,3 +1,3 @@
-MD5 (monotone-0.25.tar.gz) = fb0ad449cd0093854c55dbd5c6fc07e2
-SHA256 (monotone-0.25.tar.gz) = 6d579179d6b7a2d97291c8d60f3cfd001c93281495716209db34dc854d2f48e3
-SIZE (monotone-0.25.tar.gz) = 5415426
+MD5 (monotone-0.26.tar.gz) = 21b902d1b48ffb868536d04c4ad38155
+SHA256 (monotone-0.26.tar.gz) = 4ced85ad82f7f74bc75f08d93009fa2f25b7516f11e78ece1f775a3db433054a
+SIZE (monotone-0.26.tar.gz) = 5630955
diff -ruN monotone.orig/files/patch-Makefile.in monotone/files/patch-Makefile.in
--- monotone.orig/files/patch-Makefile.in	Sat Feb 12 22:11:43 2005
+++ monotone/files/patch-Makefile.in	Tue Apr 11 15:12:36 2006
@@ -1,15 +1,15 @@
---- Makefile.in.orig	Fri Dec 31 03:17:42 2004
-+++ Makefile.in	Wed Jan 26 22:20:17 2005
-@@ -1153,10 +1153,10 @@
+--- Makefile.in.orig	Sun Apr  9 04:46:33 2006
++++ Makefile.in	Tue Apr 11 15:12:05 2006
+@@ -1824,10 +1824,10 @@
  	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
- monotone$(EXEEXT): $(monotone_OBJECTS) $(monotone_DEPENDENCIES) 
- 	@rm -f monotone$(EXEEXT)
--	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS)
-+	$(CXXLINK) $(monotone_LDFLAGS) $(monotone_OBJECTS) $(monotone_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV)
+ mtn$(EXEEXT): $(mtn_OBJECTS) $(mtn_DEPENDENCIES) 
+ 	@rm -f mtn$(EXEEXT)
+-	$(CXXLINK) $(mtn_LDFLAGS) $(mtn_OBJECTS) $(mtn_LDADD) $(LIBS)
++	$(CXXLINK) $(mtn_LDFLAGS) $(mtn_OBJECTS) $(mtn_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV)
  unit_tests$(EXEEXT): $(unit_tests_OBJECTS) $(unit_tests_DEPENDENCIES) 
  	@rm -f unit_tests$(EXEEXT)
 -	$(CXXLINK) $(unit_tests_LDFLAGS) $(unit_tests_OBJECTS) $(unit_tests_LDADD) $(LIBS)
 +	$(CXXLINK) $(unit_tests_LDFLAGS) $(unit_tests_OBJECTS) $(unit_tests_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
+ contrib/$(am__dirstamp):
+ 	@$(mkdir_p) contrib
+ 	@: > contrib/$(am__dirstamp)
--- monotone-0.26.diff ends here ---
>Description:
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmelo 
Responsible-Changed-By: jmelo 
Responsible-Changed-When: Thu Apr 13 01:17:45 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95656 
State-Changed-From-To: open->feedback 
State-Changed-By: jmelo 
State-Changed-When: Thu Apr 13 15:56:11 UTC 2006 
State-Changed-Why:  
Ask for maintainer about build problems. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95656 

From: Jean Milanez Melo <jmelo@FreeBSD.org>
To: bug-followup@FreeBSD.org,  lapo@lapo.it
Cc:  
Subject: Re: ports/95656: devel/monotone: upgrade to 0.26
Date: Thu, 13 Apr 2006 12:59:15 -0300

 Dear maintainer,
 
 There are build errors on your update patch. Could you take a look and 
 fix it?
 
 Tinderbox build logs:
 http://main.bh.freebsdbrasil.com.br:9090/tb/errors/5.5-FreeBSD/monotone-0.26.log
 http://main.bh.freebsdbrasil.com.br:9090/tb/errors/6.1-FreeBSD/monotone-0.26.log
 
 Thanks.
 
 -- Jean

From: Lapo Luchini <lapo.luchini@gmail.com>
To: Jean Milanez Melo <jmelo@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95656: devel/monotone: upgrade to 0.26
Date: Fri, 14 Apr 2006 10:26:55 +0200

 Unfortunately that website seems to be down right now or, at least,
 inaccessible from Italy.
 
 Could you please send the log to me in private e-mail?
 
 Else I fear I can't do nothing: I falied to reproduce it, as on the
 three -STABLE box I tried it on I had no build errors... (two are i386,
 one amd64)
 
     Lapo

From: Lapo Luchini <lapo.luchini@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/95656: devel/monotone: upgrade to 0.26
Date: Fri, 14 Apr 2006 20:22:09 +0200

 I also portinstalled it with no errors on a i386 5.4-RELEASE-p4, I'm
 really curious what the problem is on that tinderbox...

From: Jean Milanez Melo <jmelo@FreeBSD.org>
To: Lapo Luchini <lapo.luchini@gmail.com>
Cc: Jean Milanez Melo <jmelo@FreeBSD.org>,  bug-followup@FreeBSD.org
Subject: Re: ports/95656: devel/monotone: upgrade to 0.26
Date: Mon, 17 Apr 2006 15:23:20 -0300

 Lapo Luchini wrote:
 > Unfortunately that website seems to be down right now or, at least,
 > inaccessible from Italy.
 > 
 > Could you please send the log to me in private e-mail?
 > 
 > Else I fear I can't do nothing: I falied to reproduce it, as on the
 > three -STABLE box I tried it on I had no build errors... (two are i386,
 > one amd64)
 > 
 >     Lapo
 
 Hi,
 
 The machine was turned off at weekend, please try again either:
 
  
 http://main.bh.freebsdbrasil.com.br:9090/tb/errors/5.5-FreeBSD/monotone-0.26.log
 http://main.bh.freebsdbrasil.com.br:9090/tb/errors/6.1-FreeBSD/monotone-0.26.log
 
 or:
 
 http://201.17.165.158:9090/tb/errors/5.5-FreeBSD/monotone-0.26.log
 http://201.17.165.158:9090/tb/errors/6.1-FreeBSD/monotone-0.26.log
 
 
 Thanks.
 
 -- Jean

From: Lapo Luchini <lapo.luchini@gmail.com>
To: Jean Milanez Melo <jmelo@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/95656: devel/monotone: upgrade to 0.26
Date: Tue, 18 Apr 2006 11:33:34 +0200

 Ohh, I see: a build dependance on perl was missing (it is used to add a
 line to the new HTML manual).
 This itself would have led me to "convert" it to a "sed" call, but perl
 it is also needed in many tests in the test suite, so I guess this is
 the best thing to do:
 
 --- Makefile.orig       Tue Apr 18 11:25:14 2006
 +++ Makefile    Tue Apr 18 11:27:49 2006
 @@ -16,6 +16,7 @@
  LIB_DEPENDS=   boost_regex.3:${PORTSDIR}/devel/boost
  
  USE_GCC=       3.4+
 +USE_PERL5_BUILD=yes
  USE_REINPLACE= yes
  USE_ICONV=     yes
  USE_GMAKE=     yes
 
State-Changed-From-To: feedback->closed 
State-Changed-By: jmelo 
State-Changed-When: Mon Apr 24 14:16:35 UTC 2006 
State-Changed-Why:  
Committed, with minor changes. Added pkg-message to inform users about 
the update. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95656 
>Unformatted:
