ports/86176: [UPDATE] games/tenebrae: integrate with "games/quake-data"

[Alejandro Pulver]

The following reply was made to PR ports/86176; it has been noted by GNATS.

From: "Alejandro Pulver" <alejandro at varnet.biz>
To: "FreeBSD gnats submit" <bug-followup at freebsd.org>
Cc:  
Subject: Re: ports/86176: [UPDATE] games/tenebrae: integrate with "games/quake-data"
Date: Sun, 25 Sep 2005 21:33:27 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86176: [UPDATE] games/tenebrae: integrate with "games/quake-data" 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch replaces the previous one (has to be applied to the first).
 
 Changes:
 * Fix problem with data directories.
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new2.diff begins here ---
 --- ../../pkgd/sent/tenebrae.diff	Thu Sep 15 13:23:10 2005
 +++ tenebrae.diff	Sun Sep 25 21:29:06 2005
 @@ -1,16 +1,24 @@
  diff -urN /usr/ports/games/tenebrae/Makefile tenebrae/Makefile
  --- /usr/ports/games/tenebrae/Makefile	Wed Jul 21 14:47:50 2004
 -+++ tenebrae/Makefile	Sun Sep 11 16:43:19 2005
 -@@ -41,15 +41,13 @@
 ++++ tenebrae/Makefile	Sun Sep 25 21:25:21 2005
 +@@ -31,6 +31,8 @@
 + 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 + 		SDL_CONFIG="${SDL_CONFIG}"
 + 
 ++DATADIR=	${Q1DIR}
 ++
 + pre-patch:
 + 	@${REINPLACE_CMD} -e "s|$$(${PRINTF} '\r')||g" `${FIND} ${WRKSRC} -type f`
 + 
 +@@ -40,7 +42,6 @@
 + do-install:
   	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/debugi386.glibc/bin/${PORTNAME}.run \
   		${PREFIX}/bin/${PORTNAME}
 - 	@${MKDIR} ${DATADIR}
 --	@${MKDIR} ${DATADIR}/${PORTNAME}
 --	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${DATADIR}/${PORTNAME}
 -+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${DATADIR}
 +-	@${MKDIR} ${DATADIR}
 + 	@${MKDIR} ${DATADIR}/${PORTNAME}
 + 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${DATADIR}/${PORTNAME}
   .ifndef (NOPORTDOCS)
 - 	@${MKDIR} ${DOCSDIR}
 - 	${TR} -d '\r' <${WRKDIR}/Tenebrae_Readme.txt \
 +@@ -49,7 +50,6 @@
   		>${DOCSDIR}/Tenebrae_Readme.txt
   .endif
   
 @@ -30,12 +38,12 @@
  -*******************************************************************************
  diff -urN /usr/ports/games/tenebrae/pkg-plist tenebrae/pkg-plist
  --- /usr/ports/games/tenebrae/pkg-plist	Wed Mar 17 06:30:31 2004
 -+++ tenebrae/pkg-plist	Sun Sep 11 16:43:38 2005
 -@@ -1,6 +1,4 @@
 ++++ tenebrae/pkg-plist	Sun Sep 25 21:24:58 2005
 +@@ -1,6 +1,5 @@
   bin/tenebrae
 --%%DATADIR%%/tenebrae/Pak0.pak
 + %%DATADIR%%/tenebrae/Pak0.pak
  - at dirrm %%DATADIR%%/tenebrae
  - at dirrm %%DATADIR%%
 -+%%DATADIR%%/Pak0.pak
   %%PORTDOCS%%%%DOCSDIR%%/Tenebrae_Readme.txt
 ++ at dirrm %%DATADIR%%/tenebrae
   %%PORTDOCS%%@dirrm %%DOCSDIR%%
 --- new2.diff ends here ---