11 files changed, 12 insertions, 230 deletions

diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index 321f23835ad6..a79d4c292dc9 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	freedoko
-PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTVERSION=	0.6.5
+#PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	free-doko
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME:C/\.src$//}/src
 USE_GMAKE=	yes
 MAKE_ENV=	OSTYPE=linux-gnu DATADIR=${DATADIR}
 
-CPIOFLAGS=	--quiet -pdum
-DATASUBDIRS=	ai backgrounds cardsets help.icons rules translations
+CPIOFLAGS=	--quiet -pdum -R ${SHAREOWN}:${SHAREGRP}
+DATASUBDIRS=	ai backgrounds cardsets rules translations
 
 .include <bsd.port.pre.mk>
 
@@ -38,10 +38,9 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/../data && \
 	 ${FIND} ${DATASUBDIRS} ! -name Makefile\* \
-	 | ${CPIO} ${CPIOFLAGS} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	 | ${CPIO} ${CPIOFLAGS} ${DATADIR}
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC}/../doc && \
-	 ${FIND} . ! -name Makefile\* \
-	 | ${CPIO} ${CPIOFLAGS} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	 ${FIND} . ! -name Makefile\* | ${CPIO} ${CPIOFLAGS} ${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/games/freedoko/distinfo b/games/freedoko/distinfo
index de14ae4434f6..d056e805c928 100644
--- a/games/freedoko/distinfo
+++ b/games/freedoko/distinfo
@@ -1,2 +1,2 @@
-MD5 (FreeDoko_0.6.4.src.zip) = d14cee702ffa4f83f9a8f2b9e32ffc67
-SIZE (FreeDoko_0.6.4.src.zip) = 2874317
+MD5 (FreeDoko_0.6.5.src.zip) = 3aa2a66dddc0cd9414838a4983b3011d
+SIZE (FreeDoko_0.6.5.src.zip) = 2902832
diff --git a/games/freedoko/files/patch-Makefile b/games/freedoko/files/patch-Makefile
deleted file mode 100644
index 698b8dc8e9a7..000000000000
--- a/games/freedoko/files/patch-Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile~	Mon Mar  8 12:17:03 2004
-+++ Makefile	Wed Jun  2 19:50:26 2004
-@@ -43,33 +43,33 @@
- directories : always
- ifeq ($(SHELLTYPE), sh)
- 	for d in $(DIRECTORIES); do \
--	  make -C "$$d" || exit; \
-+	  $(MAKE) -C "$$d" || exit; \
- 	done;
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
--	make -C player
--	make -C party
--	make -C game
--	make -C card
--	make -C misc
--	make -C ui
--	make -C os
--	make -C class
--	make -C utils
-+	$(MAKE) -C player
-+	$(MAKE) -C party
-+	$(MAKE) -C game
-+	$(MAKE) -C card
-+	$(MAKE) -C misc
-+	$(MAKE) -C ui
-+	$(MAKE) -C os
-+	$(MAKE) -C class
-+	$(MAKE) -C utils
- endif
- 
- ifeq ($(SHELLTYPE), sh)
- fast : always
--	nice make -k -C ui &
--	( nice make -k -C party; \
--	  nice make -k -C game; \
--	  nice make -k -C card ) &
--	nice make -k -C player
--	nice make -k objects
--	nice make -k -C misc
--	nice make -k -C os
--	nice make -k -C class
--	nice make -k -C utils
-+	nice $(MAKE) -k -C ui &
-+	( nice $(MAKE) -k -C party; \
-+	  nice $(MAKE) -k -C game; \
-+	  nice $(MAKE) -k -C card ) &
-+	nice $(MAKE) -k -C player
-+	nice $(MAKE) -k objects
-+	nice $(MAKE) -k -C misc
-+	nice $(MAKE) -k -C os
-+	nice $(MAKE) -k -C class
-+	nice $(MAKE) -k -C utils
- endif
- 
- objects : $(OBJECTS)
-@@ -77,14 +77,14 @@
- include Makefile.dependencies
- 
- dir_text :
--	make -C text
-+	$(MAKE) -C text
- 
- dir_utils :
--	make -C utils/ file.$(OBJ_SUFFIX) string.$(OBJ_SUFFIX)
-+	$(MAKE) -C utils/ file.$(OBJ_SUFFIX) string.$(OBJ_SUFFIX)
- 
- dir_class :
--	make -C class/getopt/ getopt.$(OBJ_SUFFIX) option.$(OBJ_SUFFIX)
--	make -C class/readconfig/ readconfig.$(OBJ_SUFFIX)
-+	$(MAKE) -C class/getopt/ getopt.$(OBJ_SUFFIX) option.$(OBJ_SUFFIX)
-+	$(MAKE) -C class/readconfig/ readconfig.$(OBJ_SUFFIX)
- 
- ifeq ($(OPERATING_SYSTEM), Linux)
- doc :
diff --git a/games/freedoko/files/patch-class!Makefile b/games/freedoko/files/patch-class!Makefile
deleted file mode 100644
index d050a65ea32b..000000000000
--- a/games/freedoko/files/patch-class!Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- class/Makefile~	Sun Sep  7 20:33:50 2003
-+++ class/Makefile	Thu Jun  3 17:34:01 2004
-@@ -8,14 +8,14 @@
- 	@for d in *; \
- 	do	if test -d $$d; \
- 		then	if test -e $$d/Makefile; \
--			then	make -C $$d; \
-+			then	$(MAKE) -C $$d; \
- 			fi \
- 		fi \
- 	done
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
--	make -C readconfig
--	make -C getopt
-+	$(MAKE) -C readconfig
-+	$(MAKE) -C getopt
- endif
- 
- 
diff --git a/games/freedoko/files/patch-misc!setting.cpp b/games/freedoko/files/patch-misc!setting.cpp
deleted file mode 100644
index b4c4de8f8d55..000000000000
--- a/games/freedoko/files/patch-misc!setting.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- /home/tg/.BACKUP/!home!tg!work!FreeBSD!ports!local!freedoko!work!FreeDoko_0.6.3!src!misc!setting.cpp~	Wed May  5 12:31:09 2004
-+++ misc/setting.cpp	Fri Jun  4 09:59:07 2004
-@@ -399,8 +399,9 @@
-       break;

-     case LANGUAGE:

- #ifdef LINUX

--      if (string(getenv("LANG"), 0, 2) == string("de"))

--	value = "de";

-+      if (getenv("LANG"))

-+        if (string(getenv("LANG"), 0, 2) == string("de"))

-+          value = "de";

- #endif

- #ifdef WINDOWS

-       value = DK::Utils::Windows::Reg_read(HKEY_LOCAL_MACHINE,

diff --git a/games/freedoko/files/patch-player!Makefile b/games/freedoko/files/patch-player!Makefile
deleted file mode 100644
index a4d019d3e154..000000000000
--- a/games/freedoko/files/patch-player!Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- player/Makefile~	Mon Mar  8 12:13:13 2004
-+++ player/Makefile	Wed Jun  2 19:54:21 2004
-@@ -11,13 +11,13 @@
- directories : always
- ifeq ($(SHELLTYPE), sh)
- 	@for d in $(DIRECTORIES); do \
--	  make -C $$d || exit; \
-+	  $(MAKE) -C $$d || exit; \
- 	done
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
--	make -C human
--	make -C ai
--	make -C ai.dummy
-+	$(MAKE) -C human
-+	$(MAKE) -C ai
-+	$(MAKE) -C ai.dummy
- endif
- 
- 
diff --git a/games/freedoko/files/patch-ui!Makefile b/games/freedoko/files/patch-ui!Makefile
deleted file mode 100644
index 52a13e3e2f71..000000000000
--- a/games/freedoko/files/patch-ui!Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- ui/Makefile~	Mon Mar  8 12:13:18 2004
-+++ ui/Makefile	Thu Jun  3 17:18:20 2004
-@@ -14,18 +14,18 @@
- directories : always
- ifeq ($(SHELLTYPE), sh)
- 	@for d in $(DIRECTORIES); do \
--	  make -C $$d || exit; \
-+	  $(MAKE) -C $$d || exit; \
- 	done
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
- ifeq ($(USE_UI_TEXT), true)
--	make -C text
-+	$(MAKE) -C text
- endif
- ifeq ($(USE_UI_GTK), true)
--	make -C gtk
-+	$(MAKE) -C gtk
- endif
- ifeq ($(USE_UI_GTKMM), true)
--	make -C gtkmm
-+	$(MAKE) -C gtkmm
- endif
- endif
- 
diff --git a/games/freedoko/files/patch-ui!gtk!Makefile b/games/freedoko/files/patch-ui!gtk!Makefile
deleted file mode 100644
index 6b85e0b01875..000000000000
--- a/games/freedoko/files/patch-ui!gtk!Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- ui/gtk/Makefile~	Mon Mar  8 12:13:18 2004
-+++ ui/gtk/Makefile	Thu Jun  3 21:02:11 2004
-@@ -23,12 +23,12 @@
- directories : always
- ifeq ($(SHELLTYPE), sh)
- 	@for d in $(DIRECTORIES); do \
--	  make -C $$d || exit; \
-+	  $(MAKE) -C $$d || exit; \
- 	done
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
--	make -C widgets
--	make -C help.empty
-+	$(MAKE) -C widgets
-+	$(MAKE) -C help.empty
- endif
- 
- 
diff --git a/games/freedoko/files/patch-ui!gtkmm!Makefile b/games/freedoko/files/patch-ui!gtkmm!Makefile
deleted file mode 100644
index 303f84872933..000000000000
--- a/games/freedoko/files/patch-ui!gtkmm!Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- ui/gtkmm/Makefile~	Mon Mar  8 12:13:20 2004
-+++ ui/gtkmm/Makefile	Thu Jun  3 17:30:05 2004
-@@ -18,11 +18,11 @@
- directories : always
- ifeq ($(SHELLTYPE), sh)
- 	@for d in $(DIRECTORIES); do \
--	  make -C $$d || exit; \
-+	  $(MAKE) -C $$d || exit; \
- 	done
- endif
- ifeq ($(SHELLTYPE), COMMAND.COM)
--	make -C widgets
-+	$(MAKE) -C widgets
- endif
- 
- include Makefile.dependencies
diff --git a/games/freedoko/files/patch-ui!gtkmm!ui.game.gameplay.cpp b/games/freedoko/files/patch-ui!gtkmm!ui.game.gameplay.cpp
deleted file mode 100644
index 4312f33de114..000000000000
--- a/games/freedoko/files/patch-ui!gtkmm!ui.game.gameplay.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- /home/tg/.BACKUP/!home!tg!work!FreeBSD!ports!local!freedoko!work!FreeDoko_0.6.4!src!ui!gtkmm!ui.game.gameplay.cpp~	Mon May 31 16:38:45 2004
-+++ ui/gtkmm/ui.game.gameplay.cpp	Tue Jun  8 18:59:56 2004
-@@ -175,7 +175,7 @@
- 	}

- #endif

- 

--      } while (false);

-+      } while (player.hand().requested_position() == UINT_MAX);

- 

-       this->main_window->menu->card_got();

-       this->table->card_got();

diff --git a/games/freedoko/pkg-plist b/games/freedoko/pkg-plist
index cfd6b43079c7..e52d172de4ad 100644
--- a/games/freedoko/pkg-plist
+++ b/games/freedoko/pkg-plist
@@ -87,22 +87,6 @@ bin/FreeDoko
 %%DATADIR%%/cardsets/Altenburg/french/icons/swines.diamond.png
 %%DATADIR%%/cardsets/Altenburg/french/icons/swines.heart.png
 %%DATADIR%%/cardsets/Altenburg/french/icons/swines.spade.png
-%%DATADIR%%/help.icons/galeon/browser.xpm
-%%DATADIR%%/help.icons/galeon/credits.xpm
-%%DATADIR%%/help.icons/galeon/hide.xpm
-%%DATADIR%%/help.icons/galeon/index.xpm
-%%DATADIR%%/help.icons/galeon/next_page.xpm
-%%DATADIR%%/help.icons/galeon/origin
-%%DATADIR%%/help.icons/galeon/previous_page.xpm
-%%DATADIR%%/help.icons/galeon/toc.xpm
-%%DATADIR%%/help.icons/stock/browser.xpm
-%%DATADIR%%/help.icons/stock/credits.xpm
-%%DATADIR%%/help.icons/stock/hide.xpm
-%%DATADIR%%/help.icons/stock/index.xpm
-%%DATADIR%%/help.icons/stock/next_page.xpm
-%%DATADIR%%/help.icons/stock/origin
-%%DATADIR%%/help.icons/stock/previous_page.xpm
-%%DATADIR%%/help.icons/stock/toc.xpm
 %%DATADIR%%/rules/beginner
 %%DATADIR%%/rules/last
 %%DATADIR%%/rules/standard
@@ -154,6 +138,9 @@ bin/FreeDoko
 %%DOCSDIR%%/de/Kurzregeln.pdf
 %%DOCSDIR%%/de/Kurzregeln.tex
 %%DOCSDIR%%/de/Kurzregeln.txt
+%%DOCSDIR%%/de/LIESMICH.SuSE
+%%DOCSDIR%%/de/LIESMICH.Windows
+%%DOCSDIR%%/de/LIESMICH.gtkmm_2.4
 %%DOCSDIR%%/de/LIESMICH.html
 %%DOCSDIR%%/de/LIESMICH.txt
 %%DOCSDIR%%/de/MinGW32.txt
@@ -161,13 +148,11 @@ bin/FreeDoko
 %%DOCSDIR%%/de/Planung.txt
 %%DOCSDIR%%/de/Regeln.pdf
 %%DOCSDIR%%/de/Regeln.txt
-%%DOCSDIR%%/de/SuSE
-%%DOCSDIR%%/de/Windows
 %%DOCSDIR%%/en/FAQ.pdf
 %%DOCSDIR%%/en/FAQ.txt
+%%DOCSDIR%%/en/README.Windows
 %%DOCSDIR%%/en/README.html
 %%DOCSDIR%%/en/README.txt
-%%DOCSDIR%%/en/Windows
 %%DOCSDIR%%/en/configuration.pdf
 %%DOCSDIR%%/en/configuration.txt
 %%DOCSDIR%%/en/introduction.pdf
@@ -242,9 +227,6 @@ bin/FreeDoko
 @dirrm %%DATADIR%%/translations/de
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/rules
-@dirrm %%DATADIR%%/help.icons/stock
-@dirrm %%DATADIR%%/help.icons/galeon
-@dirrm %%DATADIR%%/help.icons
 @dirrm %%DATADIR%%/cardsets/Altenburg/french/icons
 @dirrm %%DATADIR%%/cardsets/Altenburg/french/cards/spade
 @dirrm %%DATADIR%%/cardsets/Altenburg/french/cards/heart