From owner-svn-ports-head@FreeBSD.ORG Sat Mar 16 17:34:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9EC7AC83; Sat, 16 Mar 2013 17:34:11 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8054BA73; Sat, 16 Mar 2013 17:34:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GHYBM8043183; Sat, 16 Mar 2013 17:34:11 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GHYBjK043178; Sat, 16 Mar 2013 17:34:11 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201303161734.r2GHYBjK043178@svn.freebsd.org> From: Alexey Dokuchaev Date: Sat, 16 Mar 2013 17:34:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314379 - head/games/q3cellshading X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 17:34:11 -0000 Author: danfe Date: Sat Mar 16 17:34:10 2013 New Revision: 314379 URL: http://svnweb.freebsd.org/changeset/ports/314379 Log: - Trim old-school Makefile header - Fix a typo in OPTIONS_DEFAULT (CLIETN -> CLIENT) - Reindent and generally cleanup Makefile - Reformat port description for better readability Modified: head/games/q3cellshading/Makefile head/games/q3cellshading/pkg-descr Modified: head/games/q3cellshading/Makefile ============================================================================== --- head/games/q3cellshading/Makefile Sat Mar 16 17:33:54 2013 (r314378) +++ head/games/q3cellshading/Makefile Sat Mar 16 17:34:10 2013 (r314379) @@ -1,9 +1,5 @@ -# New ports collection makefile for: q3cellshading -# Date created: 8 Aug 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= q3cellshading PORTVERSION= 1.0 @@ -17,44 +13,46 @@ COMMENT= Quake III engine with Cell Shad ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option + USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/code/unix -OPTIONS_MULTI= EXE -OPTIONS_MULTI_EXE= CLIENT DEDICATED SMP -OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS -OPTIONS_DEFAULT= CLIETN DEDICATED OPTIMIZED_CFLAGS SMP -CLIENT_DESC= Build client -DEDICATED_DESC= Build dedicated server -GAMELIBS_DESC= Build game libraries (when not mandatory) -SMP_DESC= Build SMP (threaded) client - +LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" -LIBDIR= ${PREFIX}/lib/${PORTNAME} VM_ARCHS= i386 powerpc +OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED SMP_CLIENT +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT + +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server +GAMELIBS_DESC= Force building game libraries +SMP_CLIENT_DESC= Build SMP (threaded) client + .include .if ${ARCH} == "i386" -BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm .endif -.for i in ${ARCH} -. if ${VM_ARCHS:M${i}} != "" +.for arch in ${ARCH} +. if ${VM_ARCHS:M${arch}} != "" HAVE_VM_COMPILED= yes -. endif +. endif .endfor .if !defined(HAVE_VM_COMPILED) MAKE_ENV+= DLL_ONLY=true .endif -.if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP) +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} USE_GL= yes USE_XORG= xxf86dga .endif @@ -86,9 +84,8 @@ PLIST_SUB+= GAMELIBS="@comment " MAKE_ENV+= OPTIMIZED_CFLAGS=YES .endif -.if ${PORT_OPTIONS:MSMP} -MAKE_ENV+= SMP=YES \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +.if ${PORT_OPTIONS:MSMP_CLIENT} +MAKE_ENV+= SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB+= SMP="" Q3BIN+= quake3-smp .else @@ -105,12 +102,13 @@ post-patch: do-install: .for bin in ${Q3BIN} +# Adjust program names to avoid conflicts with other Quake3 ports ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \ ${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) .for dir in baseq3 missionpack - ${MKDIR} ${LIBDIR}/${dir} + @${MKDIR} ${LIBDIR}/${dir} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir} .endfor .endif Modified: head/games/q3cellshading/pkg-descr ============================================================================== --- head/games/q3cellshading/pkg-descr Sat Mar 16 17:33:54 2013 (r314378) +++ head/games/q3cellshading/pkg-descr Sat Mar 16 17:34:10 2013 (r314379) @@ -1,8 +1,8 @@ The goal of this project is to add Cell Shading capabilities to the Quake III -engine with Real-time performance. +engine with real-time performance. -In order to provide such feature we have decided to use Kuwahara filter. -Kuwahara filter is a noise-reduction filter that preserves edges. +In order to provide such feature we have decided to use Kuwahara filter, a +noise-reduction filter that preserves edges. It uses four subquadrants to calculate the mean and variance and chooses the mean value for the region with the smallest variance. @@ -11,13 +11,13 @@ To increase the hand-painted effect we h filter to reduce hard-edges on textures and increase the flatness effect. To produce the cell shading effect we use no graphics card shaders, so our -implementation could run with almost any gfx card. The edge effect is produced -by painting backface polygons with a thick wireframe without textures and -repaint all the scene, but this time, with textures. +implementation could run with almost any graphics card. The edge effect is +produced by painting backface polygons with a thick wireframe without +textures and repaint all the scene, but this time, with textures. We have also implemented a different algorithm (we call it White Texture), -which uses white textures. It looks like this and this, you can set the -console variable r_celshadalgo to 2, and load another map, or run using the -appropiate link that came with the release. +which uses white textures. You can set the console variable r_celshadalgo +to 2, and load another map, or run using the appropriate link that came +with the release. WWW: http://q3cellshading.sourceforge.net/