7 files changed, 86 insertions, 75 deletions

diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 83d5f51d50c3..ba86d9afffd9 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bygfoot
-PORTVERSION=	1.6.3
+PORTVERSION=	1.8.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,13 @@ COMMENT=	Football (soccer) management game
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk20 gnometarget
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN6=		bygfoot.6
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/b-u/bygfoot-update
+
 .include <bsd.port.mk>
diff --git a/games/bygfoot/distinfo b/games/bygfoot/distinfo
index d955c4685bb5..52fceb311d45 100644
--- a/games/bygfoot/distinfo
+++ b/games/bygfoot/distinfo
@@ -1,2 +1,2 @@
-MD5 (bygfoot-1.6.3.tar.bz2) = c84952d8016d80a5e4784ab765de55be
-SIZE (bygfoot-1.6.3.tar.bz2) = 347984
+MD5 (bygfoot-1.8.0.tar.bz2) = dad81f94f73a3f794f66b1cb985f2809
+SIZE (bygfoot-1.8.0.tar.bz2) = 380102
diff --git a/games/bygfoot/files/patch-Makefile.in b/games/bygfoot/files/patch-Makefile.in
deleted file mode 100644
index b3232509389f..000000000000
--- a/games/bygfoot/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Nov 23 15:29:48 2004
-+++ Makefile.in	Wed Nov 24 10:14:53 2004
-@@ -598,7 +598,7 @@
- 	  for pixmap in $(srcdir)/support_files/*; do \
- 	    if test -f $$pixmap; then \
- 		if test -x $$pixmap; then \
--		      $(INSTALL_PROGRAM) $$pixmap $(DESTDIR)$(pkgdatadir)/support_files; \
-+		      echo "here be dragons"; \
- 		else \
- 		      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/support_files; \
- 		fi \
diff --git a/games/bygfoot/files/patch-po-Makefile.in.in b/games/bygfoot/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..a13be73133ab
--- /dev/null
+++ b/games/bygfoot/files/patch-po-Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Sun Jan 30 22:00:18 2005
++++ po/Makefile.in.in	Mon Jan 31 21:25:48 2005
+@@ -62,6 +62,8 @@
+ CATOBJEXT = @CATOBJEXT@
+ INSTOBJEXT = @INSTOBJEXT@
+ 
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++
+ .SUFFIXES:
+ .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+ 
diff --git a/games/bygfoot/files/patch-src-game.c b/games/bygfoot/files/patch-src-game.c
new file mode 100644
index 000000000000..431faab1e144
--- /dev/null
+++ b/games/bygfoot/files/patch-src-game.c
@@ -0,0 +1,33 @@
+--- src/game.c.orig	Sun Jan 30 22:00:18 2005
++++ src/game.c	Mon Jan 31 22:10:46 2005
+@@ -528,14 +528,7 @@
+ 			 gint player_number)
+ {
+     gint i;
+-    gfloat rndom = rnd(0,1);
+-
+-    if(debug && fix.team_id[team] == my_team)
+-	return;
+-
+-    player *pl =
+-	&(teams[fix.team_id[team]].players[player_number]);
+-
++    player *pl;
+     /* probabilities that a player
+        with cpos i is sent off: prob[i][0];
+        booked with yellow: prob[i][1] - bookprob[i][0] */
+@@ -549,6 +542,14 @@
+     gfloat duration[6]={0,0.7,0.85,0.95,0.975,1};
+ 
+     gfloat increasing_factor = 1.0;
++    gfloat rndom = rnd(0,1);
++
++    if(debug && fix.team_id[team] == my_team)
++	return;
++
++    pl =
++	&(teams[fix.team_id[team]].players[player_number]);
++
+     if (options[OPT_BOOST] && fix.team_id[team] == my_team)
+     	increasing_factor = BOOST_CARD_EFFECT;
+ 
diff --git a/games/bygfoot/files/patch-src-games.c b/games/bygfoot/files/patch-src-games.c
deleted file mode 100644
index 25773c0931cf..000000000000
--- a/games/bygfoot/files/patch-src-games.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/games.c.orig	Mon Jul 12 10:33:02 2004
-+++ src/games.c	Sat Jul 17 14:05:39 2004
-@@ -436,9 +436,6 @@
-     gint i;
-     gfloat random = rnd(0,1);
- 
--    if(debug && fix.team_id[team] == my_team)
--	return;
--
-     player *pl =
- 	&(teams[fix.team_id[team]].players[player_number]);
- 
-@@ -454,6 +451,9 @@
-        in weeks: 1,2,3,4 or 5 */
-     gfloat duration[6]={0,0.7,0.85,0.95,0.975,1};
- 
-+    if(debug && fix.team_id[team] == my_team)
-+	return;
-+
-     /* injured or banned players don't really participate
-        in the game */
-     if(!pl->cskill ||
-@@ -496,9 +496,6 @@
-     gint i;
-     gfloat random = rnd(0,1);
-     
--    if(debug && fix.team_id[team] == my_team)
--	return;
--
-     /* for convenience, so as not to write
-        teams[fix.team_id[team]].players[player_number]
-        each time */
-@@ -538,6 +535,9 @@
- 			  {4,12},{5,12},{6,16},{3,8},
- 			  {5,14},{12,30}};
-     
-+    if(debug && fix.team_id[team] == my_team)
-+	return;
-+
-     for(i=1;i<12;i++)
- 	if(injury_probs[i - 1] * prob < random &&
- 	   random <= injury_probs[i] * prob &&
diff --git a/games/bygfoot/pkg-plist b/games/bygfoot/pkg-plist
index ec42502b9710..d742d89c2e6c 100644
--- a/games/bygfoot/pkg-plist
+++ b/games/bygfoot/pkg-plist
@@ -1,28 +1,44 @@
 bin/bygfoot
-share/bygfoot/support_files/bygfoot_icon.png
-share/bygfoot/support_files/bygfoot_team_editor_icon.png
-share/bygfoot/support_files/fin_stad.png
-share/bygfoot/support_files/fire_player.png
-share/bygfoot/support_files/flag_br.png
-share/bygfoot/support_files/flag_de.png
-share/bygfoot/support_files/flag_eng.png
-share/bygfoot/support_files/flag_es.png
-share/bygfoot/support_files/flag_fr.png
-share/bygfoot/support_files/flag_it.png
-share/bygfoot/support_files/flag_pl.png
-share/bygfoot/support_files/flag_ro.png
-share/bygfoot/support_files/get_loan.png
-share/bygfoot/support_files/inc_cap.png
-share/bygfoot/support_files/inc_saf.png
-share/bygfoot/support_files/new_week.png
-share/bygfoot/support_files/pay_loan.png
-share/bygfoot/support_files/preview.png
+bin/bygfoot-update
+bin/bygfoot-update-gui
+share/bygfoot/support_files/pixmaps/bus.png
+share/bygfoot/support_files/pixmaps/bygfoot_team_editor_icon.png
+share/bygfoot/support_files/pixmaps/fire_player.png
+share/bygfoot/support_files/pixmaps/fixtures.png
+share/bygfoot/support_files/pixmaps/flag_br.png
+share/bygfoot/support_files/pixmaps/flag_cl.png
+share/bygfoot/support_files/pixmaps/flag_de.png
+share/bygfoot/support_files/pixmaps/flag_eng.png
+share/bygfoot/support_files/pixmaps/flag_es.png
+share/bygfoot/support_files/pixmaps/flag_fr.png
+share/bygfoot/support_files/pixmaps/flag_hu.png
+share/bygfoot/support_files/pixmaps/flag_it.png
+share/bygfoot/support_files/pixmaps/flag_mx.png
+share/bygfoot/support_files/pixmaps/flag_pl.png
+share/bygfoot/support_files/pixmaps/flag_ro.png
+share/bygfoot/support_files/pixmaps/football.png
+share/bygfoot/support_files/pixmaps/get_loan.png
+share/bygfoot/support_files/pixmaps/graph.png
+share/bygfoot/support_files/pixmaps/history_plyr.png
+share/bygfoot/support_files/pixmaps/inc_cap.png
+share/bygfoot/support_files/pixmaps/inc_saf.png
+share/bygfoot/support_files/pixmaps/pay_loan.png
+share/bygfoot/support_files/pixmaps/penalty_shooter.png
+share/bygfoot/support_files/pixmaps/preview.png
+share/bygfoot/support_files/pixmaps/stadium_fin.png
+share/bygfoot/support_files/pixmaps/striker.png
+share/bygfoot/support_files/pixmaps/table.png
+share/bygfoot/support_files/pixmaps/transfer_frm.png
+share/bygfoot/support_files/pixmaps/transfer_lst.png
+share/bygfoot/support_files/pixmaps/transfer_to.png
 share/bygfoot/support_files/text_files/bygfoot.conf
 share/bygfoot/support_files/text_files/country_br
+share/bygfoot/support_files/text_files/country_cl
 share/bygfoot/support_files/text_files/country_de
 share/bygfoot/support_files/text_files/country_eng
 share/bygfoot/support_files/text_files/country_es
 share/bygfoot/support_files/text_files/country_fr
+share/bygfoot/support_files/text_files/country_hu
 share/bygfoot/support_files/text_files/country_it
 share/bygfoot/support_files/text_files/country_mx
 share/bygfoot/support_files/text_files/country_pl
@@ -30,7 +46,6 @@ share/bygfoot/support_files/text_files/country_ro
 share/bygfoot/support_files/text_files/help
 share/bygfoot/support_files/text_files/player_names
 share/bygfoot/support_files/text_files/teams
-share/bygfoot/support_files/transfers.png
 share/locale/de/LC_MESSAGES/bygfoot.mo
 share/locale/fr/LC_MESSAGES/bygfoot.mo
 share/locale/hu/LC_MESSAGES/bygfoot.mo
@@ -38,5 +53,6 @@ share/locale/pt_BR/LC_MESSAGES/bygfoot.mo
 share/locale/ro/LC_MESSAGES/bygfoot.mo
 share/locale/ru/LC_MESSAGES/bygfoot.mo
 @dirrm share/bygfoot/support_files/text_files
+@dirrm share/bygfoot/support_files/pixmaps
 @dirrm share/bygfoot/support_files
 @dirrm share/bygfoot