Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Feb 2017 14:49:11 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r434112 - head/games/quake2-relay
Message-ID:  <201702141449.v1EEnB22089096@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702141449.v1EEnB22089096>