From root@adamw.org  Fri May 16 13:18:05 2014
Return-Path: <root@adamw.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D0A80637
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 May 2014 13:18:05 +0000 (UTC)
Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id AF6F02D7F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 May 2014 13:18:05 +0000 (UTC)
Received: by apnoea.adamw.org (Postfix, from userid 0)
	id A478311F8FB; Fri, 16 May 2014 09:18:04 -0400 (EDT)
Message-Id: <20140516131804.A478311F8FB@apnoea.adamw.org>
Date: Fri, 16 May 2014 09:18:04 -0400 (EDT)
From: Adam Weinberger <adamw@FreeBSD.org>
Reply-To: Adam Weinberger <adamw@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Ignore .DS_Store files in STAGEDIR
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         189859
>Category:       ports
>Synopsis:       Ignore .DS_Store files in STAGEDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 16 13:20:00 UTC 2014
>Closed-Date:    Mon May 19 16:16:49 UTC 2014
>Last-Modified:  Mon May 19 16:16:49 UTC 2014
>Originator:     Adam Weinberger
>Release:        FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #7: Tue May 13 23:19:06 EDT 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386


>Description:

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...

>How-To-Repeat:
>Fix:



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: adamw 
Responsible-Changed-When: Fri May 16 09:26:11 EDT 2014 
Responsible-Changed-Why:  
Over to owners of check-stagedir.sh 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189859 

From: Adam Weinberger <adamw@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: Adam Weinberger <adamw@FreeBSD.org>
Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR
Date: Fri, 16 May 2014 09:25:36 -0400

 --b5gNqxB1S1yM7hjW
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 ... and this patch adds a few other directories that can often wind
 up in STAGEDIR but never need to be installed.
 
 
 
 --b5gNqxB1S1yM7hjW
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="whitelist2.patch"
 
 Index: check-stagedir.sh
 ===================================================================
 --- check-stagedir.sh	(revision 354221)
 +++ check-stagedir.sh	(working copy)
 @@ -281,6 +281,10 @@
  		case "${path}" in
  		*.bak) ;;
  		*.orig) ;;
 +		*.DS_Store) ;;
 +		*.CVS) ;;
 +		*.svn) ;;
 +		*.git) ;;
  		*/info/dir|info/dir) ;;
  		lib/X11/fonts/*/fonts.dir) ;;
  		lib/X11/fonts/*/fonts.scale) ;;
 
 --b5gNqxB1S1yM7hjW--

From: Adam Weinberger <adamw@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: Adam Weinberger <adamw@FreeBSD.org>
Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR
Date: Fri, 16 May 2014 09:24:55 -0400

 --G4iJoqBmSsgzjUCe
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 n/m I found the appropriate script. This patch adds .DS_Store.
 
 
 
 --G4iJoqBmSsgzjUCe
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="whitelist1.patch"
 
 Index: check-stagedir.sh
 ===================================================================
 --- check-stagedir.sh	(revision 354221)
 +++ check-stagedir.sh	(working copy)
 @@ -281,6 +281,7 @@
  		case "${path}" in
  		*.bak) ;;
  		*.orig) ;;
 +		*.DS_Store) ;;
  		*/info/dir|info/dir) ;;
  		lib/X11/fonts/*/fonts.dir) ;;
  		lib/X11/fonts/*/fonts.scale) ;;
 
 --G4iJoqBmSsgzjUCe--
State-Changed-From-To: open->feedback 
State-Changed-By: antoine 
State-Changed-When: Fri May 16 16:42:38 UTC 2014 
State-Changed-Why:  
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 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Fri May 16 16:42:38 UTC 2014 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189859 

From: Mark Linimon <linimon@lonesome.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR
Date: Sat, 17 May 2014 00:13:06 -0500

 ----- 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 -----

From: Antoine Brodin <antoine@FreeBSD.org>
To: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Cc:  
Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR
Date: Fri, 16 May 2014 22:48:19 +0200

 --20cf3005dd4ea20e5204f98a88c5
 Content-Type: text/plain; charset=UTF-8
 
 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) ;;
 
 --20cf3005dd4ea20e5204f98a88c5
 Content-Type: text/plain; charset=US-ASCII; name="check.diff"
 Content-Disposition: attachment; filename="check.diff"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hv9yj4tw0
 
 SW5kZXg6IE1rL1NjcmlwdHMvY2hlY2stc3RhZ2VkaXIuc2gKPT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTWsvU2Ny
 aXB0cy9jaGVjay1zdGFnZWRpci5zaAkocmV2aXNpb24gMzU0MjU5KQorKysgTWsvU2NyaXB0cy9j
 aGVjay1zdGFnZWRpci5zaAkod29ya2luZyBjb3B5KQpAQCAtMjg4LDYgKzI4OCwxMyBAQAogCQlj
 YXNlICIke3BhdGh9IiBpbgogCQkqLmJhaykgOzsKIAkJKi5vcmlnKSA7OworCQkqLy5EU19TdG9y
 ZSkgOzsKKwkJKi8uY3ZzaWdub3JlKSA7OworCQkqLy5naXQvKnwnQGRpcnJtdHJ5ICcqLy5naXQp
 IDs7CisJCSovLmdpdGF0dHJpYnV0ZXN8Ki8uZ2l0aWdub3JlfCovLmdpdG1vZHVsZXMpIDs7CisJ
 CSovLnN2bi8qfCdAZGlycm10cnkgJyovLnN2bikgOzsKKwkJKi8uc3ZuaWdub3JlKSA7OworCQkq
 L0NWUy8qfCdAZGlycm10cnkgJyovQ1ZTKSA7OwogCQkqL2luZm8vZGlyfGluZm8vZGlyKSA7Owog
 CQlsaWIvWDExL2ZvbnRzLyovZm9udHMuZGlyKSA7OwogCQlsaWIvWDExL2ZvbnRzLyovZm9udHMu
 c2NhbGUpIDs7Cg==
 --20cf3005dd4ea20e5204f98a88c5--

From: "Adam Weinberger" <adamw@adamw.org>
To: "Antoine Brodin" <antoine@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Subject: Re: ports/189859: Ignore .DS_Store files in STAGEDIR
Date: Fri, 16 May 2014 21:40:12 -0400

 On 16 May 2014, at 16:48, Antoine Brodin wrote:
 > Patch below does what you want I think?
 
 Yes that looks much better!

State-Changed-From-To: feedback->open 
State-Changed-By: antoine 
State-Changed-When: Mon May 19 15:49:39 UTC 2014 
State-Changed-Why:  
feedback received 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189859 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189859: commit references a PR
Date: Mon, 19 May 2014 16:09:04 +0000 (UTC)

 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 
State-Changed-By: antoine 
State-Changed-When: Mon May 19 16:15:07 UTC 2014 
State-Changed-Why:  
Close: a patch has been committed 

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