Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-board/xboard/files: xboard-4.5.1-gentoo.patch
Date: Mon, 02 May 2011 15:27:32
Message-Id: 20110502152721.BC09D20057@flycatcher.gentoo.org
1 mr_bones_ 11/05/02 15:27:21
2
3 Added: xboard-4.5.1-gentoo.patch
4 Log:
5 version bump
6
7 (Portage version: 2.1.9.42/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-board/xboard/files/xboard-4.5.1-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.5.1-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.5.1-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: xboard-4.5.1-gentoo.patch
16 ===================================================================
17 diff -ru xboard-4.5.1.orig/Makefile.am xboard-4.5.1/Makefile.am
18 --- xboard-4.5.1.orig/Makefile.am 2011-02-08 00:07:46.000000000 -0500
19 +++ xboard-4.5.1/Makefile.am 2011-04-07 01:59:35.259757241 -0400
20 @@ -33,14 +33,10 @@
21 $(ZPY)
22 xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@
23
24 -EXTRA_DIST = pixmaps bitmaps winboard sounds filebrowser/README \
25 - xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
26 - COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \
27 - xboard.conf.in SHORTLOG DIFFSTAT history.c
28 -
29 DISTCLEANFILES = stamp-h
30
31 -AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/"'
32 +bitmapdir = $(datadir)
33 +AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(bitmapdir)/"'
34
35 info_TEXINFOS = xboard.texi
36 xboard_TEXINFOS = copyright.texi
37 @@ -54,21 +50,20 @@
38
39 ### icon files
40
41 -icondir = $(datadir)/icons/hicolor/48x48/apps
42 +icondir = /usr/share/icons/hicolor/48x48/apps
43 dist_icon_DATA = xboard.png
44 -svgicondir = $(datadir)/icons/hicolor/scalable/apps
45 +svgicondir = /usr/share/icons/hicolor/scalable/apps
46 dist_svgicon_DATA = xboard.svg
47
48
49 ### desktop files for KDE and gnome
50
51 -Applicationsdir = $(datadir)/applications
52 +Applicationsdir = /usr/share/applications
53 Applications_DATA = xboard.desktop
54
55
56 ### directory and files to be used as bitmaps
57
58 -bitmapdir = $(datadir)/games/xboard/
59 dist_bitmap_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
60
61
62 diff -ru xboard-4.5.1.orig/configure.ac xboard-4.5.1/configure.ac
63 --- xboard-4.5.1.orig/configure.ac 2011-02-20 19:11:12.000000000 -0500
64 +++ xboard-4.5.1/configure.ac 2011-04-07 00:51:46.421901524 -0400
65 @@ -133,30 +133,17 @@
66
67 dnl | test if user wants ot use Xaw3d or Xaw
68
69 -dnl | add configure option for Xaw3d
70 -AC_ARG_WITH([Xaw3d],
71 - [AS_HELP_STRING([--with-Xaw3d],[use Xaw3d instead of Xaw])],
72 - [],
73 - [with_Xaw3d=no])
74 -
75 -dnl | check availability of Xaw3d
76 -XAW_LIBS=
77 -AS_IF([test x"$with_Xaw3d" != x"no"],
78 - [AC_CHECK_LIB([Xaw3d],
79 - [XawTextReplace],
80 - [AC_SUBST([XAW_LIBS],["-lXaw3d"])
81 - AC_DEFINE([USE_XAW3D], [1],
82 - [Define if you want to use Xaw3d])],
83 - [AC_MSG_ERROR([--with-Xaw3d was given, but test for Xaw3d failed. Make sure that you have Xaw3d installed, else you might want to try the configure option --without-Xaw3d])],
84 - [-lXaw])])
85 -dnl | no Xaw3d, check for Xaw
86 -if test x"$with_Xaw3d" = x"no" ; then
87 - AC_CHECK_HEADER(X11/Xaw/Dialog.h,xaw_headers="yes", xaw_headers="no")
88 - if test x"$xaw_headers" = x"no" ; then
89 - AC_MSG_ERROR([Xaw headers not found. Please install the Xaw package and headers.])
90 - fi
91 - XAW_LIBS="-lXaw"
92 +AC_ARG_WITH(Xaw3d,
93 +[ --with-Xaw3d use Xaw3d instead of Xaw],
94 +[ with_xaw3d="$withval"], [enable_xaw3d="no"])
95 +
96 +if test "$withval" = yes; then
97 + AC_DEFINE(USE_XAW3D)
98 + XAW_LIBS="-lXaw3d"
99 +else
100 + XAW_LIBS="-lXaw"
101 fi
102 +
103 AC_SUBST(XAW_LIBS)
104
105 dnl | end Xaw/Xaw3d test
106 diff -ru xboard-4.5.1.orig/xboard.h xboard-4.5.1/xboard.h
107 --- xboard-4.5.1.orig/xboard.h 2011-02-03 11:36:36.000000000 -0500
108 +++ xboard-4.5.1/xboard.h 2011-04-07 00:51:46.422901324 -0400
109 @@ -104,7 +104,7 @@
110
111 #define BORDER_X_OFFSET 3
112 #define BORDER_Y_OFFSET 27
113 -#define FIRST_CHESS_PROGRAM "fairymax"
114 +#define FIRST_CHESS_PROGRAM "gnuchess"
115 #define SECOND_CHESS_PROGRAM "fairymax"
116 #define FIRST_DIRECTORY "."
117 #define SECOND_DIRECTORY "."