Attachment 147188 Details for Bug 193271 – r366198: Patch: perl; options overhaul; preparation for slave-port (xboard-devel) v2

[patch] r366198: Patch: perl; options overhaul; preparation for slave-port (xboard-devel) v2

v2_xboard.r366198.diff (text/plain), 6.39 KB, created by Kalten on 2014-09-10 19:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kalten

Created: 2014-09-10 19:11:23 UTC

Size: 6.39 KB

patch

obsolete

>--- Makefile.orig	2014-08-27 21:20:53.000000000 +0200
>+++ Makefile	2014-09-10 02:51:56.000000000 +0200
>@@ -1,71 +1,134 @@
> # Created by: xaa@stack.nl
> # $FreeBSD: head/games/xboard/Makefile 366198 2014-08-26 10:35:00Z johans $
> 
>-PORTNAME=	xboard
>-PORTVERSION=	4.7.3
>-PORTREVISION=	1
>-CATEGORIES=	games
>-MASTER_SITES=	GNU
>-
>-MAINTAINER=	johans@FreeBSD.org
>-COMMENT=	X frontend for Crafty, GNUChess, Chess Servers, or e-mail chess
>-
>-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
>-
>-OPTIONS_DEFINE=	NLS ZIPPY CRAFTY FAIRYMAX GNUCHESS KNIGHTCAP PHALANX DOCS
>-OPTIONS_DEFAULT=
>-OPTIONS_SUB=	yes
>+PORTNAME?=	xboard
>+PORTVERSION?=	4.7.3
>+PORTREVISION?=	2
>+PORTEPOCH?=
>+CATEGORIES?=	games
>+MASTER_SITES?=	GNU
>+
>+MAINTAINER?=	johans@FreeBSD.org
>+COMMENT?=	X frontend for Crafty, GNUChess, Chess Servers, or e-mail chess
>+
>+LICENSE?=	GPLv3
>+
>+LIB_DEPENDS?=	libcairo.so:${PORTSDIR}/graphics/cairo
>+
>+CONFLICTS?=	xboard-devel-[0-9]*
>+
>+OPTIONS_DEFINE?=	NLS DOCS ZIPPY
>+OPTIONS_SINGLE?=	FRONTEND
>+OPTIONS_SINGLE_FRONTEND?=	XAW XAW3D GTK2
>+OPTIONS_GROUP?=	ENGINES
>+OPTIONS_GROUP_ENGINES?=	FAIRYMAX CRAFTY GNUCHESS KNIGHTCAP PHALANX
>+OPTIONS_RADIO?=	SOUND
>+OPTIONS_RADIO_SOUND?=	SOX ALSA
>+OPTIONS_DEFAULT?=	XAW
>+OPTIONS_SUB?=	yes
> ZIPPY_DESC=	Add Zippy capability (computer player on ICS)
>+ENGINES_DESC=	Chess Engines
> CRAFTY_DESC=	Install crafty engine
>-FAIRYMAX_DESC=	Install fairymax engine
>+FAIRYMAX_DESC=	Install fairymax engine (many chess variants)
> GNUCHESS_DESC=	Install GnuChess engine
> KNIGHTCAP_DESC=	Install KnightCap engine
> PHALANX_DESC=	Install phalanx engine
>-NLS_USES=		gettext
>-NLS_CONFIGURE_ENABLE=	nls
>-ZIPPY_CONFIGURE_ENABLE=	zippy
>+FRONTEND_DESC=	Fornt End
>+XAW_DESC=	Xaw GUI toolkit support (default)
>+XAW3D_DESC=	Xaw3d GUI toolkit support (not fully supported)
>+GTK2_DESC=	GTK+ 2 GUI toolkit support (experimental)
>+SOUND_DESC=	Sound Output (optional)
>+SOX_DESC=	SoX audio support
> CRAFTY_RUN_DEPENDS+=	crafty:${PORTSDIR}/games/crafty
> FAIRYMAX_RUN_DEPENDS+=	fairymax:${PORTSDIR}/games/fairymax
> GNUCHESS_RUN_DEPENDS+=	gnuchess:${PORTSDIR}/games/gnuchess
> KNIGHTCAP_RUN_DEPENDS+=	KnightCap:${PORTSDIR}/games/KnightCap
> PHALANX_RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/phalanx
>+XAW3D_DEPENDS+=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
>+SOX_RUN_DEPENDS+=	play:${PORTSDIR}/audio/sox
>+ALSA_RUN_DEPENDS+=	aplay:${PORTSDIR}/audio/alsa-utils
>+NLS_USES=		gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+ZIPPY_CONFIGURE_ENABLE=	zippy
>+XAW_CONFIGURE_WITH=	Xaw
>+XAW3D_CONFIGURE_WITH=	Xaw3d
>+GTK2_CONFIGURE_WITH=	gtk
>+
>+.include <bsd.port.options.mk>
> 
>-USES=		desktop-file-utils makeinfo perl5 pkgconfig shared-mime-info
>-USE_XORG=	xt xpm xaw
>-USE_GNOME=	librsvg2
>+USES+=		desktop-file-utils makeinfo perl5 pkgconfig shared-mime-info
>+USE_XORG+=	xt xpm
>+USE_GNOME+=	librsvg2
>+.if ${PORT_OPTIONS:MXAW}
>+USE_XORG+=	xaw
>+.endif
>+.if ${PORT_OPTIONS:MGTK2}
>+USE_GNOME+=	gtk20
>+.endif
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=MKDIR_P="${MKDIR}" PERLPATH=${LOCALBASE}/bin
>+CONFIGURE_ARGS+=MKDIR_P="${MKDIR}" PERLPATH=${PERL}
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INFO=		xboard
> USE_PERL5=	build
> INSTALLS_ICONS=	yes
>-DATADIR=	${PREFIX}/share/games/${PORTNAME}
>+DATADIR?=	${PREFIX}/share/games/${PORTNAME}
> 
>-PORTDOCS=	AUTHORS ChangeLog NEWS README SHORTLOG TODO
>+PORTDOCS=	AUTHORS COPYING COPYRIGHT ChangeLog DIFFSTAT FAQ.html NEWS README SHORTLOG TODO
> 
> BROKEN_sparc64=	Does not install on sparc64
> 
>-.include <bsd.port.options.mk>
>-
> .if ${PORT_OPTIONS:MZIPPY}
> PORTDOCS+=	zippy.README
> .endif
> 
>+.if ${PORT_OPTIONS:MNLS}
>+PORTDOCS+=	ABOUT-NLS
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} -e 's/fairymax/gnuchessx/' ${WRKSRC}/xboard.conf.in
>+	@${ECHO_CMD} -n "" > ${WRKSRC}/engineEntries.txt
>+.if ${PORT_OPTIONS:MCRAFTY}
>+	@${ECHO_CMD} "\"Crafty\" -fcp crafty\\" >> ${WRKSRC}/engineEntries.txt
>+	@${ECHO_CMD} -n "crafty" > ${WRKSRC}/firstEngine.txt
>+.endif
>+.if ${PORT_OPTIONS:MGNUCHESS}
>+	@${ECHO_CMD} "\"GNU Chess\" -fcp gnuchess\\" >> ${WRKSRC}/engineEntries.txt
>+	@${ECHO_CMD} -n "gnuchess" > ${WRKSRC}/firstEngine.txt
>+.endif
>+.if ${PORT_OPTIONS:MKNIGHTCAP}
>+	@${ECHO_CMD} "\"KnightCap\" -fcp \"KnightCap -n -X -A -f ${PREFIX}/share/games/KnightCap/coeffs.dat\"\\" >> ${WRKSRC}/engineEntries.txt
>+	@${ECHO_CMD} -n "KnightCap" > ${WRKSRC}/firstEngine.txt
>+.endif
>+.if ${PORT_OPTIONS:MPHALANX}
>+	@${ECHO_CMD} "\"Phalanx\" -fcp phalanx\\" >> ${WRKSRC}/engineEntries.txt
>+	@${ECHO_CMD} -n "phalanx" > ${WRKSRC}/firstEngine.txt
>+.endif
>+.if ${PORT_OPTIONS:MFAIRYMAX}
>+	@${ECHO_CMD} "\"FairyMax\" -fcp fairymax\\" >> ${WRKSRC}/engineEntries.txt
>+	@${ECHO_CMD} -n "fairymax" > ${WRKSRC}/firstEngine.txt
>+.endif
>+	@firstEngine=`cat ${WRKSRC}/firstEngine.txt` && \
>+	 ${REINPLACE_CMD} -e "s|$-firstChessProgram$ .*|\1 $${firstEngine}|" ${WRKSRC}/xboard.conf.in
>+	@engineEntries=`cat ${WRKSRC}/engineEntries.txt` && \
>+	 ${REINPLACE_CMD} -e "s|$firstChessProgramNames[ 	]*{$[ 	]*.*|\1$${engineEntries}}|" ${WRKSRC}/xboard.conf.in
> 	@${REINPLACE_CMD} -e '/^#include..malloc.h/d' \
> 		${WRKSRC}/engineoutput.c ${WRKSRC}/uci.c
>-	@${REINPLACE_CMD} -e 's:INSTALL.*sysconfdir):&/$$$$files.dist:' \
>-		${WRKSRC}/Makefile.in
> .if ${PORT_OPTIONS:MZIPPY}
> 	@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/OPTION_ZIPPY__patch-xboard.texi
> 	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' ${WRKSRC}/xboard.texi
> .endif
>+.if ${PORT_OPTIONS:MSOX}
>+	@${REINPLACE_CMD} -e "s|$soundProgram$ .*|\1 \"play -q\"|" ${WRKSRC}/xboard.conf.in
>+.elif ${PORT_OPTIONS:MALSA}
>+	@${REINPLACE_CMD} -e "s|$soundProgram$ .*|\1 \"aplay -q\"|" ${WRKSRC}/xboard.conf.in
>+.else
>+	@${REINPLACE_CMD} -e "s|$soundProgram$ .*|\1 \"\"|" ${WRKSRC}/xboard.conf.in
>+.endif
> 
> post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/cmail ${STAGEDIR}${PREFIX}/bin/
>-	${MV} ${STAGEDIR}${PREFIX}/etc/xboard.conf.dist \
>+	${MV} ${STAGEDIR}${PREFIX}/etc/xboard.conf \
> 		 ${STAGEDIR}${PREFIX}/etc/xboard.conf.sample
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>--- /dev/null	2014-09-10 17:46:41.000000000 +0200
>+++ files/patch-xboard.conf.in	2014-08-15 04:53:58.000000000 +0200
>@@ -0,0 +1,15 @@
>+--- xboard.conf.in.orig	2014-01-06 18:15:22.000000000 +0100
>++++ xboard.conf.in	2014-08-15 04:53:01.000000000 +0200
>+@@ -69,11 +69,7 @@
>+ ;
>+ -firstChessProgram fairymax
>+ -secondChessProgram fairymax
>+--firstChessProgramNames {fairymax
>+-"Fruit 2.1" -fcp fruit -fUCI
>+-"Crafty" -fcp crafty
>+-"GNU Chess" -fcp gnuchess
>+-}
>++-firstChessProgramNames {}
>+ -niceEngines 0
>+ -polyglotDir ""
>+ -adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB'

Actions: View | Diff

Attachments on bug 193271: 146703 | 146705 | 146706 | 147188 | 147189 | 147190