CVS commit: pkgsrc/games/xboard

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/xboard
From: "Hauke Fath" <hauke%netbsd.org@localhost>
Date: Mon, 13 Jan 2020 15:46:26 +0000

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Jan 13 15:46:26 UTC 2020

Modified Files:
        pkgsrc/games/xboard: Makefile PLIST distinfo
        pkgsrc/games/xboard/patches: patch-Makefile.in
Added Files:
        pkgsrc/games/xboard: options.mk

Log Message:
Upgrade games/xboard to v4.9.1

Optionally build with gtk2 support instead of xaw. Upstream defaults
to gtk, but we are sticking with xaw for now.

XXX the gnuchess engine will still quit after the second move, see
    <https://lists.gnu.org/archive/html/bug-gnu-chess/2017-08/threads.html>

>From upstream's changelog:

** Version 4.9.1 **

   bugfix release for 4.9.0

   * Fix crash when logging out from ICS
   * Defer book faking input move until ping balance
   * Fix setting up btm positions with 'edit'
   * Fix bare King adjudication
   * Fix check testing in games without King
   * Fix disambiguating Pawn moves in Xiangqi
   * Fix King leaving Palace in Xiangqi
   * Fix compile error Xaw build

** Version 4.9.0 **

   (see http://www.gnu.org/software/xboard/whats_new/4.9.0/ )

  * New features in this release
    * Running EPD test suites
    * Getting instant help (XB)
    * Editing castling rights in a position
    * Use mouse wheel to set up position (XB)
    * Allow engine to pop up its settings dialog
    * Specifying ultra-fast games (XB)
    * Installing board themes from packages (XB)
    * Using a single-button mouse
    * A special directory for start positions
    * Allow terminal-less ICS play (XB)
    * Sound warnings in analysis mode
    * Changing fonts through the GUI (XB)
    * Automatic adapting of fonts to board size (XB)

  * New variant support
    * New piece types
    * Allowing more than 26 piece types
    * More flexible piece promotion
    * Restricting promotion choice
    * New configurable move types
    * Inscribing pieces with text
    * Setting rules from the command line
    * Allow inaccessible squares
    * Load Shogi games in .kif format


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/games/xboard/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/xboard/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/xboard/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xboard/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/xboard/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/xboard/Makefile
diff -u pkgsrc/games/xboard/Makefile:1.59 pkgsrc/games/xboard/Makefile:1.60
--- pkgsrc/games/xboard/Makefile:1.59   Mon Jan 13 13:31:50 2020
+++ pkgsrc/games/xboard/Makefile        Mon Jan 13 15:46:26 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2020/01/13 13:31:50 hauke Exp $
+# $NetBSD: Makefile,v 1.60 2020/01/13 15:46:26 hauke Exp $
 
-DISTNAME=      xboard-4.8.0
-PKGREVISION=   13
+DISTNAME=      xboard-4.9.1
+#PKGREVISION=  1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GNU:=xboard/}
 
@@ -20,21 +20,25 @@ INFO_FILES=         yes
 REPLACE_PERL=          texi2man
 
 INSTALLATION_DIRS+=    share/examples/xboard
-CONF_FILES+=           ${PREFIX}/share/examples/xboard/xboard.conf ${PKG_SYSCONFDIR}/xboard.conf
+CONF_FILES+=           ${PREFIX}/share/examples/xboard/xboard.conf \
+                       ${PKG_SYSCONFDIR}/xboard.conf
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
-BUILD_DEFS+=           XAW_TYPE
-.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
-CONFIGURE_ARGS+=       --with-Xaw3d
-.endif
+DEPENDS+=              gnuchess-[0-9]*:../../games/gnuchess
 
 SUBST_CLASSES+=                engine
 SUBST_MESSAGE.engine=  Setting gnuchess as default chess engine.
 SUBST_STAGE.engine=    pre-configure
 SUBST_FILES.engine=    xboard.conf
 SUBST_SED.engine=      -e '/ChessProgram / s,fairymax,gnuchess,'
-DEPENDS+=              gnuchess-[0-9]*:../../games/gnuchess
+
+SUBST_CLASSES+=                        wavplayer
+SUBST_MESSAGE.wavplayer=       Setting wav player location.
+SUBST_STAGE.wavplayer=         post-build
+SUBST_FILES.wavplayer=         xboard.conf
+SUBST_SED.wavplayer=           -e 's,aplay -q,${WAVPLAYER},g'
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 WAVPLAYER=      /usr/bin/audioplay
@@ -59,12 +63,6 @@ DEPENDS+=       libsndfile-[0-9]*:../../
 .  endif
 .endif
 
-SUBST_CLASSES+=                        wavplayer
-SUBST_MESSAGE.wavplayer=       Setting wav player location.
-SUBST_STAGE.wavplayer=         post-build
-SUBST_FILES.wavplayer=         xboard.conf
-SUBST_SED.wavplayer=           -e 's,aplay -q,${WAVPLAYER},g'
-
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/cmail ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/xboard.conf ${DESTDIR}${PREFIX}/share/examples/xboard
@@ -73,7 +71,6 @@ post-install:
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 

Index: pkgsrc/games/xboard/PLIST
diff -u pkgsrc/games/xboard/PLIST:1.8 pkgsrc/games/xboard/PLIST:1.9
--- pkgsrc/games/xboard/PLIST:1.8       Tue May  3 02:39:30 2016
+++ pkgsrc/games/xboard/PLIST   Mon Jan 13 15:46:26 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/05/03 02:39:30 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/01/13 15:46:26 hauke Exp $
 bin/cmail
 bin/xboard
 info/xboard.info
@@ -26,7 +26,6 @@ share/games/xboard/sounds/pop2.wav
 share/games/xboard/sounds/roar.wav
 share/games/xboard/sounds/slap.wav
 share/games/xboard/sounds/woodthunk.wav
-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
@@ -36,16 +35,25 @@ share/games/xboard/themes/conf/shogi
 share/games/xboard/themes/conf/xq
 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
@@ -53,15 +61,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
@@ -70,21 +83,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
@@ -92,15 +121,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
@@ -109,9 +143,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
@@ -152,7 +193,7 @@ share/games/xboard/themes/shogi/WhiteRoo
 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/BlackAdvisor.svg
 share/games/xboard/themes/xiangqi/BlackCanon.svg
 share/games/xboard/themes/xiangqi/BlackElephant.svg
@@ -172,10 +213,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

Index: pkgsrc/games/xboard/distinfo
diff -u pkgsrc/games/xboard/distinfo:1.12 pkgsrc/games/xboard/distinfo:1.13
--- pkgsrc/games/xboard/distinfo:1.12   Mon Sep 26 02:35:18 2016
+++ pkgsrc/games/xboard/distinfo        Mon Jan 13 15:46:26 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2016/09/26 02:35:18 kamil Exp $
+$NetBSD: distinfo,v 1.13 2020/01/13 15:46:26 hauke Exp $
 
-SHA1 (xboard-4.8.0.tar.gz) = b44de53d704c2d524a3dc79a0c1afdd7414a3ff3
-RMD160 (xboard-4.8.0.tar.gz) = 2ac17ce9efa182b95f108ef78d83490cbe189327
-SHA512 (xboard-4.8.0.tar.gz) = fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81
-Size (xboard-4.8.0.tar.gz) = 3691531 bytes
-SHA1 (patch-Makefile.in) = 9f0b08576f612d31cb85b962ee0a3934f5909238
+SHA1 (xboard-4.9.1.tar.gz) = 9bcd31bb88877f56dff77b16e3d0cfd34cc18be0
+RMD160 (xboard-4.9.1.tar.gz) = 95d109876556fdb3a50086365e4254afc66c0381
+SHA512 (xboard-4.9.1.tar.gz) = 7c6f17450edc3f56d5987f6363da01633850b87b0d6664524a4697216dc66aa58f84314ba57ee68aebfbb01ef96995e34be4e98fb4a5124e3f5090690f91ae08
+Size (xboard-4.9.1.tar.gz) = 4015017 bytes
+SHA1 (patch-Makefile.in) = ee8fd5ad38ea2ea3969614ecc5c7ba90f8b990d8
 SHA1 (patch-gettext.h) = 8196f5401075d5f6aa0f2689743e80096f95b4b5

Index: pkgsrc/games/xboard/patches/patch-Makefile.in
diff -u pkgsrc/games/xboard/patches/patch-Makefile.in:1.2 pkgsrc/games/xboard/patches/patch-Makefile.in:1.3
--- pkgsrc/games/xboard/patches/patch-Makefile.in:1.2   Tue May  3 02:39:30 2016
+++ pkgsrc/games/xboard/patches/patch-Makefile.in       Mon Jan 13 15:46:26 2020
@@ -1,13 +1,14 @@
-$NetBSD: patch-Makefile.in,v 1.2 2016/05/03 02:39:30 mef Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2020/01/13 15:46:26 hauke Exp $
 
 (1)
 To avoid "ld: cannot find -ldl", which is not necessary for *BSD
 (2)
 Let pkgsrc framework deal with config file.
+Note we still need to provide configure with PKG_SYSCONFDIR, though.
 
---- Makefile.in.orig   2014-10-25 00:20:31.000000000 +0900
-+++ Makefile.in        2016-05-03 09:42:35.000000000 +0900
-@@ -532,7 +532,7 @@ xboard_SOURCES = backend.c backend.h bac
+--- Makefile.in.orig   2016-05-15 17:18:04.000000000 +0000
++++ Makefile.in
+@@ -542,7 +542,7 @@ xboard_SOURCES = backend.c backend.h bac
  
  ###
  SUBDIRS = po
@@ -16,7 +17,7 @@ Let pkgsrc framework deal with config fi
  EXTRA_DIST = pixmaps themes png sounds winboard \
        xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
        xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
-@@ -551,7 +551,7 @@ xboard_TEXINFOS = copyright.texi
+@@ -561,7 +561,7 @@ xboard_TEXINFOS = copyright.texi
  man6_MANS = xboard.man
  
  ### config file
@@ -25,10 +26,10 @@ Let pkgsrc framework deal with config fi
  
  ### icon files
  icondir = @ICONSDIR@
-@@ -660,7 +660,7 @@ dist_sounds_DATA = \
-   sounds/cymbal.wav     sounds/pop2.wav   sounds/slap.wav     sounds/ding1.wav      sounds/laser.wav \
+@@ -692,7 +692,7 @@ dist_sounds_DATA = \
    sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav
  
+ @OSX_APP_TRUE@macportsprefix = $(shell which port | sed s/[/]bin[/]port//)
 -all: config.h
 +all: config.h xboard.conf
        $(MAKE) $(AM_MAKEFLAGS) all-recursive

Added files:

Index: pkgsrc/games/xboard/options.mk
diff -u /dev/null pkgsrc/games/xboard/options.mk:1.1
--- /dev/null   Mon Jan 13 15:46:26 2020
+++ pkgsrc/games/xboard/options.mk      Mon Jan 13 15:46:26 2020
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2020/01/13 15:46:26 hauke Exp $
+#
+PKG_OPTIONS_VAR=        PKG_OPTIONS.xboard
+PKG_SUPPORTED_OPTIONS=  gtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtk)
+CONFIGURE_ARGS+=       --with-gtk
+.include "../../x11/gtk2/buildlink3.mk"
+
+.else
+
+CONFIGURE_ARGS+=       --without-gtk
+.include "../../mk/xaw.buildlink3.mk"
+BUILD_DEFS+=           XAW_TYPE
+.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
+CONFIGURE_ARGS+=       --with-Xaw3d
+.endif
+
+.endif

Prev by Date: CVS commit: pkgsrc/lang/ghc88
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/ghc88
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index