From owner-svn-ports-head@FreeBSD.ORG Sun Mar 17 10:11:05 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 0034C4AC; Sun, 17 Mar 2013 10:11:04 +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 DC7C2A51; Sun, 17 Mar 2013 10:11:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HAB4L5047361; Sun, 17 Mar 2013 10:11:04 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HAB4ra047357; Sun, 17 Mar 2013 10:11:04 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201303171011.r2HAB4ra047357@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 17 Mar 2013 10:11:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314416 - in head/games/quake-source: . 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-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: Sun, 17 Mar 2013 10:11:05 -0000 Author: danfe Date: Sun Mar 17 10:11:03 2013 New Revision: 314416 URL: http://svnweb.freebsd.org/changeset/ports/314416 Log: - Trim old-school Makefile header per recent agreements - Convert to new OPTIONS framework (courtesy of jgh@) - Turn simple one-line patch into REINPLACE_CMD - Clarify in COMMENT that this is a game (not engine) source code - Make COMMENT really reflect what's being installed (based on OPTIONS) - Generally cleanup Makefile while here, drop maintainership - Reword port description text a bit Deleted: head/games/quake-source/files/ Modified: head/games/quake-source/Makefile head/games/quake-source/pkg-descr Modified: head/games/quake-source/Makefile ============================================================================== --- head/games/quake-source/Makefile Sun Mar 17 09:43:27 2013 (r314415) +++ head/games/quake-source/Makefile Sun Mar 17 10:11:03 2013 (r314416) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake-source -# Date created: 15 Sep 2005 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= source PORTVERSION= 1.01 @@ -15,45 +11,50 @@ PKGNAMEPREFIX= quake- DISTNAME= qcc DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= danfe@FreeBSD.org -COMMENT= Quake and QuakeWorld source +MAINTAINER= ports@FreeBSD.org +COMMENT= Quake game source code NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= QUAKEWORLD "Install QuakeWorld source" on - LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} -.include "Makefile.include" +OPTIONS_DEFINE= QUAKEWORLD +OPTIONS_DEFAULT= QUAKEWORLD -.include +QUAKEWORLD_DESC= Install QuakeWorld game source -.if !defined(WITHOUT_QUAKEWORLD) +.include + +.if ${PORT_OPTIONS:MQUAKEWORLD} MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|} DISTFILES+= qwsv-2.30-glibc-i386-unknown-linux2.0${EXTRACT_SUFX}:qw +COMMENT:= ${COMMENT:S/Quake/& and QuakeWorld/} PLIST_SUB+= QUAKEWORLD="" .else PLIST_SUB+= QUAKEWORLD="@comment " .endif pre-patch: +# CRLF -> LF conversion (XXX why not USE_DOS2UNIX?) @${FIND} ${WRKSRC} -type f | ${XARGS} ${FILE} | \ - ${GREP} 'CRLF' | ${SED} -e 's/:.*//' | \ - ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//" + ${GREP} 'CRLF' | ${SED} -e 's/:.*//' | ${XARGS} \ + ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//" post-patch: - @${RM} ${WRKSRC}/send/v101qc/progs.src.orig + @${REINPLACE_CMD} -e 's,^\.\.,.,' ${WRKSRC}/send/v101qc/progs.src + @${RM} ${WRKSRC}/send/v101qc/progs.src.bak do-install: - ${MKDIR} ${DATADIR} - ${CP} -R ${WRKSRC}/send/v101qc ${DATADIR} -.if !defined(WITHOUT_QUAKEWORLD) - ${MKDIR} ${DATADIR}/qw -. for f in *.h *.qc *.src + @${MKDIR} ${DATADIR} + ${CP} -a ${WRKSRC}/send/v101qc ${DATADIR} +.if ${PORT_OPTIONS:MQUAKEWORLD} + @${MKDIR} ${DATADIR}/qw +. for f in *.h *.qc *.src @${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" ${WRKSRC}/qw/${f} ${INSTALL_DATA} ${WRKSRC}/qw/${f} ${DATADIR}/qw -. endfor +. endfor .endif -.include +.include "Makefile.include" +.include Modified: head/games/quake-source/pkg-descr ============================================================================== --- head/games/quake-source/pkg-descr Sun Mar 17 09:43:27 2013 (r314415) +++ head/games/quake-source/pkg-descr Sun Mar 17 10:11:03 2013 (r314416) @@ -1,6 +1,5 @@ -Quake and QuakeWorld sources. - This port installs the Quake (and optionally QuakeWorld) game sources (in -QuakeC) to allow the development of Quake mods. +QuakeC) to allow the development of Quake modifications (mods). -Note that to compile it you need a QuakeC compiler (there are many in ports). +Note that to compile it you need a QuakeC compiler (several are available +in the ports).