From owner-svn-ports-head@FreeBSD.ORG Mon Mar 18 02:45:33 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 04FA1BCD; Mon, 18 Mar 2013 02:45:33 +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 C969BF59; Mon, 18 Mar 2013 02:45:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2I2jWeS057235; Mon, 18 Mar 2013 02:45:32 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2I2jWKT057234; Mon, 18 Mar 2013 02:45:32 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201303180245.r2I2jWKT057234@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 18 Mar 2013 02:45:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314521 - head/games/tenebrae 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: Mon, 18 Mar 2013 02:45:33 -0000 Author: danfe Date: Mon Mar 18 02:45:32 2013 New Revision: 314521 URL: http://svnweb.freebsd.org/changeset/ports/314521 Log: - Trim the Makefile header - Rename X86_ASM to standard ASM and make it x86/x64 specific - Correct USE_GL setting, sort knobs, shorten very long line - Fix some whitespace in Makefile - Rephrase COMMENT while I am here Modified: head/games/tenebrae/Makefile Modified: head/games/tenebrae/Makefile ============================================================================== --- head/games/tenebrae/Makefile Mon Mar 18 02:31:52 2013 (r314520) +++ head/games/tenebrae/Makefile Mon Mar 18 02:45:32 2013 (r314521) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tenebrae -# Date created: 14 Mar 2004 -# Whom: Igor Pokrovsky -# +# Created by: Igor Pokrovsky # $FreeBSD$ -# PORTNAME= tenebrae PORTVERSION= 1.04 @@ -14,35 +10,37 @@ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX ${PORTNAME}data${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org -COMMENT= Quake 1 source port with advanced graphics +COMMENT= Quake engine with lighting similar to that in Doom III LIB_DEPENDS= png15:${PORTSDIR}/graphics/png USE_ZIP= yes USE_DOS2UNIX= yes USE_GMAKE= yes -USE_XORG= xxf86dga -USE_GL= gl +USE_GL= glu USE_SDL= yes - -OPTIONS_DEFINE= X86_ASM DOCS -OPTIONS_DEFAULT= X86_ASM -X86_ASM_DESC= Enable use of x86 assembly code +USE_XORG= xxf86dga WRKSRC= ${WRKDIR}/${PORTNAME}_0 BUILD_WRKSRC= ${WRKSRC}/linux MAKEFILE= Makefile.i386linux MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFAULT_i386= ASM +OPTIONS_DEFINE_amd64= ASM +OPTIONS_DEFAULT_amd64= ASM + .include -.if ${PORT_OPTIONS:MX86_ASM} +.if ${PORT_OPTIONS:MASM} MAKE_ENV+= USE_ASM=1 .endif post-patch: - ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ - ${WRKSRC}/gl_warp.c + ${REINPLACE_CMD} -e 's|gray_1_2_4_to_8|expand_&|' \ + ${WRKSRC}/gl_warp.c pre-build: @cd ${BUILD_WRKSRC} && ${LN} -sf Makefile.i386linux Makefile @@ -54,8 +52,8 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${Q1DIR}/${PORTNAME} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - ${TR} -d '\r' <${WRKDIR}/Tenebrae_Readme.txt \ - >${DOCSDIR}/Tenebrae_Readme.txt + ${TR} -d '\r' < ${WRKDIR}/Tenebrae_Readme.txt \ + > ${DOCSDIR}/Tenebrae_Readme.txt .endif post-install: @@ -64,5 +62,4 @@ post-install: @${ECHO_CMD} .include "${.CURDIR}/../quake-data/Makefile.include" - .include