From owner-svn-ports-all@freebsd.org  Tue Feb 14 14:49:13 2017
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 0D937CDF17A;
 Tue, 14 Feb 2017 14:49:13 +0000 (UTC)
 (envelope-from tijl@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 CE97E1E3A;
 Tue, 14 Feb 2017 14:49:12 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1EEnBB7089097;
 Tue, 14 Feb 2017 14:49:11 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1EEnB22089096;
 Tue, 14 Feb 2017 14:49:11 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201702141449.v1EEnB22089096@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 14 Feb 2017 14:49:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r434112 - head/games/quake2-relay
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: Tue, 14 Feb 2017 14:49:13 -0000

Author: tijl
Date: Tue Feb 14 14:49:11 2017
New Revision: 434112
URL: https://svnweb.freebsd.org/changeset/ports/434112

Log:
  - Add -fPIC to CFLAGS for all architectures because port Makefile CFLAGS
    overrides upstream CFLAGS which includes -fPIC.
  - Respect LDFLAGS (stack protector).

Modified:
  head/games/quake2-relay/Makefile

Modified: head/games/quake2-relay/Makefile
==============================================================================
--- head/games/quake2-relay/Makefile	Tue Feb 14 14:42:31 2017	(r434111)
+++ head/games/quake2-relay/Makefile	Tue Feb 14 14:49:11 2017	(r434112)
@@ -3,6 +3,7 @@
 
 PORTNAME=	relay
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/danfe http://freebsd.nsu.ru/distfiles/
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
@@ -17,22 +18,20 @@ USES=		gmake
 MAKE_ARGS=	MODE=release OBJ_DIR=. OUT_DIR=. Q2MODULE=game.so \
 		QUAKE2_DIR="${STAGEDIR}${Q2DIR}" \
 		BIN_DIR="${STAGEDIR}${PREFIX}/bin" \
-		CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"
+		CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS} -fPIC" \
+		LDFLAGS="${LDFLAGS} -lm"
 
 WRKSRC=		${WRKDIR}/relay-${PORTVERSION}
 PORTDOCS=	FAQ README
 
-CFLAGS_aarch64=	-fPIC
-CFLAGS_amd64=	-fPIC
-
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.options.mk>
 
 post-patch: .SILENT
-	${REINPLACE_CMD} -e 's/-ldl// ; /^include/d ; \
-		s/cp -p/${INSTALL_PROGRAM}/' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e '/^include/d ; s/cp -p/${INSTALL_PROGRAM}/' \
+		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/random/d' ${WRKSRC}/replay/rp_local.h
 	${REINPLACE_CMD} -e 's,<malloc\.h>,<stdlib\.h>,' \
 		${WRKSRC}/common/mem.c