+cc dcoppa in case he wants to chime in (he did the recent xboard updates).
Stuart Henderson <s...@spacehopper.org> writes: > On 2017/04/24 15:39, Rafael Sadowski wrote: >> On Mon Apr 24, 2017 at 12:37:08PM +0200, Jeremie Courreges-Anglas wrote: >> > Rafael Sadowski <raf...@sizeofvoid.org> writes: >> > >> > > Hi ports@, >> > > >> > > please find below a simple patch to update xboard to the last stable >> > > version. Regen and fix WANTLIB. Lightly tested on amd64. >> > >> > The current version comes with a bunch of preconfigured chess engines. >> > By default one can start xboard and use gnuchess out of the box. It >> > seems this is not the case with xboard-4.9.1, I get a weird error >> > message at startup, and I haven't managed to start a new game yet. >> > I don't think this is ready to go in. >> >> "xboard -fcp gnuchess" Works like a charm. I think you mean: >> https://www.gnu.org/software/xboard/FAQ.html#tag-C.22 >> >> It's not a weird error, it's a GNU feature: >> https://www.gnu.org/software/xboard/FAQ.html#tag-D.6 > > 'By default, XBoard tries to use Fairy-Max by running the command "fairymax".' > > Since we don't have that in ports, it's not a very useful default.. Yep. The port has been patched to 1. use gnuchess is no config file is provided 2. look at /etc/xboard/xboard.conf by default The header that defines this is specific to the gui toolkit used, switching from xaw to gtk means that we have to patch another file; else xboard doesn't look at /etc/xboard/xboard.conf, which is a bit confusing... With the updated diff below, I get something more usable by default. patch-args_h can go away, also update license marker while here. Another thing would be to get rid of the gettext module, but that can be done as another step. ok jca@ if you want to commit this as is. Index: Makefile =================================================================== RCS file: /d/cvs/ports/games/xboard/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile 27 Mar 2015 08:41:06 -0000 1.35 +++ Makefile 24 Apr 2017 15:27:53 -0000 @@ -2,25 +2,27 @@ COMMENT= X11 frontend for GNU Chess and the Internet Chess Server -DISTNAME= xboard-4.8.0 +DISTNAME= xboard-4.9.1 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_GNU:=xboard/} -REVISION= 0 HOMEPAGE= https://www.gnu.org/software/xboard/ -# GPL +# GPLv3+ PERMIT_PACKAGE_CDROM= Yes -WANTLIB= ICE SM X11 Xaw Xmu Xt c cairo \ - gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ - gobject-2.0 m pthread rsvg-2 +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 +WANTLIB += gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pthread rsvg-2 z MODULES= devel/gettext BUILD_DEPENDS= devel/xdg-utils LIB_DEPENDS= graphics/cairo \ + x11/gtk+2 \ x11/gnome/librsvg RUN_DEPENDS= games/gnuchess \ Index: distinfo =================================================================== RCS file: /d/cvs/ports/games/xboard/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 10 Nov 2014 09:04:18 -0000 1.8 +++ distinfo 24 Apr 2017 15:24:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (xboard-4.8.0.tar.gz) = yI9I/H/gZ74KE7jRIcOFURRfiJcZwhJxeITl6C2QLRc= -SIZE (xboard-4.8.0.tar.gz) = 3691531 +SHA256 (xboard-4.9.1.tar.gz) = Ky5T6EKK2bbo3IpVs6UYM4GRGk2uLABy+pYpa7sZcNY= +SIZE (xboard-4.9.1.tar.gz) = 4015017 Index: patches/patch-Makefile_in =================================================================== RCS file: /d/cvs/ports/games/xboard/patches/patch-Makefile_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-Makefile_in --- patches/patch-Makefile_in 10 Nov 2014 09:04:18 -0000 1.7 +++ patches/patch-Makefile_in 24 Apr 2017 15:24:47 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2014/11/10 09:04:18 dcoppa Exp $ ---- Makefile.in.orig Mon Nov 10 09:41:17 2014 -+++ Makefile.in Mon Nov 10 09:41:27 2014 -@@ -532,7 +532,7 @@ xboard_SOURCES = backend.c backend.h backendz.h \ +--- Makefile.in.orig Sun May 15 19:18:04 2016 ++++ Makefile.in Mon Apr 24 00:59:18 2017 +@@ -542,7 +542,7 @@ xboard_SOURCES = backend.c backend.h backendz.h \ ### SUBDIRS = po Index: patches/patch-args_h =================================================================== RCS file: patches/patch-args_h diff -N patches/patch-args_h --- patches/patch-args_h 26 Oct 2012 18:08:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-args_h,v 1.1 2012/10/26 18:08:27 dcoppa Exp $ - -error: 'intptr_t' undeclared - ---- args.h.orig Wed Apr 18 04:31:15 2012 -+++ args.h Fri Oct 26 14:01:20 2012 -@@ -57,6 +57,8 @@ - // so that it can make use of the proper context of #defined symbols and - // declarations in those files. - -+#include <stdint.h> -+ - typedef enum { - ArgString, ArgInt, ArgFloat, ArgBoolean, ArgTrue, ArgFalse, ArgNone, - ArgColor, ArgAttribs, ArgFilename, ArgBoardSize, ArgFont, ArgCommSettings, Index: patches/patch-gtk_xboard_h =================================================================== RCS file: patches/patch-gtk_xboard_h diff -N patches/patch-gtk_xboard_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gtk_xboard_h 24 Apr 2017 15:24:47 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- gtk/xboard.h.orig Wed May 18 07:50:45 2016 ++++ gtk/xboard.h Mon Apr 24 17:18:01 2017 +@@ -109,7 +109,7 @@ typedef struct { + + #define BORDER_X_OFFSET 3 + #define BORDER_Y_OFFSET 27 +-#define FIRST_CHESS_PROGRAM "fairymax" ++#define FIRST_CHESS_PROGRAM "gnuchess" + #define SECOND_CHESS_PROGRAM "" + #define FIRST_DIRECTORY "." + #define SECOND_DIRECTORY "." +@@ -118,7 +118,7 @@ typedef struct { + #define FCP_NAMES "" + #define SCP_NAMES "" + #define ICS_TEXT_MENU_DEFAULT "" +-#define SETTINGS_FILE SYSCONFDIR"/xboard.conf" ++#define SETTINGS_FILE SYSCONFDIR"/xboard/xboard.conf" + #define COLOR_BKGD "white" + + GdkPixbuf *LoadIconFile P((char *name)); Index: patches/patch-xaw-xboard_h =================================================================== RCS file: patches/patch-xaw-xboard_h diff -N patches/patch-xaw-xboard_h --- patches/patch-xaw-xboard_h 10 Nov 2014 09:04:18 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-xaw-xboard_h,v 1.2 2014/11/10 09:04:18 dcoppa Exp $ ---- xaw/xboard.h.orig Wed Oct 22 17:29:28 2014 -+++ xaw/xboard.h Mon Nov 10 09:34:42 2014 -@@ -118,7 +118,7 @@ typedef struct { - - #define BORDER_X_OFFSET 3 - #define BORDER_Y_OFFSET 27 --#define FIRST_CHESS_PROGRAM "fairymax" -+#define FIRST_CHESS_PROGRAM "gnuchess" - #define SECOND_CHESS_PROGRAM "" - #define FIRST_DIRECTORY "." - #define SECOND_DIRECTORY "." -@@ -127,7 +127,7 @@ typedef struct { - #define FCP_NAMES "" - #define SCP_NAMES "" - #define ICS_TEXT_MENU_DEFAULT "" --#define SETTINGS_FILE SYSCONFDIR"/xboard.conf" -+#define SETTINGS_FILE SYSCONFDIR"/xboard/xboard.conf" - #define COLOR_BKGD "white" - - void NewTagsPopup P((char *text, char *msg)); Index: pkg/PLIST =================================================================== RCS file: /d/cvs/ports/games/xboard/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 10 Nov 2014 09:04:18 -0000 1.10 +++ pkg/PLIST 24 Apr 2017 15:24:47 -0000 @@ -13,7 +13,6 @@ share/examples/xboard/ @sample ${SYSCONFDIR}/xboard/ share/examples/xboard/xboard.conf @sample ${SYSCONFDIR}/xboard/xboard.conf -share/games/ share/games/xboard/ share/games/xboard/pixmaps/ share/games/xboard/pixmaps/textures/ @@ -37,7 +36,6 @@ share/games/xboard/sounds/slap.wav share/games/xboard/sounds/woodthunk.wav share/games/xboard/themes/ share/games/xboard/themes/conf/ -share/games/xboard/themes/conf/chu share/games/xboard/themes/conf/ics share/games/xboard/themes/conf/mini share/games/xboard/themes/conf/mini.fen @@ -48,16 +46,25 @@ share/games/xboard/themes/conf/xq share/games/xboard/themes/default/ share/games/xboard/themes/default/BlackAdvisor.svg share/games/xboard/themes/default/BlackArchbishop.svg +share/games/xboard/themes/default/BlackAxe.svg share/games/xboard/themes/default/BlackBishop.svg +share/games/xboard/themes/default/BlackButterfly.svg +share/games/xboard/themes/default/BlackCamel.svg share/games/xboard/themes/default/BlackCanon.svg share/games/xboard/themes/default/BlackChancellor.svg share/games/xboard/themes/default/BlackClaw.svg share/games/xboard/themes/default/BlackCobra.svg share/games/xboard/themes/default/BlackCommoner.svg +share/games/xboard/themes/default/BlackCopper.svg share/games/xboard/themes/default/BlackCrownedBishop.svg share/games/xboard/themes/default/BlackCrownedRook.svg +share/games/xboard/themes/default/BlackCub.svg share/games/xboard/themes/default/BlackDolphin.svg +share/games/xboard/themes/default/BlackDragon.svg +share/games/xboard/themes/default/BlackDuck.svg share/games/xboard/themes/default/BlackElephant.svg +share/games/xboard/themes/default/BlackFlag.svg +share/games/xboard/themes/default/BlackGnu.svg share/games/xboard/themes/default/BlackGold.svg share/games/xboard/themes/default/BlackGoldKnight.svg share/games/xboard/themes/default/BlackGoldLance.svg @@ -65,15 +72,20 @@ share/games/xboard/themes/default/BlackG share/games/xboard/themes/default/BlackGoldSilver.svg share/games/xboard/themes/default/BlackHCrown.svg share/games/xboard/themes/default/BlackHSword.svg +share/games/xboard/themes/default/BlackHat.svg share/games/xboard/themes/default/BlackHawk.svg +share/games/xboard/themes/default/BlackIron.svg share/games/xboard/themes/default/BlackKing.svg share/games/xboard/themes/default/BlackKnight.svg +share/games/xboard/themes/default/BlackLShield.svg share/games/xboard/themes/default/BlackLance.svg +share/games/xboard/themes/default/BlackLeft.svg share/games/xboard/themes/default/BlackLeopard.svg share/games/xboard/themes/default/BlackLion.svg share/games/xboard/themes/default/BlackMarshall.svg share/games/xboard/themes/default/BlackNightrider.svg share/games/xboard/themes/default/BlackPawn.svg +share/games/xboard/themes/default/BlackPegasus.svg share/games/xboard/themes/default/BlackPrincess.svg share/games/xboard/themes/default/BlackPromoBishop.svg share/games/xboard/themes/default/BlackPromoDragon.svg @@ -82,21 +94,37 @@ share/games/xboard/themes/default/BlackP share/games/xboard/themes/default/BlackPromoRook.svg share/games/xboard/themes/default/BlackPromoSword.svg share/games/xboard/themes/default/BlackQueen.svg +share/games/xboard/themes/default/BlackRShield.svg +share/games/xboard/themes/default/BlackRight.svg share/games/xboard/themes/default/BlackRook.svg share/games/xboard/themes/default/BlackSword.svg +share/games/xboard/themes/default/BlackTower.svg share/games/xboard/themes/default/BlackUnicorn.svg +share/games/xboard/themes/default/BlackViking.svg +share/games/xboard/themes/default/BlackWizard.svg +share/games/xboard/themes/default/BlackWolf.svg +share/games/xboard/themes/default/BlackZebra.svg share/games/xboard/themes/default/WhiteAdvisor.svg share/games/xboard/themes/default/WhiteArchbishop.svg +share/games/xboard/themes/default/WhiteAxe.svg share/games/xboard/themes/default/WhiteBishop.svg +share/games/xboard/themes/default/WhiteButterfly.svg +share/games/xboard/themes/default/WhiteCamel.svg share/games/xboard/themes/default/WhiteCanon.svg share/games/xboard/themes/default/WhiteChancellor.svg share/games/xboard/themes/default/WhiteClaw.svg share/games/xboard/themes/default/WhiteCobra.svg share/games/xboard/themes/default/WhiteCommoner.svg +share/games/xboard/themes/default/WhiteCopper.svg share/games/xboard/themes/default/WhiteCrownedBishop.svg share/games/xboard/themes/default/WhiteCrownedRook.svg +share/games/xboard/themes/default/WhiteCub.svg share/games/xboard/themes/default/WhiteDolphin.svg +share/games/xboard/themes/default/WhiteDragon.svg +share/games/xboard/themes/default/WhiteDuck.svg share/games/xboard/themes/default/WhiteElephant.svg +share/games/xboard/themes/default/WhiteFlag.svg +share/games/xboard/themes/default/WhiteGnu.svg share/games/xboard/themes/default/WhiteGold.svg share/games/xboard/themes/default/WhiteGoldKnight.svg share/games/xboard/themes/default/WhiteGoldLance.svg @@ -104,15 +132,20 @@ share/games/xboard/themes/default/WhiteG share/games/xboard/themes/default/WhiteGoldSilver.svg share/games/xboard/themes/default/WhiteHCrown.svg share/games/xboard/themes/default/WhiteHSword.svg +share/games/xboard/themes/default/WhiteHat.svg share/games/xboard/themes/default/WhiteHawk.svg +share/games/xboard/themes/default/WhiteIron.svg share/games/xboard/themes/default/WhiteKing.svg share/games/xboard/themes/default/WhiteKnight.svg +share/games/xboard/themes/default/WhiteLShield.svg share/games/xboard/themes/default/WhiteLance.svg +share/games/xboard/themes/default/WhiteLeft.svg share/games/xboard/themes/default/WhiteLeopard.svg share/games/xboard/themes/default/WhiteLion.svg share/games/xboard/themes/default/WhiteMarshall.svg share/games/xboard/themes/default/WhiteNightrider.svg share/games/xboard/themes/default/WhitePawn.svg +share/games/xboard/themes/default/WhitePegasus.svg share/games/xboard/themes/default/WhitePrincess.svg share/games/xboard/themes/default/WhitePromoBishop.svg share/games/xboard/themes/default/WhitePromoDragon.svg @@ -121,9 +154,16 @@ share/games/xboard/themes/default/WhiteP share/games/xboard/themes/default/WhitePromoRook.svg share/games/xboard/themes/default/WhitePromoSword.svg share/games/xboard/themes/default/WhiteQueen.svg +share/games/xboard/themes/default/WhiteRShield.svg +share/games/xboard/themes/default/WhiteRight.svg share/games/xboard/themes/default/WhiteRook.svg share/games/xboard/themes/default/WhiteSword.svg +share/games/xboard/themes/default/WhiteTower.svg share/games/xboard/themes/default/WhiteUnicorn.svg +share/games/xboard/themes/default/WhiteViking.svg +share/games/xboard/themes/default/WhiteWizard.svg +share/games/xboard/themes/default/WhiteWolf.svg +share/games/xboard/themes/default/WhiteZebra.svg share/games/xboard/themes/default/eo_Analyzing.svg share/games/xboard/themes/default/eo_Black.svg share/games/xboard/themes/default/eo_Clear.svg @@ -166,7 +206,7 @@ share/games/xboard/themes/textures/ share/games/xboard/themes/textures/hatch.png share/games/xboard/themes/textures/wood_d.png share/games/xboard/themes/textures/wood_l.png -share/games/xboard/themes/textures/xqboard.png +share/games/xboard/themes/textures/xqboard-9x10.png share/games/xboard/themes/xiangqi/ share/games/xboard/themes/xiangqi/BlackAdvisor.svg share/games/xboard/themes/xiangqi/BlackCanon.svg @@ -187,10 +227,12 @@ share/icons/hicolor/scalable/apps/xboard share/locale/da/LC_MESSAGES/xboard.mo share/locale/de/LC_MESSAGES/xboard.mo share/locale/es/LC_MESSAGES/xboard.mo +share/locale/fr/LC_MESSAGES/xboard.mo share/locale/it/LC_MESSAGES/xboard.mo share/locale/nl/LC_MESSAGES/xboard.mo share/locale/pl/LC_MESSAGES/xboard.mo share/locale/ru/LC_MESSAGES/xboard.mo +share/locale/sr/LC_MESSAGES/xboard.mo share/locale/tr/LC_MESSAGES/xboard.mo share/locale/uk/LC_MESSAGES/xboard.mo share/locale/vi/LC_MESSAGES/xboard.mo -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
