From owner-svn-ports-all@FreeBSD.ORG Sat Nov 29 00:35:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 510F77C0; Sat, 29 Nov 2014 00:35:14 +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 33AE49F7; Sat, 29 Nov 2014 00:35:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT0ZEPZ026976; Sat, 29 Nov 2014 00:35:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT0ZDWR026973; Sat, 29 Nov 2014 00:35:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411290035.sAT0ZDWR026973@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 29 Nov 2014 00:35:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373589 - in head/games/evq3: . 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.18-1 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: Sat, 29 Nov 2014 00:35:14 -0000 Author: amdmi3 Date: Sat Nov 29 00:35:12 2014 New Revision: 373589 URL: https://svnweb.freebsd.org/changeset/ports/373589 QAT: https://qat.redports.org/buildarchive/r373589/ Log: - Fix build on i386 (2 separate problems) - Drop @dirrm* from plist MFH: 2014Q4 Added: head/games/evq3/files/patch-code__qcommon__vm_x86.c (contents, props changed) Modified: head/games/evq3/files/patch-Makefile head/games/evq3/pkg-plist Modified: head/games/evq3/files/patch-Makefile ============================================================================== --- head/games/evq3/files/patch-Makefile Sat Nov 29 00:29:42 2014 (r373588) +++ head/games/evq3/files/patch-Makefile Sat Nov 29 00:35:12 2014 (r373589) @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2008-06-11 23:35:55.000000000 -0300 -+++ ./Makefile 2008-06-27 20:31:07.000000000 -0300 +--- Makefile.orig 2014-11-28 23:19:34.000000000 +0300 ++++ Makefile 2014-11-28 23:21:07.000000000 +0300 @@ -23,29 +23,6 @@ endif endif @@ -106,10 +106,10 @@ - else #default to i386 - ARCH=i386 - endif #alpha test -- + BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -DLIBDIR='\"$(LIBDIR)\"' -DUSE_ICON $(shell sdl-config --cflags) +- - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON $(shell sdl-config --cflags) + DEBUG_CFLAGS=$(BASE_CFLAGS) -g @@ -139,7 +139,7 @@ + RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \ + -fexpensive-optimizations + ifeq ($(ARCH),i386) -+ RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ ++ RELEASE_CFLAGS+=-falign-functions=2 \ + -fstrength-reduce + endif endif Added: head/games/evq3/files/patch-code__qcommon__vm_x86.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/evq3/files/patch-code__qcommon__vm_x86.c Sat Nov 29 00:35:12 2014 (r373589) @@ -0,0 +1,11 @@ +--- code/qcommon/vm_x86.c.orig 2014-11-28 23:31:38.000000000 +0300 ++++ code/qcommon/vm_x86.c 2014-11-28 23:32:14.000000000 +0300 +@@ -93,7 +93,7 @@ + #endif + + +-static int callMask = 0; ++int callMask = 0; + + static int instruction, pass; + static int lastConst = 0; Modified: head/games/evq3/pkg-plist ============================================================================== --- head/games/evq3/pkg-plist Sat Nov 29 00:29:42 2014 (r373588) +++ head/games/evq3/pkg-plist Sat Nov 29 00:35:12 2014 (r373589) @@ -10,7 +10,3 @@ %%GAMELIBS%%%%LIBDIR%%/missionpack/qagame.so %%GAMELIBS%%%%LIBDIR%%/missionpack/ui.so %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack -@dirrm %%LIBDIR%%/baseq3 -@dirrm %%LIBDIR%%