Bug 178777

Summary: [patch] Fix pkg-plist for games/boswars
Product: Ports & Packages Reporter: Kevin Zheng <kevinz5000>
Component: Individual Port(s)Assignee: Alex Kozlov <ak>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Kevin Zheng 2013-05-19 23:20:00 UTC 
The pkg-plist on games/boswars incorrectly tried to remove the files in share/license, which are already handled by the ports infrastructure. While here:

 - Use PORTDOCS instead of pkg-plist
 - Delete share/applications if empty

Fix: Apply the attached patch.

Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-19 23:20:07 UTC 
Maintainer of games/boswars,

Please note that PR ports/178777 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178777

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-05-19 23:20:08 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-06-10 15:58:43 UTC 
Author: ak
Date: Mon Jun 10 14:58:30 2013
New Revision: 320484
URL: http://svnweb.freebsd.org/changeset/ports/320484

Log:
  - Fix pkg-plist
  - Switch to PORTDOCS
  
  PR:	ports/178777
  Submitted by:	Kevin Zheng <kevinz5000@gmail.com>
  Approved by:	maintainer timeout (20 days)

Modified:
  head/games/boswars/Makefile
  head/games/boswars/pkg-plist   (contents, props changed)

Modified: head/games/boswars/Makefile
==============================================================================
--- head/games/boswars/Makefile	Mon Jun 10 14:38:18 2013	(r320483)
+++ head/games/boswars/Makefile	Mon Jun 10 14:58:30 2013	(r320484)
@@ -29,6 +29,8 @@ CFLAGS+=	-DSTRATAGUS_LIB_PATH='"\"${DATA
 DESKTOP_ENTRIES=	"Bos Wars" "${COMMENT}" "" \
 			"boswars" "Game;StrategyGame;" false
 
+PORTDOCS=	*
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -48,7 +50,7 @@ do-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.txt ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
+	${COPYTREE_SHARE} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/games/boswars/pkg-plist
==============================================================================
--- head/games/boswars/pkg-plist	Mon Jun 10 14:38:18 2013	(r320483)
+++ head/games/boswars/pkg-plist	Mon Jun 10 14:58:30 2013	(r320484)
@@ -1,36 +1,4 @@
 bin/boswars
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/unittype.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/config.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/findlua.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/game.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/index.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/limits.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/magic.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/makeindex.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/mappresentation.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/mapsetup.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/savegame.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/showindex.py
-%%PORTDOCS%%%%DOCSDIR%%/scripts/sound.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/triggers.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/ui.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts/ai.html
-%%PORTDOCS%%%%DOCSDIR%%/tolua-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/stratagus-changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/media.html
-%%PORTDOCS%%%%DOCSDIR%%/lua5-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/guichan-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl3.txt
-%%PORTDOCS%%%%DOCSDIR%%/gpl.html
-%%PORTDOCS%%%%DOCSDIR%%/gcclibs-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/development.html
-%%PORTDOCS%%%%DOCSDIR%%/xiph-copyright.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-SDL.txt
 %%DATADIR%%/campaigns/swindler/campaign.lua
 %%DATADIR%%/campaigns/swindler/level01.smp
 %%DATADIR%%/campaigns/swindler/level01.sms
@@ -328,7 +296,6 @@ bin/boswars
 %%DATADIR%%/patches/plain2.lua
 %%DATADIR%%/patches/plain2.png
 %%DATADIR%%/patches/plain4.lua
-%%DATADIR%%/patches/te0.lua
 %%DATADIR%%/patches/plain4.png
 %%DATADIR%%/patches/plain8.lua
 %%DATADIR%%/patches/plain8.png
@@ -338,6 +305,7 @@ bin/boswars
 %%DATADIR%%/patches/rockyMountainR.png
 %%DATADIR%%/patches/smallWetPlain.lua
 %%DATADIR%%/patches/smallWetPlain.png
+%%DATADIR%%/patches/te0.lua
 %%DATADIR%%/patches/te0.png
 %%DATADIR%%/patches/te1.lua
 %%DATADIR%%/patches/te1.png
@@ -705,8 +673,7 @@ bin/boswars
 %%DATADIR%%/units/weakhotspot/hotspot.png
 %%DATADIR%%/units/weakhotspot/hotspot_i.png
 %%DATADIR%%/units/weakhotspot/unit-weakhotspot.lua
-@dirrm share/licenses/boswars-2.6.1
-@dirrm share/licenses
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/units/weakhotspot
 @dirrm %%DATADIR%%/units/vehiclefactory
 @dirrm %%DATADIR%%/units/vault
@@ -793,5 +760,3 @@ bin/boswars
 @dirrm %%DATADIR%%/campaigns/swindler
 @dirrm %%DATADIR%%/campaigns
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Alex Kozlov freebsd_committer freebsd_triage 2013-06-10 16:00:09 UTC 
State Changed
From-To: feedback->open

Feedback timeout.
Comment 5 Alex Kozlov freebsd_committer freebsd_triage 2013-06-10 16:00:18 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 6 Alex Kozlov freebsd_committer freebsd_triage 2013-06-10 16:00:29 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!