5 files changed, 7 insertions, 47 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 5c8454c671e0..1326ab9f4d77 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	monotone
-PORTVERSION=	0.30
+PORTVERSION=	0.31
 CATEGORIES=	devel
 MASTER_SITES=	http://www.venge.net/monotone/downloads/
 
@@ -45,6 +45,7 @@ CONFIGURE_ARGS+=	--disable-nls
 .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 --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index f68a4f48218c..4432341a5938 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -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 --git a/devel/monotone/files/patch-Makefile.in b/devel/monotone/files/patch-Makefile.in
deleted file mode 100644
index be4a72ee0d52..000000000000
--- a/devel/monotone/files/patch-Makefile.in
+++ /dev/null
@@ -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 --git a/devel/monotone/files/patch-configure b/devel/monotone/files/patch-configure
index b577cee0f733..2dc00844dd16 100644
--- a/devel/monotone/files/patch-configure
+++ b/devel/monotone/files/patch-configure
@@ -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 --git a/devel/monotone/files/patch-monotone.cc b/devel/monotone/files/patch-monotone.cc
deleted file mode 100644
index 37bb59278295..000000000000
--- a/devel/monotone/files/patch-monotone.cc
+++ /dev/null
@@ -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;
-     }
- }