From sw@gegenunendlich.de  Fri Dec 24 13:11:05 2004
Return-Path: <sw@gegenunendlich.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8BE3016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Dec 2004 13:11:05 +0000 (GMT)
Received: from mail.onlinefix.de (mail2-out.titan-networks.de [217.140.72.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 354BA43D58
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Dec 2004 13:11:04 +0000 (GMT)
	(envelope-from sw@gegenunendlich.de)
Received: from kyuzo.dunkelkammer.void ([217.140.77.242])
	(authenticated bits=0)
	by mail.onlinefix.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id iBODB1ZY003259
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Dec 2004 14:11:02 +0100
Received: by kyuzo.dunkelkammer.void (Postfix, from userid 1002)
	id 9EC7D3C08; Fri, 24 Dec 2004 14:11:00 +0100 (CET)
Message-Id: <20041224131100.9EC7D3C08@kyuzo.dunkelkammer.void>
Date: Fri, 24 Dec 2004 14:11:00 +0100 (CET)
From: Stefan Walter <sw@gegenunendlich.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] games/chromium: unbreak/fix plist
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75467
>Category:       ports
>Synopsis:       [PATCH] games/chromium: unbreak/fix plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 24 13:20:26 GMT 2004
>Closed-Date:    Sun Dec 26 18:27:52 GMT 2004
>Last-Modified:  Sun Dec 26 18:27:52 GMT 2004
>Originator:     Stefan Walter
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Infinity Approximation Task Force
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.3-STABLE FreeBSD 5.3-STABLE #0: Sat Dec 18 22:12:32 CET 2004
>Description:
- Unbreak by fixing the order of arguments to the tar command. Tar wants the
  options (here: '--exclude') before the file/directory names. The wrong order
  of arguments made it install more than the desired files, and thus the plist
  didn't contain all the files installed.
- While here, use the %%DATADIR%% macro in the plist to satisfy portlint.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- chromium-0.9.12_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/chromium.old/Makefile /usr/ports/games/chromium/Makefile
--- /usr/ports/games/chromium.old/Makefile	Fri Dec 24 13:41:14 2004
+++ /usr/ports/games/chromium/Makefile	Fri Dec 24 13:47:34 2004
@@ -16,10 +16,6 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An arcade-style, top-scrolling space shooter
 
-BROKEN=		Broken pkg-plist
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg \
 		openal.0:${PORTSDIR}/audio/openal
@@ -32,11 +28,11 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
 	${MKDIR} ${DATADIR}/data
 	(cd ${WRKSRC}/data && \
-		${TAR} -c -f - png fonts wav --exclude "*CVS*" --exclude "*xvpics*") | \
+		${TAR} -c -f - --exclude "*CVS*" --exclude "*xvpics*" png fonts wav) | \
 		(cd ${DATADIR}/data && ${TAR} -x -f - )
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/data/doc && ${TAR} -c -f - * --exclude "*CVS*") | \
+	(cd ${WRKSRC}/data/doc && ${TAR} -c -f - --exclude "*CVS*" *) | \
 		(cd ${DOCSDIR} && ${TAR} -x -f - )
 .endif
 
diff -ruN --exclude=CVS /usr/ports/games/chromium.old/pkg-plist /usr/ports/games/chromium/pkg-plist
--- /usr/ports/games/chromium.old/pkg-plist	Fri Dec 24 13:41:14 2004
+++ /usr/ports/games/chromium/pkg-plist	Fri Dec 24 14:02:16 2004
@@ -1,80 +1,80 @@
 bin/chromium
-share/chromium/data/png/check.png
-share/chromium/data/png/chrome.jpg
-share/chromium/data/png/darken.png
-share/chromium/data/png/elect.png
-share/chromium/data/png/electric.png
-share/chromium/data/png/enemy00.png
-share/chromium/data/png/enemy01-extra.png
-share/chromium/data/png/enemy01-rot.png
-share/chromium/data/png/enemy01.png
-share/chromium/data/png/enemy02.png
-share/chromium/data/png/enemy03-extra.png
-share/chromium/data/png/enemy03.png
-share/chromium/data/png/enemy04.png
-share/chromium/data/png/enemy05.png
-share/chromium/data/png/enemy06.png
-share/chromium/data/png/enemyAmmo00.png
-share/chromium/data/png/enemyAmmo01.png
-share/chromium/data/png/enemyAmmo02.png
-share/chromium/data/png/enemyAmmo03.png
-share/chromium/data/png/enemyAmmo04.png
-share/chromium/data/png/enemyAmmoExplo00.png
-share/chromium/data/png/enemyAmmoExplo01.png
-share/chromium/data/png/enemyAmmoExplo02.png
-share/chromium/data/png/enemyAmmoExplo03.png
-share/chromium/data/png/enemyAmmoExplo04.png
-share/chromium/data/png/enemyExplo.png
-share/chromium/data/png/explo.png
-share/chromium/data/png/glitter.png
-share/chromium/data/png/gndBaseSea.png
-share/chromium/data/png/gndMetalBase00.png
-share/chromium/data/png/gndMetalBase01.png
-share/chromium/data/png/gndMetalBase02.png
-share/chromium/data/png/gndMetalBlip.png
-share/chromium/data/png/hero.png
-share/chromium/data/png/heroAmmo00.png
-share/chromium/data/png/heroAmmo01.png
-share/chromium/data/png/heroAmmo02.png
-share/chromium/data/png/heroAmmoExplo00.png
-share/chromium/data/png/heroAmmoExplo01.png
-share/chromium/data/png/heroAmmoExplo02.png
-share/chromium/data/png/heroExplo00.png
-share/chromium/data/png/heroAmmoFlash00.png
-share/chromium/data/png/heroAmmoFlash01.png
-share/chromium/data/png/heroAmmoFlash02.png
-share/chromium/data/png/heroExplo01.png
-share/chromium/data/png/heroExplo02.png
-share/chromium/data/png/heroShields.png
-share/chromium/data/png/heroSuper.png
-share/chromium/data/png/life.png
-share/chromium/data/png/menu_back.png
-share/chromium/data/png/powerUpAmmo.png
-share/chromium/data/png/powerUpShield.png
-share/chromium/data/png/powerUpTex.png
-share/chromium/data/png/reflect-blend.png
-share/chromium/data/png/reflect-gnd.png
-share/chromium/data/png/reflect.png
-share/chromium/data/png/shields.png
-share/chromium/data/png/stat-top.png
-share/chromium/data/png/statBar.png
-share/chromium/data/png/superBomb.png
-share/chromium/data/png/useFocus.png
-share/chromium/data/png/useItem00.png
-share/chromium/data/png/useItem01.png
-share/chromium/data/png/cursor.png
-share/chromium/data/png/menu_updown.png
-share/chromium/data/fonts/space.txf
-share/chromium/data/fonts/space.txf.small
-share/chromium/data/wav/boom.wav
-share/chromium/data/wav/exploBig.wav
-share/chromium/data/wav/exploPop.wav
-share/chromium/data/wav/exploStd.wav
-share/chromium/data/wav/life_add.wav
-share/chromium/data/wav/life_lose.wav
-share/chromium/data/wav/music_game.wav
-share/chromium/data/wav/music_menu.wav
-share/chromium/data/wav/power.wav
+%%DATADIR%%/data/png/check.png
+%%DATADIR%%/data/png/chrome.jpg
+%%DATADIR%%/data/png/darken.png
+%%DATADIR%%/data/png/elect.png
+%%DATADIR%%/data/png/electric.png
+%%DATADIR%%/data/png/enemy00.png
+%%DATADIR%%/data/png/enemy01-extra.png
+%%DATADIR%%/data/png/enemy01-rot.png
+%%DATADIR%%/data/png/enemy01.png
+%%DATADIR%%/data/png/enemy02.png
+%%DATADIR%%/data/png/enemy03-extra.png
+%%DATADIR%%/data/png/enemy03.png
+%%DATADIR%%/data/png/enemy04.png
+%%DATADIR%%/data/png/enemy05.png
+%%DATADIR%%/data/png/enemy06.png
+%%DATADIR%%/data/png/enemyAmmo00.png
+%%DATADIR%%/data/png/enemyAmmo01.png
+%%DATADIR%%/data/png/enemyAmmo02.png
+%%DATADIR%%/data/png/enemyAmmo03.png
+%%DATADIR%%/data/png/enemyAmmo04.png
+%%DATADIR%%/data/png/enemyAmmoExplo00.png
+%%DATADIR%%/data/png/enemyAmmoExplo01.png
+%%DATADIR%%/data/png/enemyAmmoExplo02.png
+%%DATADIR%%/data/png/enemyAmmoExplo03.png
+%%DATADIR%%/data/png/enemyAmmoExplo04.png
+%%DATADIR%%/data/png/enemyExplo.png
+%%DATADIR%%/data/png/explo.png
+%%DATADIR%%/data/png/glitter.png
+%%DATADIR%%/data/png/gndBaseSea.png
+%%DATADIR%%/data/png/gndMetalBase00.png
+%%DATADIR%%/data/png/gndMetalBase01.png
+%%DATADIR%%/data/png/gndMetalBase02.png
+%%DATADIR%%/data/png/gndMetalBlip.png
+%%DATADIR%%/data/png/hero.png
+%%DATADIR%%/data/png/heroAmmo00.png
+%%DATADIR%%/data/png/heroAmmo01.png
+%%DATADIR%%/data/png/heroAmmo02.png
+%%DATADIR%%/data/png/heroAmmoExplo00.png
+%%DATADIR%%/data/png/heroAmmoExplo01.png
+%%DATADIR%%/data/png/heroAmmoExplo02.png
+%%DATADIR%%/data/png/heroExplo00.png
+%%DATADIR%%/data/png/heroAmmoFlash00.png
+%%DATADIR%%/data/png/heroAmmoFlash01.png
+%%DATADIR%%/data/png/heroAmmoFlash02.png
+%%DATADIR%%/data/png/heroExplo01.png
+%%DATADIR%%/data/png/heroExplo02.png
+%%DATADIR%%/data/png/heroShields.png
+%%DATADIR%%/data/png/heroSuper.png
+%%DATADIR%%/data/png/life.png
+%%DATADIR%%/data/png/menu_back.png
+%%DATADIR%%/data/png/powerUpAmmo.png
+%%DATADIR%%/data/png/powerUpShield.png
+%%DATADIR%%/data/png/powerUpTex.png
+%%DATADIR%%/data/png/reflect-blend.png
+%%DATADIR%%/data/png/reflect-gnd.png
+%%DATADIR%%/data/png/reflect.png
+%%DATADIR%%/data/png/shields.png
+%%DATADIR%%/data/png/stat-top.png
+%%DATADIR%%/data/png/statBar.png
+%%DATADIR%%/data/png/superBomb.png
+%%DATADIR%%/data/png/useFocus.png
+%%DATADIR%%/data/png/useItem00.png
+%%DATADIR%%/data/png/useItem01.png
+%%DATADIR%%/data/png/cursor.png
+%%DATADIR%%/data/png/menu_updown.png
+%%DATADIR%%/data/fonts/space.txf
+%%DATADIR%%/data/fonts/space.txf.small
+%%DATADIR%%/data/wav/boom.wav
+%%DATADIR%%/data/wav/exploBig.wav
+%%DATADIR%%/data/wav/exploPop.wav
+%%DATADIR%%/data/wav/exploStd.wav
+%%DATADIR%%/data/wav/life_add.wav
+%%DATADIR%%/data/wav/life_lose.wav
+%%DATADIR%%/data/wav/music_game.wav
+%%DATADIR%%/data/wav/music_menu.wav
+%%DATADIR%%/data/wav/power.wav
 %%PORTDOCS%%%%DOCSDIR%%/info.htm
 %%PORTDOCS%%%%DOCSDIR%%/faq.htm
 %%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo00.jpg
@@ -84,10 +84,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/powerUp01.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/powerUp02.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/useItem00.jpg
-@dirrm share/chromium/data/png
-@dirrm share/chromium/data/fonts
-@dirrm share/chromium/data/wav
-@dirrm share/chromium/data
-@dirrm share/chromium
+@dirrm %%DATADIR%%/data/png
+@dirrm %%DATADIR%%/data/fonts
+@dirrm %%DATADIR%%/data/wav
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- chromium-0.9.12_3.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Sun Dec 26 18:27:46 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75467 
>Unformatted:
