Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 May 2013 10:10:37 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317941 - head/games/quake-reaper
Message-ID:  <201305121010.r4CAAbpm046069@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sun May 12 10:10:37 2013
New Revision: 317941
URL: http://svnweb.freebsd.org/changeset/ports/317941

Log:
  - Unbreak the build after r317934
  - Utilize USE_DOS2UNIX for text file conversion
  - Utilize PORTDOCS and offload pkg-plist

Modified:
  head/games/quake-reaper/Makefile
  head/games/quake-reaper/pkg-plist

Modified: head/games/quake-reaper/Makefile
==============================================================================
--- head/games/quake-reaper/Makefile	Sun May 12 09:45:24 2013	(r317940)
+++ head/games/quake-reaper/Makefile	Sun May 12 10:10:37 2013	(r317941)
@@ -12,13 +12,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 1 bots
 
 USE_ZIP=	yes
+USE_DOS2UNIX=	${PORTDOCS}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${Q1DIR}/${PORTNAME}
+PORTDOCS=	B08chg.txt Dedserv.txt Reaprb80.txt Skinspec.txt
 
 OPTIONS_DEFINE=	DOCS
 
+.include "${.CURDIR}/../quake-data/Makefile.include"
 .include <bsd.port.options.mk>
 
 do-install:
@@ -28,11 +31,9 @@ do-install:
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.  for f in B08chg.txt Dedserv.txt Reaprb80.txt Skinspec.txt
-	@${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" ${WRKSRC}/${f}
+.  for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f:L}
 .  endfor
 .endif
 
-.include "${.CURDIR}/../quake-data/Makefile.include"
 .include <bsd.port.mk>

Modified: head/games/quake-reaper/pkg-plist
==============================================================================
--- head/games/quake-reaper/pkg-plist	Sun May 12 09:45:24 2013	(r317940)
+++ head/games/quake-reaper/pkg-plist	Sun May 12 10:10:37 2013	(r317941)
@@ -1,8 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/b08chg.txt
-%%PORTDOCS%%%%DOCSDIR%%/dedserv.txt
-%%PORTDOCS%%%%DOCSDIR%%/reaprb80.txt
-%%PORTDOCS%%%%DOCSDIR%%/skinspec.txt
 %%DATADIR%%/autoexec.cfg
 %%DATADIR%%/progs.dat
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305121010.r4CAAbpm046069>