Hi all, this patch brings gnubg to the latest release.
I am not too sure about adding "-I$(top_srcdir)" to the DEFAULT_INCLUDES in the two Makefiles (for the two subdirectories), but I couldn't get it to compile otherwise. The affected includes are in subdirectories of the source, but the compilation step is executed from build_amd64, and then the already present "-I$(top_builddir)" resolves to .. (the top dir of build_amd64) and not the top dir of the source code subdir.
Any comments on that? gnubg runs fine otherwise. Thanks! Nils
Index: Makefile =================================================================== RCS file: /cvs/ports/games/gnubg/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile 29 Dec 2019 23:56:59 -0000 1.10 +++ Makefile 14 Jul 2020 22:32:30 -0000 @@ -1,12 +1,11 @@ # $OpenBSD: Makefile,v 1.10 2019/12/29 23:56:59 ajacoutot Exp $ COMMENT = GNU Backgammon -V = 1.05.002 +V = 1.06.002 DISTNAME = gnubg-release-$V-sources PKGNAME = gnubg-$V CATEGORIES = games x11 -HOMEPAGE = http://gnubg.org/ -REVISION = 7 +HOMEPAGE = https://www.gnu.org/software/gnubg/ # GPLv3+ PERMIT_PACKAGE = Yes @@ -24,7 +23,7 @@ WANTLIB += xcb-present xcb-render xcb-sh WANTLIB += xshmfence z WANTLIB += ${MODPY_WANTLIB} -MASTER_SITES = http://gnubg.org/media/sources/ +MASTER_SITES = ftp://ftp.gnu.org/gnu/gnubg/ MODULES = lang/python BUILD_DEPENDS = devel/gettext,-tools Index: distinfo =================================================================== RCS file: /cvs/ports/games/gnubg/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 7 Oct 2016 21:49:45 -0000 1.1.1.1 +++ distinfo 14 Jul 2020 22:32:30 -0000 @@ -1,2 +1,2 @@ -SHA256 (gnubg-release-1.05.002-sources.tar.gz) = ssX5RXoCOiKXCLt4iu5vcSQoyRHhmfMvsH86g9bItgs= -SIZE (gnubg-release-1.05.002-sources.tar.gz) = 15092499 +SHA256 (gnubg-release-1.06.002-sources.tar.gz) = zhsLDBkAcXzFmAMqFM+MDuYPryTYQ2izmSLAECmDvIc= +SIZE (gnubg-release-1.06.002-sources.tar.gz) = 13163681 Index: patches/patch-board3d_Makefile_in =================================================================== RCS file: patches/patch-board3d_Makefile_in diff -N patches/patch-board3d_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-board3d_Makefile_in 14 Jul 2020 22:32:30 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: board3d/Makefile.in +--- board3d/Makefile.in.orig ++++ board3d/Makefile.in +@@ -151,7 +151,7 @@ AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_srcdir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__maybe_remake_depfiles = depfiles + am__depfiles_remade = ./$(DEPDIR)/libboard3d_la-drawboard3d.Plo \ Index: patches/patch-board3d_font3d_c =================================================================== RCS file: /cvs/ports/games/gnubg/patches/patch-board3d_font3d_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-board3d_font3d_c --- patches/patch-board3d_font3d_c 7 Oct 2016 21:49:45 -0000 1.1.1.1 +++ patches/patch-board3d_font3d_c 14 Jul 2020 22:32:30 -0000 @@ -3,8 +3,9 @@ $OpenBSD: patch-board3d_font3d_c,v 1.1.1 We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera fonts. Thus stop building dynamically allocated paths for fonts. ---- board3d/font3d.c.orig Sun Apr 5 10:05:29 2015 -+++ board3d/font3d.c Sun Apr 5 10:10:56 2015 +Index: board3d/font3d.c +--- board3d/font3d.c.orig ++++ board3d/font3d.c @@ -73,7 +73,6 @@ static int RenderGlyph(const FT_Outline * pOutline); int CreateNumberFont(OGLFont ** ppFont, const char *fontFile, int pitch, float size, float heightRatio) @@ -33,10 +34,10 @@ fonts. Thus stop building dynamically a CreateFontText(OGLFont ** ppFont, const char *text, const char *fontFile, int pitch, float size, float heightRatio) { - char *filename; - FT_Library ftLib; if (FT_Init_FreeType(&ftLib)) -@@ -103,13 +98,10 @@ CreateFontText(OGLFont ** ppFont, const char *text, co + return 0; +@@ -102,13 +97,10 @@ CreateFontText(OGLFont ** ppFont, const char *text, co free(*ppFont); *ppFont = (OGLFont *) malloc(sizeof(OGLFont)); Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/games/gnubg/patches/patch-configure,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-configure --- patches/patch-configure 7 Oct 2016 21:49:45 -0000 1.1.1.1 +++ patches/patch-configure 14 Jul 2020 22:32:30 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-configure,v 1.1.1.1 2016 Remove hardcoded CFLAGS ---- configure.orig Mon Oct 3 11:08:53 2016 -+++ configure Mon Oct 3 11:09:09 2016 -@@ -17556,10 +17556,6 @@ else +Index: configure +--- configure.orig ++++ configure +@@ -18466,10 +18466,6 @@ else $as_echo "yes" >&6; } fi Index: patches/patch-doc_Makefile_in =================================================================== RCS file: /cvs/ports/games/gnubg/patches/patch-doc_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 7 Oct 2016 21:49:45 -0000 1.1.1.1 +++ patches/patch-doc_Makefile_in 14 Jul 2020 22:32:30 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-doc_Makefile_in,v 1.1.1. "install-data-hook" compresses manual pages. Stop doing that. ---- doc/Makefile.in.orig Sat Oct 1 15:05:36 2016 -+++ doc/Makefile.in Sat Oct 1 15:06:26 2016 -@@ -616,7 +616,6 @@ info-am: +Index: doc/Makefile.in +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -636,7 +636,6 @@ info-am: install-data-am: install-gnubg_helpDATA install-gnubg_imageDATA \ install-man @$(NORMAL_INSTALL) Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_Makefile_in 14 Jul 2020 22:32:30 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: lib/Makefile.in +--- lib/Makefile.in.orig ++++ lib/Makefile.in +@@ -143,7 +143,7 @@ AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_srcdir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__maybe_remake_depfiles = depfiles + am__depfiles_remade = ./$(DEPDIR)/cache.Plo ./$(DEPDIR)/isaac.Plo \ Index: patches/patch-render_c =================================================================== RCS file: /cvs/ports/games/gnubg/patches/patch-render_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-render_c --- patches/patch-render_c 7 Oct 2016 21:49:45 -0000 1.1.1.1 +++ patches/patch-render_c 14 Jul 2020 22:32:30 -0000 @@ -3,13 +3,14 @@ $OpenBSD: patch-render_c,v 1.1.1.1 2016/ We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera fonts. Thus stop building dynamically allocated paths for fonts. ---- render.c.orig Sun Oct 19 23:24:53 2014 -+++ render.c Tue Apr 7 11:21:30 2015 -@@ -52,14 +52,6 @@ +Index: render.c +--- render.c.orig ++++ render.c +@@ -53,14 +53,6 @@ static randctx rc; #define RAND irand( &rc ) --#if HAVE_FREETYPE +-#if defined(HAVE_FREETYPE) -#define FONT_VERA "fonts/Vera.ttf" -#define FONT_VERA_SERIF_BOLD "fonts/VeraSeBd.ttf" -#if 0 /* unused for now */ @@ -20,7 +21,7 @@ fonts. Thus stop building dynamically a /* aaanPositions[Clockwise][x][point number][x, y. deltay] */ int positions[2][30][3] = { { {BAR_X, BAR_Y_1, -CHEQUER_HEIGHT}, /* bar - player 1 */ -@@ -1475,15 +1467,11 @@ RenderLabels(renderdata * prd, unsigned char *puch, in +@@ -1480,15 +1472,11 @@ RenderLabels(renderdata * prd, unsigned char *puch, in FT_Face ftf; int i; FT_Glyph aftg[10]; @@ -37,7 +38,7 @@ fonts. Thus stop building dynamically a if (FT_Set_Pixel_Sizes(ftf, 0, prd->nSize * 5 / 2)) { RenderBasicLabels(prd, puch, nStride, iStart, iEnd, iDelta); -@@ -1761,10 +1749,8 @@ RenderChequerLabels(renderdata * prd, unsigned char *p +@@ -1766,10 +1754,8 @@ RenderChequerLabels(renderdata * prd, unsigned char *p FT_Face ftf; FT_Glyph aftg[10]; int fFreetype = FALSE; @@ -49,7 +50,7 @@ fonts. Thus stop building dynamically a fFreetype = TRUE; for (i = 0; i < 10; i++) { FT_Load_Char(ftf, '0' + i, FT_LOAD_RENDER); -@@ -1773,7 +1759,6 @@ RenderChequerLabels(renderdata * prd, unsigned char *p +@@ -1778,7 +1764,6 @@ RenderChequerLabels(renderdata * prd, unsigned char *p FT_Done_Face(ftf); } @@ -57,9 +58,11 @@ fonts. Thus stop building dynamically a #endif for (i = 0; i < 12; i++) { -@@ -1932,8 +1917,7 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch, +@@ -1935,10 +1920,8 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch, + FT_Face ftf; + FT_Glyph aftg[10], aftgSmall[10], aftgTiny[10]; int fFreetype = FALSE; - char *file; +- char *file; - file = BuildFilename(FONT_VERA_SERIF_BOLD); - if (!FT_New_Face(ftl, file, 0, &ftf) && !FT_Set_Pixel_Sizes(ftf, 0, 3 * prd->nSize)) { @@ -67,7 +70,7 @@ fonts. Thus stop building dynamically a fFreetype = TRUE; for (i = 0; i < 10; i++) { -@@ -1950,7 +1934,6 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch, +@@ -1962,7 +1945,6 @@ RenderCubeFaces(renderdata * prd, unsigned char *puch, FT_Done_Face(ftf); } @@ -75,9 +78,11 @@ fonts. Thus stop building dynamically a #endif for (i = 0; i < 6; i++) { -@@ -2010,8 +1993,7 @@ RenderResignFaces(renderdata * prd, unsigned char *puc +@@ -2038,10 +2020,8 @@ RenderResignFaces(renderdata * prd, unsigned char *puc + FT_Face ftf; + FT_Glyph aftg[10], aftgSmall[10]; int fFreetype = FALSE; - char *file; +- char *file; - file = BuildFilename(FONT_VERA_SERIF_BOLD); - if (!FT_New_Face(ftl, file, 0, &ftf) && !FT_Set_Pixel_Sizes(ftf, 0, 4 * prd->nSize)) { @@ -85,7 +90,7 @@ fonts. Thus stop building dynamically a fFreetype = TRUE; for (i = 0; i < 10; i++) { -@@ -2028,7 +2010,6 @@ RenderResignFaces(renderdata * prd, unsigned char *puc +@@ -2058,7 +2038,6 @@ RenderResignFaces(renderdata * prd, unsigned char *puc FT_Done_Face(ftf); }