From owner-svn-ports-all@FreeBSD.ORG Fri May 23 04:15:43 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 04764510; Fri, 23 May 2014 04:15:43 +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 D9CED2D89; Fri, 23 May 2014 04:15:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4N4FgOi093700; Fri, 23 May 2014 04:15:42 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4N4FgT5093696; Fri, 23 May 2014 04:15:42 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201405230415.s4N4FgT5093696@svn.freebsd.org> From: Alex Kozlov Date: Fri, 23 May 2014 04:15:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354909 - in head/games: ioquake3 ioquake3-server ioquake3/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 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: Fri, 23 May 2014 04:15:43 -0000 Author: ak Date: Fri May 23 04:15:41 2014 New Revision: 354909 URL: http://svnweb.freebsd.org/changeset/ports/354909 QAT: https://qat.redports.org/buildarchive/r354909/ Log: - Fix build with clang on i386 arches [1] - Support STAGEDIR Reported by: swills [1] Modified: head/games/ioquake3-server/Makefile head/games/ioquake3/Makefile head/games/ioquake3/files/patch-Makefile Modified: head/games/ioquake3-server/Makefile ============================================================================== --- head/games/ioquake3-server/Makefile Fri May 23 03:30:05 2014 (r354908) +++ head/games/ioquake3-server/Makefile Fri May 23 04:15:41 2014 (r354909) @@ -12,5 +12,4 @@ MASTERDIR= ${.CURDIR}/../${PORTNAME} IOQ3= SERVER GAMELIBS -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/ioquake3/Makefile ============================================================================== --- head/games/ioquake3/Makefile Fri May 23 03:30:05 2014 (r354908) +++ head/games/ioquake3/Makefile Fri May 23 04:15:41 2014 (r354909) @@ -14,7 +14,6 @@ COMMENT?= Cleaned-up and enhanced versio USES= pkgconfig gmake -NO_STAGE= yes # Port configuration flags: # CLIENT SERVER TOOLS DLRENDERER GAMELIBS OPUS OPENGL2 IOQ3?= CLIENT TOOLS GAMELIBS @@ -226,18 +225,13 @@ PLIST_FILES+= ${inst:C/.*;//} # Generate install target do-install: ${Q3INSTALL} .for dir in ${PLIST_DIRS} - ${MKDIR} ${PREFIX}/${dir} + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir} .endfor .for inst in ${IOQ3_INST} ${INSTALL_${inst:C/;.*//}} ${BUILDDIR}/${inst:C/[^;]*;//:C/;.*//} \ - ${PREFIX}/${inst:C/.*;//} + ${STAGEDIR}${PREFIX}/${inst:C/.*;//} .endfor -post-install: - @${JOT} -s '' -b= 78 - @${CAT} ${PKGMESSAGE} - @${JOT} -s '' -b= 78 - .if !defined(Q3TOTALCONV) .include "${.CURDIR}/../quake3-data/Makefile.include" .endif Modified: head/games/ioquake3/files/patch-Makefile ============================================================================== --- head/games/ioquake3/files/patch-Makefile Fri May 23 03:30:05 2014 (r354908) +++ head/games/ioquake3/files/patch-Makefile Fri May 23 04:15:41 2014 (r354909) @@ -1,5 +1,4 @@ ---- Makefile.orig 2009-04-22 20:54:48.000000000 +0200 -+++ Makefile 2011-11-04 20:42:56.000000000 +0100 +Index: Makefile @@ -187,6 +187,8 @@ # FIXME: introduce CLIENT_CFLAGS SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//') @@ -9,7 +8,7 @@ endif # version info -@@ -521,44 +523,25 @@ +@@ -521,44 +523,30 @@ ifeq ($(PLATFORM),freebsd) @@ -39,16 +38,6 @@ - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - else -- ifeq ($(ARCH),i386) -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \ -- -march=pentium -fomit-frame-pointer -pipe -ffast-math \ -- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -- -funroll-loops -fstrength-reduce -- HAVE_VM_COMPILED=true -- else -- BASE_CFLAGS += -DNO_VM_COMPILED -- endif -- endif + ifndef HOMEPATH + HOMEPATH = /.ioquake3 + endif @@ -64,7 +53,19 @@ + -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \ + -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON + CLIENT_CFLAGS += $(SDL_CFLAGS) -+ HAVE_VM_COMPILED = true ++ # disable vm on i386 + ifeq ($(ARCH),i386) +- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \ +- -march=pentium -fomit-frame-pointer -pipe -ffast-math \ +- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ +- -funroll-loops -fstrength-reduce +- HAVE_VM_COMPILED=true ++ BASE_CFLAGS += -DNO_VM_COMPILED + else +- BASE_CFLAGS += -DNO_VM_COMPILED +- endif ++ HAVE_VM_COMPILED = true + endif - DEBUG_CFLAGS=$(BASE_CFLAGS) -g + OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer @@ -72,7 +73,7 @@ SHLIBEXT=so SHLIBCFLAGS=-fPIC -@@ -568,20 +551,52 @@ +@@ -568,20 +556,52 @@ # don't need -ldl (FreeBSD) LIBS=-lm @@ -107,8 +108,8 @@ + ifneq ($(USE_LOCAL_HEADERS),1) + CLIENT_CFLAGS += $(VORBIS_CFLAGS) + endif - endif - ++ endif ++ + ifeq ($(BUILD_CLIENT),1) + BASE_CFLAGS += $(CLIENT_CFLAGS) + endif @@ -123,15 +124,15 @@ + ifeq ($(CROSS_COMPILING),1) + BASE_CFLAGS += -m64 + endif -+ endif -+ + endif + + RELEASE_CFLAGS = $(BASE_CFLAGS) + DEBUG_CFLAGS = $(BASE_CFLAGS) -g + else # ifeq freebsd ############################################################################# -@@ -1442,6 +1457,9 @@ +@@ -1442,6 +1462,9 @@ ifeq ($(ARCH),x86_64) Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o endif @@ -141,7 +142,7 @@ ifeq ($(ARCH),ppc) Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o endif -@@ -1591,6 +1609,9 @@ +@@ -1591,6 +1614,9 @@ ifeq ($(ARCH),x86_64) Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o endif