From owner-svn-ports-all@freebsd.org  Sat Dec 24 00:06:02 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FC82C8EA1C;
 Sat, 24 Dec 2016 00:06:02 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CFDAB405;
 Sat, 24 Dec 2016 00:06:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBO060TK010940;
 Sat, 24 Dec 2016 00:06:00 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBO060uR010939;
 Sat, 24 Dec 2016 00:06:00 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201612240006.uBO060uR010939@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 24 Dec 2016 00:06:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429296 - head/games/openbor
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Dec 2016 00:06:02 -0000

Author: jbeich
Date: Sat Dec 24 00:06:00 2016
New Revision: 429296
URL: https://svnweb.freebsd.org/changeset/ports/429296

Log:
  games/openbor: unbreak on DragonFly after r428004
  
  In file included from source/webmlib/halloc/halloc.c:20:0:
  source/webmlib/halloc/align.h:42:25: error: conflicting types for 'max_align_t'
   typedef union max_align max_align_t;
                           ^
  In file included from source/webmlib/halloc/halloc.h:18:0,
                   from source/webmlib/halloc/halloc.c:19:
  /usr/include/stddef.h:74:3: note: previous declaration of 'max_align_t' was here
   } max_align_t;
     ^

Modified:
  head/games/openbor/Makefile   (contents, props changed)

Modified: head/games/openbor/Makefile
==============================================================================
--- head/games/openbor/Makefile	Sat Dec 24 00:02:12 2016	(r429295)
+++ head/games/openbor/Makefile	Sat Dec 24 00:06:00 2016	(r429296)
@@ -21,7 +21,8 @@ MAKE_ENV=	BUILD_LINUX=1 SDKPATH="${LOCAL
 MAKE_ARGS=	CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \
 		TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \
 		TARGET_FINAL='${TARGET}' BUILD_MMX=""
-CFLAGS+=	-fgnu89-inline
+CFLAGS+=	-fgnu89-inline ${CFLAGS_${OPSYS}}
+CFLAGS_DragonFly=	-D_GCC_MAX_ALIGN_T # system stddef.h
 LDFLAGS+=	-Wl,--as-needed # ogg, pthread, zlib
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png