From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 12 07:50:10 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2D1B16A412 for ; Sun, 12 Nov 2006 07:50:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ED1743D5D for ; Sun, 12 Nov 2006 07:50:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAC7o9u6027864 for ; Sun, 12 Nov 2006 07:50:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAC7o94b027863; Sun, 12 Nov 2006 07:50:09 GMT (envelope-from gnats) Resent-Date: Sun, 12 Nov 2006 07:50:09 GMT Resent-Message-Id: <200611120750.kAC7o94b027863@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lapo Luchini Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C6B016A412 for ; Sun, 12 Nov 2006 07:41:20 +0000 (UTC) (envelope-from lapo@mail.lapo.it) Received: from mail.lapo.it (motoko.lapo.it [88.198.0.105]) by mx1.FreeBSD.org (Postfix) with SMTP id C151D43D58 for ; Sun, 12 Nov 2006 07:41:19 +0000 (GMT) (envelope-from lapo@mail.lapo.it) Received: (qmail 5822 invoked by uid 1001); 12 Nov 2006 07:41:17 -0000 Message-Id: <20061112074117.5821.qmail@mail.lapo.it> Date: 12 Nov 2006 07:41:17 -0000 From: Lapo Luchini To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Lapo Luchini Subject: ports/105425: port upgrade: devel/monotone 0.31 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lapo Luchini List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Nov 2006 07:50:10 -0000 >Number: 105425 >Category: ports >Synopsis: port upgrade: devel/monotone 0.31 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Nov 12 07:50:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Lapo Luchini >Release: FreeBSD 6.1-STABLE amd64 >Organization: >Environment: System: FreeBSD motoko.lapo.it 6.1-STABLE FreeBSD 6.1-STABLE #4: Fri Sep 1 17:02:50 CEST 2006 root@motoko.lapo.it:/usr/obj/usr/src/sys/MOTOKO amd64 Upstream release. Changed the patches as suggested on Monotone's developer ML: http://article.gmane.org/gmane.comp.version-control.monotone.devel/8499 >Description: >How-To-Repeat: >Fix: --- pr-monotone-0.31 begins here --- diff -ruN monotone/Makefile monotone-0.31/Makefile --- monotone/Makefile Sun Sep 24 23:36:02 2006 +++ monotone-0.31/Makefile Sat Nov 11 23:35:30 2006 @@ -2,11 +2,11 @@ # Date created: 05 Feb 2004 # Whom: Mark A. Wicks # -# $FreeBSD: ports/devel/monotone/Makefile,v 1.24 2006/09/24 21:36:02 miwi Exp $ +# $FreeBSD: ports/devel/monotone/Makefile,v 1.23 2006/08/29 22:07:18 pav Exp $ # PORTNAME= monotone -PORTVERSION= 0.30 +PORTVERSION= 0.31 CATEGORIES= devel MASTER_SITES= http://www.venge.net/monotone/downloads/ @@ -45,6 +45,7 @@ .else USE_GETTEXT= yes PLIST_FILES+= share/locale/de/LC_MESSAGES/monotone.mo \ + share/locale/es/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 \ diff -ruN monotone/distinfo monotone-0.31/distinfo --- monotone/distinfo Sun Sep 24 23:36:02 2006 +++ monotone-0.31/distinfo Sat Nov 11 23:36:15 2006 @@ -1,3 +1,3 @@ -MD5 (monotone-0.30.tar.gz) = 94a1f8369162f7a7df8596b365a1d846 -SHA256 (monotone-0.30.tar.gz) = 5442515299d0281419d1a1922165b4dc7c6158d72032d3c15a672886f5c81f2c -SIZE (monotone-0.30.tar.gz) = 4663418 +MD5 (monotone-0.31.tar.gz) = 5a5feb8d053a5993ab516a1186bb5883 +SHA256 (monotone-0.31.tar.gz) = ceda1a42c23d9cfd0bf609f059ee32f228f78384dcf155adb36a742c78976c84 +SIZE (monotone-0.31.tar.gz) = 4743694 diff -ruN monotone/files/patch-Makefile.in monotone-0.31/files/patch-Makefile.in --- monotone/files/patch-Makefile.in Sun Sep 24 23:36:03 2006 +++ monotone-0.31/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,28 +0,0 @@ ---- Makefile.in.orig Sun Sep 17 11:58:18 2006 -+++ Makefile.in Sat Sep 23 18:38:33 2006 -@@ -1960,13 +1960,13 @@ - unix/$(DEPDIR)/$(am__dirstamp) - 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) - tester$(EXEEXT): $(tester_OBJECTS) $(tester_DEPENDENCIES) - @rm -f tester$(EXEEXT) -- $(CXXLINK) $(tester_LDFLAGS) $(tester_OBJECTS) $(tester_LDADD) $(LIBS) -+ $(CXXLINK) $(tester_LDFLAGS) $(tester_OBJECTS) $(tester_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) - contrib/$(am__dirstamp): - @$(mkdir_p) contrib - @: > contrib/$(am__dirstamp) -@@ -1977,7 +1977,7 @@ - contrib/$(DEPDIR)/$(am__dirstamp) - usher$(EXEEXT): $(usher_OBJECTS) $(usher_DEPENDENCIES) - @rm -f usher$(EXEEXT) -- $(CXXLINK) $(usher_LDFLAGS) $(usher_OBJECTS) $(usher_LDADD) $(LIBS) -+ $(CXXLINK) $(usher_LDFLAGS) $(usher_OBJECTS) $(usher_LDADD) $(LIBS) $(LIBINTL) $(LIBICONV) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) diff -ruN monotone/files/patch-configure monotone-0.31/files/patch-configure --- monotone/files/patch-configure Sun Sep 24 23:36:03 2006 +++ monotone-0.31/files/patch-configure Sat Nov 11 23:44:39 2006 @@ -1,5 +1,5 @@ ---- configure.orig Sun Sep 17 21:28:11 2006 -+++ configure Sat Sep 23 18:38:33 2006 +--- configure.orig Sat Nov 11 20:08:59 2006 ++++ configure Sat Nov 11 23:39:21 2006 @@ -10827,7 +10827,7 @@ #ifdef __cplusplus "C" diff -ruN monotone/files/patch-monotone.cc monotone-0.31/files/patch-monotone.cc --- monotone/files/patch-monotone.cc Sun Sep 24 23:36:03 2006 +++ monotone-0.31/files/patch-monotone.cc Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- monotone.cc.orig Sun Sep 17 11:56:38 2006 -+++ monotone.cc Sat Sep 23 18:42:05 2006 -@@ -188,8 +188,10 @@ - if (!init) - { - setlocale(LC_ALL, ""); -+#ifdef ENABLE_NLS - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); -+#endif - init = 1; - } - } --- pr-monotone-0.31 ends here --- >Release-Note: >Audit-Trail: >Unformatted: