Index: head/games/xoids/Makefile
===================================================================
--- head/games/xoids/Makefile	(revision 564957)
+++ head/games/xoids/Makefile	(revision 564958)
@@ -1,34 +1,33 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
 PORTNAME=	xoids
 PORTVERSION=	1.5
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games
 
 MAINTAINER=	ports@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
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${CP} ${WRKSRC}/xoids.1x ${WRKSRC}/xoids.man
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/xorgramana/Makefile
===================================================================
--- head/games/xorgramana/Makefile	(revision 564957)
+++ head/games/xorgramana/Makefile	(revision 564958)
@@ -1,47 +1,44 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xorgramana
 PORTVERSION=	0.0.8
 PORTREVISION=	10
 CATEGORIES=	games
 MASTER_SITES=	http://www.jwm-art.net/XorGramana/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	XorGramana-${PORTVERSION}
 
 MAINTAINER=	amdmi3@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
 
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 PORTDATA=	*
 
 DESKTOP_ENTRIES="XorGramana" \
 		"Logic word puzzle game set inside a series of mazes" \
 		"${DATADIR}/GFX/x.png" \
 		"xorgramana" \
 		"Game;LogicGame;" \
 		false
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GFX/|${DATADIR}/&|' ${WRKSRC}/icons.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "data GFX" ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/xorgramana/files/patch-Makefile
===================================================================
--- head/games/xorgramana/files/patch-Makefile	(revision 564957)
+++ head/games/xorgramana/files/patch-Makefile	(revision 564958)
@@ -1,40 +1,40 @@
 --- Makefile.orig	2009-04-01 17:46:11.000000000 +0400
 +++ Makefile	2009-04-02 20:31:54.000000000 +0400
 @@ -1,13 +1,13 @@
  
 -PREFIX=/usr/local/
 -BINDIR=$(PREFIX)bin/
 -SHAREDIR=$(PREFIX)share/XorGramana/
 -MAPDIR=$(SHAREDIR)maps/
 +PREFIX?=/usr/local
 +BINDIR=$(PREFIX)/bin
 +SHAREDIR=$(PREFIX)/share/xorgramana/data
 +MAPDIR=$(SHAREDIR)/maps
  
 -SDL_CFLAGS := $(shell sdl-config --cflags)
 -SDL_LDFLAGS := $(shell sdl-config --libs)
 +SDL_CFLAGS := $(shell ${SDL_CONFIG} --cflags)
 +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
 @@ -23,14 +23,14 @@
  
  
  PROG := xorgramana
 -CC := gcc
 +CC ?= gcc
  
  SRC    := $(wildcard *.c)
  OBJS   := $(patsubst %.c, %.o, $(SRC))
  HEADERS:= $(wildcard *.h)
  
  $(PROG): $(OBJS)
 -	$(CC) $(CFLAGS) $(OBJS) -o $(PROG) $(SDL_LDFLAGS)
 +	$(CC) $(CFLAGS) $(OBJS) -o $(PROG) $(SDL_LDFLAGS) -lGLU -lSDL_image
  	
  %.o : %.c $(HEADERS)
  	$(CC) $(CFLAGS) -c $<
Index: head/games/xtic/Makefile
===================================================================
--- head/games/xtic/Makefile	(revision 564957)
+++ head/games/xtic/Makefile	(revision 564958)
@@ -1,24 +1,23 @@
 # Created by: asami
 # $FreeBSD$
 
 PORTNAME=	xtic
 PORTVERSION=	1.12
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	XCONTRIB/games
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@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:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure.h
 
 .include <bsd.port.mk>