svn commit: r564958 - in head/games: xoids xorgramana xorgramana/files xtic

[Alexey Dokuchaev]

Author: danfe
Date: Thu Feb 11 15:21:52 2021
New Revision: 564958
URL: https://svnweb.freebsd.org/changeset/ports/564958

Log:
  Force -fcommon to unbreak the build against modern compilers: this code
  is old and entangled enough so fixing it properly does not look tenable.

Modified:
  head/games/xoids/Makefile
  head/games/xorgramana/Makefile
  head/games/xorgramana/files/patch-Makefile
  head/games/xtic/Makefile

Modified: head/games/xoids/Makefile
==============================================================================
--- head/games/xoids/Makefile	Thu Feb 11 15:21:17 2021	(r564957)
+++ head/games/xoids/Makefile	Thu Feb 11 15:21:52 2021	(r564958)
@@ -10,13 +10,12 @@ MASTER_SITES=	XCONTRIB/games
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	X Window Asteroids style game with full color pixmaps
 
-BROKEN_FreeBSD_13=	duplicate symbol: Big_O
-BROKEN_FreeBSD_14=	duplicate symbol: Big_O
 NOT_FOR_ARCHS=		mips64
 NOT_FOR_ARCHS_REASON=	unknown architecture
 
 USES=		imake xorg
-USE_XORG=	xpm
+USE_XORG=	x11 xpm
+CFLAGS+=	-fcommon
 
 PLIST_FILES=	bin/xoids \
 		man/man6/xoids.6.gz

Modified: head/games/xorgramana/Makefile
==============================================================================
--- head/games/xorgramana/Makefile	Thu Feb 11 15:21:17 2021	(r564957)
+++ head/games/xorgramana/Makefile	Thu Feb 11 15:21:52 2021	(r564958)
@@ -12,9 +12,6 @@ DISTNAME=	XorGramana-${PORTVERSION}
 MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Logic word puzzle game set inside a series of mazes
 
-BROKEN_FreeBSD_13=	duplicate symbol: player
-BROKEN_FreeBSD_14=	duplicate symbol: player
-
 USES=		gl gmake sdl tar:bzip2 
 USE_SDL=	sdl image
 USE_GL=		glu

Modified: head/games/xorgramana/files/patch-Makefile
==============================================================================
--- head/games/xorgramana/files/patch-Makefile	Thu Feb 11 15:21:17 2021	(r564957)
+++ head/games/xorgramana/files/patch-Makefile	Thu Feb 11 15:21:52 2021	(r564958)
@@ -17,7 +17,7 @@
 +SDL_LDFLAGS := $(shell ${SDL_CONFIG} --libs)
  
 -CFLAGS := -Wall -g2 $(SDL_CFLAGS) -lGLU -lSDL_image -DDATADIR=\"$(SHAREDIR)\"
-+CFLAGS += -Wall $(SDL_CFLAGS) -DDATADIR=\"$(SHAREDIR)\"
++CFLAGS += -Wall -fcommon $(SDL_CFLAGS) -DDATADIR=\"$(SHAREDIR)\"
  
  #       -DPLAYER_XY_DEBUG
  #	-DMAP_DEBUG

Modified: head/games/xtic/Makefile
==============================================================================
--- head/games/xtic/Makefile	Thu Feb 11 15:21:17 2021	(r564957)
+++ head/games/xtic/Makefile	Thu Feb 11 15:21:52 2021	(r564958)
@@ -11,11 +11,10 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	X version of a simple but tricky board game
 
-BROKEN_FreeBSD_13=	duplicate symbol: board
-BROKEN_FreeBSD_14=	duplicate symbol: board
-
 USES=		imake xorg
-USE_XORG=	xaw
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
+CFLAGS+=	-fcommon
+
 PLIST_FILES=	bin/xtic man/man1/xtic.1.gz
 
 post-patch: