Bug 189859
| Summary: | Ignore .DS_Store files in STAGEDIR | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Adam Weinberger <adamw> | ||||||||
| Component: | Individual Port(s) | Assignee: | Antoine Brodin <antoine> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | ||||||||||
| Priority: | Normal | ||||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| Attachments: |
|
||||||||||
n/m I found the appropriate script. This patch adds .DS_Store. ... and this patch adds a few other directories that can often wind up in STAGEDIR but never need to be installed. Responsible Changed From-To: freebsd-ports-bugs->portmgr Over to owners of check-stagedir.sh State Changed From-To: open->feedback Requesting feedback: could you provide a list of a couple of ports that could use this? (to test the patch) Also IIRC there are no .CVS files, there were CVS directories? Responsible Changed From-To: portmgr->antoine Take Patch below does what you want I think?
Index: Mk/Scripts/check-stagedir.sh
===================================================================
--- Mk/Scripts/check-stagedir.sh (revision 354259)
+++ Mk/Scripts/check-stagedir.sh (working copy)
@@ -288,6 +288,13 @@
case "${path}" in
*.bak) ;;
*.orig) ;;
+ */.DS_Store) ;;
+ */.cvsignore) ;;
+ */.git/*|'@dirrmtry '*/.git) ;;
+ */.gitattributes|*/.gitignore|*/.gitmodules) ;;
+ */.svn/*|'@dirrmtry '*/.svn) ;;
+ */.svnignore) ;;
+ */CVS/*|'@dirrmtry '*/CVS) ;;
*/info/dir|info/dir) ;;
lib/X11/fonts/*/fonts.dir) ;;
lib/X11/fonts/*/fonts.scale) ;;
On 16 May 2014, at 16:48, Antoine Brodin wrote:
> Patch below does what you want I think?
Yes that looks much better!
----- Forwarded message from Adam Weinberger <adamw@adamw.org> ----- Date: Fri, 16 May 2014 21:23:49 -0400 From: Adam Weinberger <adamw@adamw.org> To: antoine@FreeBSD.org Cc: adamw@FreeBSD.org, portmgr@FreeBSD.org Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR X-Mailer: MailMate (1.8r4214) On 16 May 2014, at 12:48, antoine@FreeBSD.org wrote: > Requesting feedback: could you provide a list of a couple of ports > that > could use this? (to test the patch) (These were located with grep and not really checked, so I may be wrong about some of these.) A couple ports try to prune them: cad/systemc databases/p5-DBIx-Class-Migration deskutils/phpicalendar editors/texmacs games/krank graphics/aoi mail/roundcube-mobilecube math/ruby-gsl textproc/s5 www/punbb www/tikiwiki www/xpi-colorfultabs x11-themes/kde-icons-nuovext2 A couple others just give up and install the .DS_Store files: devel/arduino-mk devel/cmake-modules devel/py-simpy editors/treeform games/alephone-scenarios mail/roundcube-mvision2 net/wowzamediaserverpro www/xpi-foxmarks And others just leave it in STAGEDIR and don't care (and only running check-stagedir.sh on every port will reveal them all): deskutils/phpcollab > Also IIRC there are no .CVS files, there were CVS directories? ... my brain hamster took the day off; the wheel wasn't spinning this morning. Still, .git/.CVS/.svn directories should probably be ignored in STAGEDIR. There's no reason to install anything from those dirs in a pkg, no? ----- End forwarded message ----- State Changed From-To: feedback->open feedback received Author: antoine Date: Mon May 19 16:09:00 2014 New Revision: 354552 URL: http://svnweb.freebsd.org/changeset/ports/354552 QAT: https://qat.redports.org/buildarchive/r354552/ Log: Add more files to orphans white list: - .DS_Store files - some VCS related files Note: it's still recommended to not extract/install those files if they are not needed PR: ports/189859 Submitted by: adamw (first version) Reviewed by: bapt With hat: portmgr Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Mon May 19 16:05:55 2014 (r354551) +++ head/Mk/Scripts/check-stagedir.sh Mon May 19 16:09:00 2014 (r354552) @@ -288,6 +288,13 @@ check_orphans_from_plist() { case "${path}" in *.bak) ;; *.orig) ;; + */.DS_Store) ;; + */.cvsignore) ;; + */.git/*|'@dirrmtry '*/.git) ;; + */.gitattributes|*/.gitignore|*/.gitmodules) ;; + */.svn/*|'@dirrmtry '*/.svn) ;; + */.svnignore) ;; + */CVS/*|'@dirrmtry '*/CVS) ;; */info/dir|info/dir) ;; lib/X11/fonts/*/fonts.dir) ;; lib/X11/fonts/*/fonts.scale) ;; _______________________________________________ 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" State Changed From-To: open->closed Close: a patch has been committed |
A couple ports have .DS_Store files in their distfiles, but rather than add @comment or ${RM} them individually it'd make more sense to have them officially ignored in STAGEDIR. Only problem is, I can't make a patch for you as I cannot remember where that list lives...