[gentoo-commits] gentoo-x86 commit in games-board/freedoko/files: freedoko-0.7.8-gentoo.patch

[gentoo-commits] gentoo-x86 commit in games-board/freedoko/files: freedoko-0.7.8-gentoo.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    10/04/20 19:10:58

  Added:                freedoko-0.7.8-gentoo.patch
  Log:
  version bump
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.1                  games-board/freedoko/files/freedoko-0.7.8-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch?rev=1.1&content-type=text/plain

Index: freedoko-0.7.8-gentoo.patch
===================================================================
diff -ru FreeDoko_0.7.8.orig/src/Makefile FreeDoko_0.7.8/src/Makefile
--- FreeDoko_0.7.8.orig/src/Makefile	2010-03-13 14:22:58.000000000 -0500
+++ FreeDoko_0.7.8/src/Makefile	2010-04-20 12:52:29.294499776 -0400
@@ -211,15 +211,7 @@
 # compile FreeDoko
 $(PROGNAME) : show_settings objects $(DIRECTORIES)
 	@echo "compiling $(PROGNAME)..."
-# Gentoo users do want to see the real compile line.
-# So remove the next five lines (the echo lines)
-# and remove the '@' in the line after.
-	@echo '$(CXX) $(CXXFLAGS)'
-	@echo '        $$(OBJECTS)'
-	@echo '        $(INCLUDE_ALL)'
-	@echo '        $(LIBS_ALL)'
-	@echo '        -o $@'
-	@$(CXX) $(CXXFLAGS) \
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) \
 	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
 	  $(INCLUDE_ALL) \
 	  $(LIBS_ALL) \
diff -ru FreeDoko_0.7.8.orig/src/Makefile.os FreeDoko_0.7.8/src/Makefile.os
--- FreeDoko_0.7.8.orig/src/Makefile.os	2010-03-13 14:22:58.000000000 -0500
+++ FreeDoko_0.7.8/src/Makefile.os	2010-04-20 12:52:29.294499776 -0400
@@ -1,6 +1,5 @@
 include $(DEPTH)/../Makefile.os
 
-include $(DEPTH)/Makefile.local
 include $(DEPTH)/Makefile.modules
 
 ifeq ($(OPERATING_SYSTEM), Linux)
diff -ru FreeDoko_0.7.8.orig/src/Makefile.rules FreeDoko_0.7.8/src/Makefile.rules
--- FreeDoko_0.7.8.orig/src/Makefile.rules	2010-03-13 14:22:59.000000000 -0500
+++ FreeDoko_0.7.8/src/Makefile.rules	2010-04-20 12:52:29.295507223 -0400
@@ -81,9 +81,7 @@
 		  $(DEPTH)/Makefile.local \
 		  $(DEPTH)/Makefile.os
 # Gentoo users do want to see the real compile line.
-# So remove the next line and remove the '@' in the line after.
-	@echo $(CXX) -c $(SUBDIR)/$<
-	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
 
 
 -include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)
diff -ru FreeDoko_0.7.8.orig/src/ui/help.cpp FreeDoko_0.7.8/src/ui/help.cpp
--- FreeDoko_0.7.8.orig/src/ui/help.cpp	2010-03-13 14:23:02.000000000 -0500
+++ FreeDoko_0.7.8/src/ui/help.cpp	2010-04-20 13:00:28.862375812 -0400
@@ -142,14 +142,14 @@
     for (list<string>::const_iterator d = datadir.begin();
          d != datadir.end();
          d++)
-      directories.push_back(*d + "/"
+      directories.push_back("/"
                             + ::setting(Setting::MANUAL_DIRECTORY) + "/"
                             + ::translator.token());
     if (::translator.token() != ::setting(Setting::LANGUAGE))
       for (list<string>::const_iterator d = datadir.begin();
            d != datadir.end();
            d++)
-        directories.push_back(*d + "/"
+        directories.push_back("/"
                               + ::setting(Setting::MANUAL_DIRECTORY) + "/"
                               + ::setting(Setting::LANGUAGE));
   } // fill the directories list