View | Details | Raw Unified | Return to bug 203690 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +5 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/games/xboard-devel/Makefile 397976 2015-09-26 13:59:59Z bapt $
1
# $FreeBSD: head/games/xboard-devel/Makefile 397976 2015-09-26 13:59:59Z bapt $
2
2
3
PORTNAME=	xboard-devel
3
PORTNAME=	xboard-devel
4
PORTVERSION=	4.7.3.20140909.8
4
PORTVERSION=	4.8.0.20150806.3
5
PORTREVISION=
5
PORTREVISION=
6
PORTEPOCH=
6
PORTEPOCH=
7
MASTER_SITES=	http://freeheimdall.spdns.org/files/
7
MASTER_SITES=	http://freeheimdall.spdns.org/files/
Lines 14-19 Link Here
14
14
15
LICENSE=	GPLv3
15
LICENSE=	GPLv3
16
16
17
LIB_DEPENDS?=	libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
18
17
CONFLICTS=	xboard-[0-9]*
19
CONFLICTS=	xboard-[0-9]*
18
20
19
MASTERDIR=	${.CURDIR}/../xboard
21
MASTERDIR=	${.CURDIR}/../xboard
Lines 21-30 Link Here
21
PATCHDIR=	${.CURDIR}/files
23
PATCHDIR=	${.CURDIR}/files
22
PLIST=	${.CURDIR}/pkg-plist
24
PLIST=	${.CURDIR}/pkg-plist
23
25
24
COMMIT_HASH=	e677df0
26
COMMIT_HASH=	1f9d7ca
25
DATADIR=	${PREFIX}/share/games/xboard
27
DATADIR=	${PREFIX}/share/games/xboard
26
DOCSDIR=	${PREFIX}/share/doc/xboard
28
DOCSDIR=	${PREFIX}/share/doc/xboard
27
XBOARDCONF=	${WRKSRC}/xboard.conf.in
29
XBOARDCONF=	${WRKSRC}/xboard.conf
28
30
29
USES=		autoreconf desktop-file-utils gettext-tools gmake shared-mime-info shebangfix
31
USES=		autoreconf desktop-file-utils gettext-tools gmake shared-mime-info shebangfix
30
SHEBANG_FILES=	texi2man
32
SHEBANG_FILES=	texi2man
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (xboard-e677df0.tar.gz) = 54432a3a53076b0ac6ba6689f8e90e440108ae479846ae46d60e5b857afe59be
1
SHA256 (xboard-1f9d7ca.tar.gz) = 87c48b2a03b0293be47c353ad8e1ff2cbc90df92ae89ace85d5947a9f4bf2a54
2
SIZE (xboard-e677df0.tar.gz) = 3039491
2
SIZE (xboard-1f9d7ca.tar.gz) = 3704966
(-)pkg-plist (-24 / +24 lines)
Lines 1-4 Link Here
1
@postunexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true
2
@owner root
1
@owner root
3
@group wheel
2
@group wheel
4
bin/xboard
3
bin/xboard
Lines 200-235 Link Here
200
%%NLS%%share/locale/da/LC_MESSAGES/xboard.mo
199
%%NLS%%share/locale/da/LC_MESSAGES/xboard.mo
201
%%NLS%%share/locale/de/LC_MESSAGES/xboard.mo
200
%%NLS%%share/locale/de/LC_MESSAGES/xboard.mo
202
%%NLS%%share/locale/es/LC_MESSAGES/xboard.mo
201
%%NLS%%share/locale/es/LC_MESSAGES/xboard.mo
202
%%NLS%%share/locale/fr/LC_MESSAGES/xboard.mo
203
%%NLS%%share/locale/it/LC_MESSAGES/xboard.mo
203
%%NLS%%share/locale/it/LC_MESSAGES/xboard.mo
204
%%NLS%%share/locale/nl/LC_MESSAGES/xboard.mo
204
%%NLS%%share/locale/nl/LC_MESSAGES/xboard.mo
205
%%NLS%%share/locale/pl/LC_MESSAGES/xboard.mo
205
%%NLS%%share/locale/ru/LC_MESSAGES/xboard.mo
206
%%NLS%%share/locale/ru/LC_MESSAGES/xboard.mo
207
%%NLS%%share/locale/sr/LC_MESSAGES/xboard.mo
206
%%NLS%%share/locale/tr/LC_MESSAGES/xboard.mo
208
%%NLS%%share/locale/tr/LC_MESSAGES/xboard.mo
207
%%NLS%%share/locale/uk/LC_MESSAGES/xboard.mo
209
%%NLS%%share/locale/uk/LC_MESSAGES/xboard.mo
208
%%NLS%%share/locale/vi/LC_MESSAGES/xboard.mo
210
%%NLS%%share/locale/vi/LC_MESSAGES/xboard.mo
209
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xboard.mo
211
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xboard.mo
210
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xboard.mo
212
%%NLS%%share/locale/zh_HK/LC_MESSAGES/xboard.mo
211
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xboard.mo
213
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xboard.mo
212
@dirrmtry share/locale/zh_HK/LC_MESSAGES
214
@dir share/locale/zh_HK/LC_MESSAGES
213
@dirrmtry share/locale/zh_HK
215
@dir share/locale/zh_HK
214
@dirrmtry %%DATADIR%%/pixmaps/textures
216
@dir %%DATADIR%%/pixmaps/textures
215
@dirrmtry %%DATADIR%%/pixmaps
217
@dir %%DATADIR%%/pixmaps
216
@dirrmtry %%DATADIR%%/sounds
218
@dir %%DATADIR%%/sounds
217
@dirrmtry %%DATADIR%%/themes/conf
219
@dir %%DATADIR%%/themes/conf
218
@dirrmtry %%DATADIR%%/themes/default
220
@dir %%DATADIR%%/themes/default
219
@dirrmtry %%DATADIR%%/themes/shogi
221
@dir %%DATADIR%%/themes/shogi
220
@dirrmtry %%DATADIR%%/themes/textures
222
@dir %%DATADIR%%/themes/textures
221
@dirrmtry %%DATADIR%%/themes/xiangqi
223
@dir %%DATADIR%%/themes/xiangqi
222
@dirrmtry %%DATADIR%%/themes
224
@dir %%DATADIR%%/themes
223
@dirrmtry %%DATADIR%%
225
@dir %%DATADIR%%
224
@dirrmtry share/games
226
@dir share/games
225
@dirrmtry share/icons/hicolor/48x48/apps
227
@dir share/icons/hicolor/48x48/apps
226
@dirrmtry share/icons/hicolor/48x48
228
@dir share/icons/hicolor/48x48
227
@dirrmtry share/icons/hicolor/scalable/apps
229
@dir share/icons/hicolor/scalable/apps
228
@dirrmtry share/icons/hicolor/scalable
230
@dir share/icons/hicolor/scalable
229
@dirrmtry share/icons/hicolor
231
@dir share/icons/hicolor
230
@dirrmtry share/icons
232
@dir share/icons
231
@dirrmtry share/mime/packages
233
@dir share/mime/packages
232
@dirrmtry share/mime
234
@dir share/mime
233
@sample etc/xboard.conf.sample
235
@sample etc/xboard.conf.sample
234
@postexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
235
@postunexec /usr/local/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || /usr/bin/true
(-)files/patch-Makefile.am (-8 / +16 lines)
Lines 1-30 Link Here
1
--- Makefile.am.orig	2014-07-02 14:34:53.000000000 +0200
1
--- Makefile.am.orig	2015-08-06 23:49:02.000000000 +0200
2
+++ Makefile.am	2014-08-21 22:40:05.000000000 +0200
2
+++ Makefile.am	2015-10-11 02:11:07.000000000 +0200
3
@@ -57,7 +57,7 @@
3
@@ -57,7 +57,7 @@
4
 ###
4
 ###
5
 
5
 
6
 SUBDIRS = po
6
 SUBDIRS = po
7
-xboard_LDADD = -ldl -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
7
-xboard_LDADD = -ldl -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
8
+xboard_LDADD = -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
8
+xboard_LDADD = -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @PANGOCAIRO_LIBS@
9
 
9
 
10
 EXTRA_DIST = pixmaps themes png sounds winboard \
10
 EXTRA_DIST = pixmaps themes png sounds winboard \
11
 	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
11
 	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
12
@@ -68,7 +68,7 @@
13
 DISTCLEANFILES = stamp-h
14
 
15
 GITVERSION=$(shell sh -c 'git describe --dirty --always 2>/dev/null')
16
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
17
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @PANGOCAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
18
 	    -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' -D__GIT_VERSION='"$(GITVERSION)"' \
19
             -DCONFIGURE_OPTIONS='"@CONFIGURE_OPTIONS@"' -DDATADIR='"$(datadir)/games/xboard"' $(headers)
20
 
12
@@ -179,7 +179,8 @@
21
@@ -179,7 +179,8 @@
13
 ### directory and files for themes (and other) configuration files
22
 ### directory and files for themes (and other) configuration files
14
 
23
 
15
 themesdir = $(datadir)/games/xboard/themes/conf
24
 themesdir = $(datadir)/games/xboard/themes/conf
16
-dist_themes_DATA = conf/shogi conf/xq conf/chu conf/ics conf/mini conf/mini.fen conf/sho conf/sho.fen
25
-dist_themes_DATA = conf/shogi conf/xq conf/ics conf/mini conf/mini.fen conf/sho conf/sho.fen
17
+dist_themes_DATA = conf/shogi conf/xq conf/chu conf/ics conf/mini conf/mini.fen conf/sho conf/sho.fen \
26
+dist_themes_DATA = conf/shogi conf/xq conf/chu conf/ics conf/mini conf/mini.fen conf/sho conf/sho.fen \
18
+                   conf/judkins conf/judkins.fen conf/xiangqi
27
+	    conf/judkins conf/judkins.fen conf/xiangqi
19
 
28
 
20
 ### directory and files for pixmaps
29
 ### directory and files for pixmaps
21
 
30
 
22
@@ -196,8 +197,12 @@
31
@@ -196,7 +197,12 @@
23
 soundsdir = $(gamedatadir)/sounds
32
 soundsdir = $(gamedatadir)/sounds
24
 dist_sounds_DATA = \
33
 dist_sounds_DATA = \
25
   sounds/cymbal.wav     sounds/pop2.wav   sounds/slap.wav     sounds/ding1.wav      sounds/laser.wav \
34
   sounds/cymbal.wav     sounds/pop2.wav   sounds/slap.wav     sounds/ding1.wav      sounds/laser.wav \
26
-  sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav
35
-  sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav
27
-
28
+  sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav \
36
+  sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav \
29
+  sounds/README         sounds/alarm.wav  sounds/challenge.wav sounds/channel.wav   sounds/channel1.wav \
37
+  sounds/README         sounds/alarm.wav  sounds/challenge.wav sounds/channel.wav   sounds/channel1.wav \
30
+  sounds/ching.wav      sounds/click.wav  sounds/draw.wav     sounds/drip.wav       sounds/kibitz.wav \
38
+  sounds/ching.wav      sounds/click.wav  sounds/draw.wav     sounds/drip.wav       sounds/kibitz.wav \
Lines 32-36 Link Here
32
+  sounds/shout.wav      sounds/squeak.wav sounds/sshout.wav   sounds/swish.wav      sounds/tell.wav \
40
+  sounds/shout.wav      sounds/squeak.wav sounds/sshout.wav   sounds/swish.wav      sounds/tell.wav \
33
+  sounds/thud.wav       sounds/unfinished.wav sounds/whipcrak.wav sounds/win.wav
41
+  sounds/thud.wav       sounds/unfinished.wav sounds/whipcrak.wav sounds/win.wav
34
 
42
 
35
 ### set correct dir in xboard.conf
43
 ### the man page depends on several files, so we add a special rule
36
 
44
 
(-)files/patch-configure.ac (+17 lines)
Added Link Here
1
--- configure.ac.orig	2015-08-06 23:49:02.000000000 +0200
2
+++ configure.ac	2015-10-11 02:07:35.000000000 +0200
3
@@ -123,10 +123,10 @@
4
 AS_IF( [test "x$PKGCONFIG" = xpkgconfig_not_found],
5
        AC_MSG_ERROR([cannot find pkg-config! Please install it.]))
6
 
7
-dnl | check for cairo and librsvg
8
-PKG_CHECK_MODULES([CAIRO], [ cairo >= 1.2.0 librsvg-2.0 >= 2.14.0 ])
9
-AC_SUBST(CAIRO_CFLAGS)
10
-AC_SUBST(CAIRO_LIBS)
11
+dnl | check for pangocairo and librsvg
12
+PKG_CHECK_MODULES([PANGOCAIRO], [ pangocairo >= 1.0.0 librsvg-2.0 >= 2.14.0 ])
13
+AC_SUBST(PANGOCAIRO_CFLAGS)
14
+AC_SUBST(PANGOCAIRO_LIBS)
15
 
16
 dnl | check which front end to use
17
 dnl | first check for gtk
(-)files/patch-xboard.conf.in (-15 lines)
Lines 1-15 Link Here
1
--- xboard.conf.in.orig	2014-07-02 14:34:53.000000000 +0200
2
+++ xboard.conf.in	2014-08-21 00:56:04.000000000 +0200
3
@@ -70,11 +70,7 @@
4
 ; Engines & adjudicatons in engine-engine games
5
 ;
6
 -firstChessProgram fairymax
7
--firstChessProgramNames {fairymax
8
-"Fruit 2.1" -fcp fruit -fUCI
9
-"Crafty" -fcp crafty
10
-"GNU Chess" -fcp gnuchess
11
-}
12
+-firstChessProgramNames {}
13
 -niceEngines 0
14
 -polyglotDir ""
15
 -adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB -pg ShowTbHits=true'
(-)files/patch-xboard.conf (+15 lines)
Added Link Here
1
--- xboard.conf.orig	2014-11-04 09:45:56.000000000 +0100
2
+++ xboard.conf	2014-11-04 09:46:05.000000000 +0100
3
@@ -74,11 +74,7 @@
4
 ; Engines & adjudicatons in engine-engine games
5
 ;
6
 -firstChessProgram fairymax
7
--firstChessProgramNames {fairymax
8
-"Fruit 2.1" -fcp fruit -fUCI
9
-"Crafty" -fcp crafty
10
-"GNU Chess" -fcp gnuchess
11
-}
12
+-firstChessProgramNames {}
13
 -niceEngines 0
14
 -polyglotDir ""
15
 -adapterCommand 'polyglot -noini -ec "%fcp" -ed "%fd" -uci NalimovCache=%defaultCacheSizeEGTB -pg ShowTbHits=true'

Return to bug 203690