[Monotone-devel] FreeBSD port patches

[Lapo Luchini]

The FreeBSD port devel/monotone needs the following patches, would they
probably be a problem on others systems, or can I simply apply then to
the trunk and push to venge.net?

I guess the common "problem" is that Linux by default have some gettext
calls even if now using gettext, or something like that?

--- 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;
     }
 }
--- configure.orig      Sun Sep 17 21:28:11 2006
+++ configure   Sat Sep 23 18:38:33 2006
@@ -10827,7 +10827,7 @@
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();
+const char *_nl_expand_alias (int);
 int
 main ()
 {
--- 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)


-- 
Lapo Luchini
address@hidden (OpenPGP & X.509)
www.lapo.it (Jabber, ICQ, MSN)