From owner-svn-ports-all@FreeBSD.ORG Sun Apr 20 14:44:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00FBECE4; Sun, 20 Apr 2014 14:44:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D584C1560; Sun, 20 Apr 2014 14:44:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3KEiPnn075141; Sun, 20 Apr 2014 14:44:25 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3KEiPuU075139; Sun, 20 Apr 2014 14:44:25 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201404201444.s3KEiPuU075139@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 20 Apr 2014 14:44:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351622 - in head/games/quake2max: . files 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2014 14:44:26 -0000 Author: danfe Date: Sun Apr 20 14:44:25 2014 New Revision: 351622 URL: http://svnweb.freebsd.org/changeset/ports/351622 QAT: https://qat.redports.org/buildarchive/r351622/ Log: - Fix the build by dropping now unsupported compiler options - While here: stagify, convert MASTER_SITE_SUBDIR and USE_BZIP2 Reported by: pkg-fallout Modified: head/games/quake2max/Makefile head/games/quake2max/files/patch-Makefile Modified: head/games/quake2max/Makefile ============================================================================== --- head/games/quake2max/Makefile Sun Apr 20 13:11:35 2014 (r351621) +++ head/games/quake2max/Makefile Sun Apr 20 14:44:25 2014 (r351622) @@ -6,8 +6,7 @@ PORTVERSION= 0.45 PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.bfeared.com/library/quake/archive/quakedev/qudos/quake2/engines/Quake2MaX/:src \ - ${MASTER_SITE_LOCAL:S/$/:data/} -MASTER_SITE_SUBDIR= alepulver/:data + LOCAL/alepulver/:data DISTNAME= Quake2maX_${PORTVERSION}-src_unix DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src ${Q2MAX_DATA}:data EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -19,8 +18,7 @@ LICENSE= GPLv2 EXTRACT_DEPENDS= unrar:${PORTSDIR}/archivers/unrar -USES= gmake -USE_BZIP2= yes +USES= gmake tar:bzip2 USE_XORG= xxf86dga ALL_TARGET= release WRKSRC= ${WRKDIR}/${DISTNAME:S/quake2max/Quake2maX/} @@ -41,7 +39,6 @@ GLX_DESC= Build OpenGL renderer SDLCLIENT_DESC= Build SDL client SDLGL_DESC= Build SDL OpenGL renderer -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGLX} || ${PORT_OPTIONS:MSDLGL} @@ -118,17 +115,19 @@ post-patch: ${WRKSRC}/client/qmenu.c do-install: - @${MKDIR} ${LIBDIR}/baseq2 + @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2 .for f in ${Q2MAX_BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/quake2/${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/quake2/${f} ${STAGEDIR}${PREFIX}/bin .endfor .for f in ${Q2MAX_REF} - ${INSTALL_PROGRAM} ${WRKSRC}/quake2/rfx_${f}.so ${LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/quake2/rfx_${f}.so ${STAGEDIR}${LIBDIR} .endfor .if ${PORT_OPTIONS:MGAME} - ${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so ${LIBDIR}/baseq2 + ${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so \ + ${STAGEDIR}${LIBDIR}/baseq2 .endif - ${INSTALL_DATA} ${WRKSRC}/_maxpak.pak ${LIBDIR}/baseq2/maxpak.pak + ${INSTALL_DATA} ${WRKSRC}/_maxpak.pak \ + ${STAGEDIR}${LIBDIR}/baseq2/maxpak.pak .include "${.CURDIR}/../quake2-data/Makefile.include" .include Modified: head/games/quake2max/files/patch-Makefile ============================================================================== --- head/games/quake2max/files/patch-Makefile Sun Apr 20 13:11:35 2014 (r351621) +++ head/games/quake2max/files/patch-Makefile Sun Apr 20 14:44:25 2014 (r351622) @@ -38,7 +38,7 @@ +ifeq ($(WITH_OPTIMIZED_CFLAGS),YES) + RELEASE_CFLAGS+=-O2 -ffast-math -fomit-frame-pointer -fexpensive-optimizations + ifeq ($(ARCH),i386) -+ RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing ++ RELEASE_CFLAGS+=-falign-functions=2 -fno-strict-aliasing + endif endif