From owner-svn-ports-all@FreeBSD.ORG Mon Mar 17 09:22:20 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 10569427; Mon, 17 Mar 2014 09:22:20 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EFEFD867; Mon, 17 Mar 2014 09:22:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2H9MJNQ066560; Mon, 17 Mar 2014 09:22:19 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2H9MJ2P066552; Mon, 17 Mar 2014 09:22:19 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201403170922.s2H9MJ2P066552@svn.freebsd.org> From: Alexey Dokuchaev Date: Mon, 17 Mar 2014 09:22:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348452 - in head/games: quake-data quake-reaper quake-source 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.17 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: Mon, 17 Mar 2014 09:22:20 -0000 Author: danfe Date: Mon Mar 17 09:22:18 2014 New Revision: 348452 URL: http://svnweb.freebsd.org/changeset/ports/348452 QAT: https://qat.redports.org/buildarchive/r348452/ Log: Cleanup Quake1-related ports and stagify appropriately. Modified: head/games/quake-data/Makefile head/games/quake-reaper/Makefile head/games/quake-source/Makefile head/games/quake-source/Makefile.include Modified: head/games/quake-data/Makefile ============================================================================== --- head/games/quake-data/Makefile Mon Mar 17 09:01:44 2014 (r348451) +++ head/games/quake-data/Makefile Mon Mar 17 09:22:18 2014 (r348452) @@ -59,7 +59,9 @@ PLIST_SUB+= QUAKEWORLD="@comment " pre-fetch: .if ${PORT_OPTIONS:MFULLGAME} && !exists(${_DISTDIR}/pak1.pak) @${ECHO_CMD} - @${ECHO_CMD} You need to copy the file pak1.pak from the original Quake CDROM to ${_DISTDIR} in order to install this port. | ${FMT} + @${ECHO_CMD} You need to copy the file pak1.pak from the \ + original Quake CDROM to ${_DISTDIR} in order to \ + install this port. | ${FMT} @${ECHO_CMD} @${FALSE} .endif @@ -74,13 +76,14 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/qw ${INSTALL_DATA} ${WRKSRC}/qw/qwprogs.dat ${STAGEDIR}${DATADIR}/qw @${MKDIR} ${STAGEDIR}${DATADIR}/qw/skins - ${INSTALL_SCRIPT} ${WRKSRC}/qw/skins/fixskins.sh ${STAGEDIR}${DATADIR}/qw/skins -. if ${PORT_OPTIONS:MQW_SKINS} -. for f in ${SKINFILES} + ${INSTALL_SCRIPT} ${WRKSRC}/qw/skins/fixskins.sh \ + ${STAGEDIR}${DATADIR}/qw/skins +. if ${PORT_OPTIONS:MQW_SKINS} +. for f in ${SKINFILES} @${UNZIP_CMD} -nq ${_DISTDIR}/${f} -d ${STAGEDIR}${DATADIR}/qw/skins -. endfor +. endfor @(cd ${STAGEDIR}${DATADIR}/qw/skins && LANG=C ./fixskins.sh *) -. endif +. endif .endif .include Modified: head/games/quake-reaper/Makefile ============================================================================== --- head/games/quake-reaper/Makefile Mon Mar 17 09:01:44 2014 (r348451) +++ head/games/quake-reaper/Makefile Mon Mar 17 09:22:18 2014 (r348452) @@ -21,8 +21,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include "${.CURDIR}/../quake-data/Makefile.include" - do-install: @${MKDIR} ${STAGEDIR}${DATADIR} .for f in Autoexec.cfg PROGS.DAT @@ -33,4 +31,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f:L} .endfor +.include "${.CURDIR}/../quake-data/Makefile.include" .include Modified: head/games/quake-source/Makefile ============================================================================== --- head/games/quake-source/Makefile Mon Mar 17 09:01:44 2014 (r348451) +++ head/games/quake-source/Makefile Mon Mar 17 09:22:18 2014 (r348452) @@ -5,8 +5,7 @@ PORTNAME= source PORTVERSION= 1.01 PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} -MASTER_SITE_SUBDIR= source +MASTER_SITES= IDSOFTWARE/source PKGNAMEPREFIX= quake- DISTNAME= qcc DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -24,7 +23,6 @@ OPTIONS_DEFAULT= QUAKEWORLD QUAKEWORLD_DESC= Install QuakeWorld game source -NO_STAGE= yes .include .if ${PORT_OPTIONS:MQUAKEWORLD} @@ -36,24 +34,18 @@ PLIST_SUB+= QUAKEWORLD="" 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'`$$//" - post-patch: @${REINPLACE_CMD} -e 's,^\.\.,.,' ${WRKSRC}/send/v101qc/progs.src @${RM} ${WRKSRC}/send/v101qc/progs.src.bak do-install: - @${MKDIR} ${DATADIR} - ${CP} -a ${WRKSRC}/send/v101qc ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -a ${WRKSRC}/send/v101qc ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MQUAKEWORLD} - @${MKDIR} ${DATADIR}/qw + @${MKDIR} ${STAGEDIR}${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 + @${REINPLACE_CMD} -e 's,[[:cntrl:]]*$$,,' ${WRKSRC}/qw/${f} + ${INSTALL_DATA} ${WRKSRC}/qw/${f} ${STAGEDIR}${DATADIR}/qw . endfor .endif Modified: head/games/quake-source/Makefile.include ============================================================================== --- head/games/quake-source/Makefile.include Mon Mar 17 09:01:44 2014 (r348451) +++ head/games/quake-source/Makefile.include Mon Mar 17 09:22:18 2014 (r348452) @@ -1,8 +1,6 @@ -# Makefile for dependency to quake-source. +# Makefile for dependency on quake-source -PREFIX= ${LOCALBASE} - -Q1SRCDIR= ${PREFIX}/share/quake-source +Q1SRCDIR= ${LOCALBASE}/share/quake-source .if ${PORTNAME} == "source" DATADIR= ${Q1SRCDIR}