Fix options incompatible with Tk 8.4 and bump PKGREVISION.

This should fix PR pkg/25926.

3 files changed, 74 insertions, 2 deletions

diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index b939f282b1a..2eb55dd5cee 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/03/12 17:15:57 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2004/06/18 02:22:01 minskim Exp $
 
 DISTNAME=		xconq-7.4.1
+PKGREVISION=		1
 CATEGORIES=		games x11
 MASTER_SITES=		ftp://sources.redhat.com/pub/xconq/
 PKGREVISION=		2
diff --git a/games/xconq/distinfo b/games/xconq/distinfo
index f78fc6a7438..f44d04ed2f4 100644
--- a/games/xconq/distinfo
+++ b/games/xconq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/06/05 04:44:20 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/06/18 02:22:01 minskim Exp $
 
 SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7
 Size (xconq-7.4.1.tar.gz) = 3402832 bytes
@@ -11,3 +11,4 @@ SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018
 SHA1 (patch-ag) = 2a5989750d187d911e7bf443a1354a390dd7ab2d
 SHA1 (patch-ah) = 56ed616d61b2029bbf1dcd9a9fb1b89793761c5c
 SHA1 (patch-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1
+SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d
diff --git a/games/xconq/patches/patch-aj b/games/xconq/patches/patch-aj
new file mode 100644
index 00000000000..c2b9c6e2c72
--- /dev/null
+++ b/games/xconq/patches/patch-aj
@@ -0,0 +1,70 @@
+$NetBSD: patch-aj,v 1.3 2004/06/18 02:22:01 minskim Exp $
+
+--- tcltk/tkconq.tcl.orig	2000-12-11 12:09:15.000000000 -0600
++++ tcltk/tkconq.tcl
+@@ -472,7 +472,7 @@ proc add_variants_dialog_items {} {
+ 		    -state $variantstate($col2) -variable variantvalue($col2) \
+ 		    -command [ list set_variant_value_cmd $col2 ]
+ 	    grid .newgame.top.checks.v$col1 .newgame.top.checks.v$col2 \
+-		    -sticky w -pad 5
++		    -sticky w -padx 5
+ 	}
+ 	for { set v 0 } { $v < 16 } { incr v } {
+ 	    if { "$variantstate($v)" == "active" } {
+@@ -785,37 +785,37 @@ proc add_player_dialog_items {} {
+ 	    -command { adjust_advantage_cmd 1 }
+     button .newgame.top.plbuttons.aminus -text "A-" -state disabled \
+ 	    -command { adjust_advantage_cmd -1 }
+-    grid .newgame.top.plbuttons.aplus .newgame.top.plbuttons.aminus -sticky ew -pad 2
++    grid .newgame.top.plbuttons.aplus .newgame.top.plbuttons.aminus -sticky ew -padx 2
+     button .newgame.top.plbuttons.add -text "Add" \
+ 	    -command { add_player_cmd } -width 8
+-    grid .newgame.top.plbuttons.add -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.add -columnspan 2 -sticky ew -padx 2
+     button .newgame.top.plbuttons.remove -text "Remove" -width 8
+-    grid .newgame.top.plbuttons.remove -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.remove -columnspan 2 -sticky ew -padx 2
+ 
+     menubutton .newgame.top.plbuttons.sidelib -text "Side Name" \
+ 	    -menu .newgame.top.plbuttons.sidelib.menu \
+ 	    -borderwidth 2 -relief raised -width 8
+     menu .newgame.top.plbuttons.sidelib.menu -tearoff 0
+-    grid .newgame.top.plbuttons.sidelib -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.sidelib -columnspan 2 -sticky ew -padx 2
+ 
+     button .newgame.top.plbuttons.rename -text "Random" \
+ 	    -command { rename_side_for_player_cmd -1 } -width 8
+-    grid .newgame.top.plbuttons.rename -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.rename -columnspan 2 -sticky ew -padx 2
+     button .newgame.top.plbuttons.computer -text "Computer" \
+ 	    -command { cycle_ai_cmd } -width 8
+-    grid .newgame.top.plbuttons.computer -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.computer -columnspan 2 -sticky ew -padx 2
+     button .newgame.top.plbuttons.exchange -text "Exchange" \
+ 	    -command { exchange_players_cmd } -width 8
+-    grid .newgame.top.plbuttons.exchange -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.exchange -columnspan 2 -sticky ew -padx 2
+ 
+     label .newgame.top.plbuttons.indeplabel -text "Indep Units"
+-    grid .newgame.top.plbuttons.indeplabel -columnspan 2 -sticky ew -pad 2
++    grid .newgame.top.plbuttons.indeplabel -columnspan 2 -sticky ew -padx 2
+     button .newgame.top.plbuttons.indepside -text "Add AI" \
+ 	    -command { set_indepside toggle } -width 6
+-    grid .newgame.top.plbuttons.indepside -columnspan 2 -pad 2
++    grid .newgame.top.plbuttons.indepside -columnspan 2 -padx 2
+     button .newgame.top.plbuttons.indepconfig -text "Config" \
+ 	    -command { popup_indepside_config } -width 6
+-    grid .newgame.top.plbuttons.indepconfig -columnspan 2 -pad 2
++    grid .newgame.top.plbuttons.indepconfig -columnspan 2 -padx 2
+ 
+     # Add names to the side library menu, disabling already-used names.
+     set numsidelib [ side_lib_size ]
+@@ -2985,7 +2985,7 @@ proc ask_bool_mode { mapn str dflt } { 
+ 	pack .bool.msg .bool.buttons -side top -fill x -padx 10 -pady 10
+ 	button .bool.buttons.yes -text Yes -command [ list bool_yes $mapn ]
+ 	button .bool.buttons.no -text No -command [ list bool_no $mapn ]
+-	grid .bool.buttons.yes .bool.buttons.no -pad 5
++	grid .bool.buttons.yes .bool.buttons.no -padx 5
+ 	# (should use dflt arg here)
+ 	update idletasks
+     }