6 files changed, 53 insertions, 103 deletions

diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index e899ca86eb99..8f3c236a450d 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	bygfoot
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Football (soccer) management game
@@ -18,10 +18,7 @@ COMMENT=	Football (soccer) management game
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 gnometarget
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/bygfoot-update
-
 .include <bsd.port.mk>
diff --git a/games/bygfoot/distinfo b/games/bygfoot/distinfo
index 8e2dd4d93c8e..09ea0e89f969 100644
--- a/games/bygfoot/distinfo
+++ b/games/bygfoot/distinfo
@@ -1,3 +1,3 @@
-MD5 (bygfoot-2.0.1.tar.bz2) = c303ef5aff2c9d3f4e9d11dae1da685c
-SHA256 (bygfoot-2.0.1.tar.bz2) = eaac4641fb72a4206d5ef69df33ccde13ae31a01b3a2ed8f57f5acbe2d8c12fb
-SIZE (bygfoot-2.0.1.tar.bz2) = 1408439
+MD5 (bygfoot-2.2.0-source.tar.bz2) = ba8732d53b463a9e97c79a24f89ee857
+SHA256 (bygfoot-2.2.0-source.tar.bz2) = 07397dc3cdbb61344fa1a10989b273fdcfc14308150e9f70c04b2e7946654dce
+SIZE (bygfoot-2.2.0-source.tar.bz2) = 1597876
diff --git a/games/bygfoot/files/patch-src-cup.c b/games/bygfoot/files/patch-src-cup.c
deleted file mode 100644
index 2843c82dd673..000000000000
--- a/games/bygfoot/files/patch-src-cup.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/cup.c.orig	Thu Dec 22 10:44:34 2005
-+++ src/cup.c	Thu Dec 29 21:32:04 2005
-@@ -307,6 +307,7 @@
- 	    start = ct->start_idx - 1;
- 	    end = ct->end_idx - start;
- 
-+	    {
- 	    gint order[end];
- 	    for(j=0;j<end;j++)
- 		order[j] = j + start;
-@@ -340,6 +341,7 @@
- 			break;
- 		}
- 	    }
-+	    }
- 	}
- 
- 	if(ct->number_of_teams != -1 &&
-@@ -359,6 +361,7 @@
- 				  ct->sid, lig(0).teams->len, 
- 				  ct->number_of_teams, cup->name);
- 
-+	    {
- 	    gint permutation[lig(0).teams->len];
- 	    math_generate_permutation(permutation, 0, lig(0).teams->len - 1);
- 
-@@ -385,6 +388,7 @@
- 				  "cup_load_choose_team (2): not enough teams found in league 0 for chooseteam %s (%d; required: %d) in cup %s (group %d)\n",
- 				  ct->sid, number_of_teams, 
- 				  ct->number_of_teams, cup->name, cup->group);
-+	    }
- 	}
- 	else
- 	{
-@@ -475,6 +479,7 @@
- 	return;
-     }
-     
-+    {
-     gint permutation[teams_local->len];
-     for(j=0;j<teams_local->len;j++)
- 	permutation[j] = j;
-@@ -532,6 +537,7 @@
- 	    g_array_remove_index(teams_local, j);
- 	
-     free_teams_array(&teams_local, FALSE);
-+    }
- }
- 
- /** Return a pointer array of teams ordered corresponding to
diff --git a/games/bygfoot/files/patch-src-league.c b/games/bygfoot/files/patch-src-league.c
deleted file mode 100644
index c211af53fa34..000000000000
--- a/games/bygfoot/files/patch-src-league.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/league.c.orig	Sun Oct 16 11:53:36 2005
-+++ src/league.c	Tue Nov  1 20:26:35 2005
-@@ -457,6 +457,7 @@
-     {
- 	dest_sids = misc_separate_strings(
- 	    g_array_index(elements, PromRelElement, i).dest_sid);
-+	{
- 	gint dest_idcs_int[dest_sids->len];
- 	gint dest_idcs_order[dest_sids->len];
- 
-@@ -481,6 +482,7 @@
- 	}
- 
- 	free_gchar_array(&dest_sids);
-+	}
-     }
- }
- 
diff --git a/games/bygfoot/files/patch-src-lg_commentary.c b/games/bygfoot/files/patch-src-lg_commentary.c
deleted file mode 100644
index 93b2258c6fdc..000000000000
--- a/games/bygfoot/files/patch-src-lg_commentary.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lg_commentary.c.orig	Thu Dec 22 10:44:34 2005
-+++ src/lg_commentary.c	Thu Dec 29 21:25:43 2005
-@@ -210,6 +210,7 @@
- 	order[i] = -1;
-     }
- 
-+    {
-     gint permutation[priority_sum];
- 
-     math_generate_permutation(permutation, 1, priority_sum);
-@@ -230,6 +231,7 @@
- 
- 		break;
- 	    }
-+    }
-     }
- }
- 
diff --git a/games/bygfoot/pkg-plist b/games/bygfoot/pkg-plist
index 94e349c0c5c5..0a81f52664f9 100644
--- a/games/bygfoot/pkg-plist
+++ b/games/bygfoot/pkg-plist
@@ -1,5 +1,4 @@
 bin/bygfoot
-bin/bygfoot-update
 share/bygfoot/support_files/bygfoot.conf
 share/bygfoot/support_files/bygfoot_app
 share/bygfoot/support_files/bygfoot_constants
@@ -18,8 +17,28 @@ share/bygfoot/support_files/bygfoot_user.conf
 share/bygfoot/support_files/definitions/argentina/country_argentina.xml
 share/bygfoot/support_files/definitions/argentina/cup_argentina1_apertura.xml
 share/bygfoot/support_files/definitions/argentina/cup_argentina1_clausura.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_libertadores.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games2.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games3.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games4ia.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games4ib.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games4i.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_prom_games4m.xml
+share/bygfoot/support_files/definitions/argentina/cup_argentina_sudamericana.xml
 share/bygfoot/support_files/definitions/argentina/league_argentina1.xml
 share/bygfoot/support_files/definitions/argentina/league_argentina1_clausura.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina2.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina3ia.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina3ib.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina3m.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4ia.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4ib.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4ic.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4id.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4ie.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4if.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4ig.xml
+share/bygfoot/support_files/definitions/argentina/league_argentina4m.xml
 share/bygfoot/support_files/definitions/australia/country_australia.xml
 share/bygfoot/support_files/definitions/australia/cup_australia_a_league.xml
 share/bygfoot/support_files/definitions/australia/cup_australia_playoffs.xml
@@ -104,7 +123,6 @@ share/bygfoot/support_files/definitions/england/league_england4.xml
 share/bygfoot/support_files/definitions/england/league_england5.xml
 share/bygfoot/support_files/definitions/europe/cup_europe_cwc.xml
 share/bygfoot/support_files/definitions/europe/cup_europe_champ_league.xml
-share/bygfoot/support_files/definitions/europe/cup_europe_royal_league.xml
 share/bygfoot/support_files/definitions/europe/cup_europe_uefa.xml
 share/bygfoot/support_files/definitions/europe/cup_supercup_europe_intercontinental.xml
 share/bygfoot/support_files/definitions/europe/cup_supercup_europe_uefa.xml
@@ -125,8 +143,17 @@ share/bygfoot/support_files/definitions/germany/country_germany.xml
 share/bygfoot/support_files/definitions/germany/cup_germany_dfb.xml
 share/bygfoot/support_files/definitions/germany/league_germany1.xml
 share/bygfoot/support_files/definitions/germany/league_germany2.xml
-share/bygfoot/support_files/definitions/germany/league_germany3a.xml
-share/bygfoot/support_files/definitions/germany/league_germany3b.xml
+share/bygfoot/support_files/definitions/germany/league_germany3_1.xml
+share/bygfoot/support_files/definitions/germany/league_germany3_2.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_1.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_2.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_3.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_4.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_5.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_6.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_7.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_8.xml
+share/bygfoot/support_files/definitions/germany/league_germany4_9.xml
 share/bygfoot/support_files/definitions/greece/country_greece.xml
 share/bygfoot/support_files/definitions/greece/cup_greece_cup.xml
 share/bygfoot/support_files/definitions/greece/league_greece1.xml
@@ -157,13 +184,13 @@ share/bygfoot/support_files/definitions/japan/cup_japan_prom4.xml
 share/bygfoot/support_files/definitions/japan/cup_japan_prom5-4.xml
 share/bygfoot/support_files/definitions/japan/cup_japan_prom5-5.xml
 share/bygfoot/support_files/definitions/japan/cup_japan_prom5-6.xml
+share/bygfoot/support_files/definitions/japan/cup_japan_supercup.xml
 share/bygfoot/support_files/definitions/japan/league_japan1.xml
 share/bygfoot/support_files/definitions/japan/league_japan2.xml
 share/bygfoot/support_files/definitions/japan/league_japan3.xml
 share/bygfoot/support_files/definitions/japan/league_japan4-1.xml
 share/bygfoot/support_files/definitions/japan/league_japan4-2.xml
 share/bygfoot/support_files/definitions/japan/league_japan4-3.xml
-share/bygfoot/support_files/definitions/japan/league_japan4-3,xml
 share/bygfoot/support_files/definitions/japan/league_japan4-4.xml
 share/bygfoot/support_files/definitions/japan/league_japan4-5.xml
 share/bygfoot/support_files/definitions/japan/league_japan4-6.xml
@@ -184,12 +211,14 @@ share/bygfoot/support_files/definitions/mexico/country_mexico.xml
 share/bygfoot/support_files/definitions/mexico/cup_apertura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico1_apertura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico1_clausura.xml
+share/bygfoot/support_files/definitions/mexico/cup_mexico1_clausadura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico2_apertura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico2_clausura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico3_apertura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico3_clausura.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico_concacaf.xml
 share/bygfoot/support_files/definitions/mexico/cup_mexico_libertadores.xml
+share/bygfoot/support_files/definitions/mexico/cup_mexico_superliga.xml
 share/bygfoot/support_files/definitions/mexico/cup_prom_games_mexico1.xml
 share/bygfoot/support_files/definitions/mexico/cup_prom_games_mexico2.xml
 share/bygfoot/support_files/definitions/mexico/league_mexico1.xml
@@ -254,7 +283,6 @@ share/bygfoot/support_files/definitions/short_leagues/league_denmark1_short.xml
 share/bygfoot/support_files/definitions/short_leagues/league_portugal1_short.xml
 share/bygfoot/support_files/definitions/short_leagues/league_russia1_short.xml
 share/bygfoot/support_files/definitions/short_leagues/league_switzerland1_short.xml
-share/bygfoot/support_files/definitions/short_leagues/league_turkey1_short.xml
 share/bygfoot/support_files/definitions/short_leagues/league_ukraine1_short.xml
 share/bygfoot/support_files/definitions/short_leagues_north_and_central_america/league_costa_rica1_short.xml
 share/bygfoot/support_files/definitions/short_leagues_north_and_central_america/league_honduras1_short.xml
@@ -311,6 +339,10 @@ share/bygfoot/support_files/definitions/sweden/league_sweden_division_3_sydostra
 share/bygfoot/support_files/definitions/sweden/league_sweden_division_3_sydvastragotaland.xml
 share/bygfoot/support_files/definitions/sweden/league_sweden_division_3_vastrasvealand.xml
 share/bygfoot/support_files/definitions/sweden/league_sweden_superettan.xml
+share/bygfoot/support_files/definitions/turkey/country_turkey.xml
+share/bygfoot/support_files/definitions/turkey/cup_turkiye_kupasi.xml
+share/bygfoot/support_files/definitions/turkey/league_turkey1.xml
+share/bygfoot/support_files/definitions/turkey/league_turkey2.xml
 share/bygfoot/support_files/definitions/usa/country_usa.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_concacaf.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_eplayoff.xml
@@ -323,6 +355,7 @@ share/bygfoot/support_files/definitions/usa/cup_usa_pdl_eastern.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_pdl_southern.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_pdl_western.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_second_cup.xml
+share/bygfoot/support_files/definitions/usa/cup_usa_superliga.xml
 share/bygfoot/support_files/definitions/usa/cup_usa_wplayoff.xml
 share/bygfoot/support_files/definitions/usa/league_usa_econf.xml
 share/bygfoot/support_files/definitions/usa/league_usa_first.xml
@@ -373,6 +406,7 @@ share/bygfoot/support_files/lg_commentary/lg_commentary_bg.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_de.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_en.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_fr.xml
+share/bygfoot/support_files/lg_commentary/lg_commentary_gr.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_nl.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_pl.xml
 share/bygfoot/support_files/lg_commentary/lg_commentary_sv.xml
@@ -414,12 +448,15 @@ share/bygfoot/support_files/names/player_names_romania.xml
 share/bygfoot/support_files/names/player_names_scg.xml
 share/bygfoot/support_files/names/player_names_scotland.xml
 share/bygfoot/support_files/names/player_names_sweden.xml
+share/bygfoot/support_files/names/player_names_turkey.xml
 share/bygfoot/support_files/names/player_names_usa.xml
 share/bygfoot/support_files/pixmaps/boost_anti.png
 share/bygfoot/support_files/pixmaps/boost_off.png
 share/bygfoot/support_files/pixmaps/boost_on.png
 share/bygfoot/support_files/pixmaps/bygfoot_icon.png
 share/bygfoot/support_files/pixmaps/bygfoot_splash.png
+share/bygfoot/support_files/pixmaps/bygfoot_splash2.png
+share/bygfoot/support_files/pixmaps/decrease_red.png
 share/bygfoot/support_files/pixmaps/history/end_season.png
 share/bygfoot/support_files/pixmaps/history/fire_failure.png
 share/bygfoot/support_files/pixmaps/history/fire_finance.png
@@ -431,6 +468,7 @@ share/bygfoot/support_files/pixmaps/history/reach_cup_round.png
 share/bygfoot/support_files/pixmaps/history/relegated.png
 share/bygfoot/support_files/pixmaps/history/start_game.png
 share/bygfoot/support_files/pixmaps/history/win_final.png
+share/bygfoot/support_files/pixmaps/increase_green.png
 share/bygfoot/support_files/pixmaps/live_game/cross_bar.png
 share/bygfoot/support_files/pixmaps/live_game/foul.png
 share/bygfoot/support_files/pixmaps/live_game/goal.png
@@ -532,7 +570,6 @@ share/bygfoot/support_files/pixmaps/symbols/flag_el_salvador.png
 share/bygfoot/support_files/pixmaps/symbols/flag_england.png
 share/bygfoot/support_files/pixmaps/symbols/flag_estonia.png
 share/bygfoot/support_files/pixmaps/symbols/flag_es.png
-share/bygfoot/support_files/pixmaps/symbols/flag_euro08.jpg
 share/bygfoot/support_files/pixmaps/symbols/flag_euro08.png
 share/bygfoot/support_files/pixmaps/symbols/flag_eu.png
 share/bygfoot/support_files/pixmaps/symbols/flag_fiji.png
@@ -625,8 +662,8 @@ share/bygfoot/support_files/pixmaps/symbols/flag_tajikistan.png
 share/bygfoot/support_files/pixmaps/symbols/flag_thailand.png
 share/bygfoot/support_files/pixmaps/symbols/flag_togo.png
 share/bygfoot/support_files/pixmaps/symbols/flag_tritob.png
-share/bygfoot/support_files/pixmaps/symbols/flag_tr.png
 share/bygfoot/support_files/pixmaps/symbols/flag_tunisia.png
+share/bygfoot/support_files/pixmaps/symbols/flag_turkey.png
 share/bygfoot/support_files/pixmaps/symbols/flag_turkmenistan.png
 share/bygfoot/support_files/pixmaps/symbols/flag_uae.png
 share/bygfoot/support_files/pixmaps/symbols/flag_uganda.png
@@ -667,6 +704,7 @@ share/locale/da/LC_MESSAGES/bygfoot.mo
 share/locale/de/LC_MESSAGES/bygfoot.mo
 share/locale/es/LC_MESSAGES/bygfoot.mo
 share/locale/fr/LC_MESSAGES/bygfoot.mo
+share/locale/it/LC_MESSAGES/bygfoot.mo
 share/locale/nl/LC_MESSAGES/bygfoot.mo
 share/locale/pl/LC_MESSAGES/bygfoot.mo
 share/locale/ro/LC_MESSAGES/bygfoot.mo
@@ -684,6 +722,7 @@ share/locale/zh/LC_MESSAGES/bygfoot.mo
 @dirrm share/bygfoot/support_files/definitions/wc06
 @dirrm share/bygfoot/support_files/definitions/wales
 @dirrm share/bygfoot/support_files/definitions/usa
+@dirrm share/bygfoot/support_files/definitions/turkey
 @dirrm share/bygfoot/support_files/definitions/sweden
 @dirrm share/bygfoot/support_files/definitions/spain
 @dirrm share/bygfoot/support_files/definitions/short_leagues_south_america