Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Nov 2012 11:34:52 +0100
From:      Emanuel Haupt <ehaupt@critical.ch>
To:        Florian Smeets <flo@smeets.im>
Cc:        svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject:   Re: svn commit: r307446 - head/www/xpi-colorfultabs
Message-ID:  <20121115113452.2f24c5e606ed6c3fcbcee66a@critical.ch>
In-Reply-To: <50A4C343.7080501@smeets.im>
References:  <201211151016.qAFAGgQj064519@svn.freebsd.org> <20121115112221.ba4ce4e361a4fe5f627f0199@critical.ch> <50A4C343.7080501@smeets.im>

next in thread | previous in thread | raw e-mail | index | archive | help
Florian Smeets <flo@smeets.im> wrote:
> On 11/15/2012 11:22, Emanuel Haupt wrote:
> > Florian Smeets <flo@FreeBSD.org> wrote:
> >> Author: flo
> >> Date: Thu Nov 15 10:16:41 2012
> >> New Revision: 307446
> >> URL: http://svnweb.freebsd.org/changeset/ports/307446
> >>
> >> Log:
> >>   Update to 16.4
> >>   
> >>   Feature safe:	yes
> >>
> >>
> >> Modified: head/www/xpi-colorfultabs/pkg-plist
> >> ==============================================================================
> >> --- head/www/xpi-colorfultabs/pkg-plist	Thu Nov 15 10:01:42
> >> 2012	(r307445) +++ head/www/xpi-colorfultabs/pkg-plist
> >> Thu Nov 15 10:16:41 2012	(r307446) @@ -1,3 +1,5 @@
> >> +%%XPI_XPIDIR%%/chrome/.DS_Store
> >> +%%XPI_XPIDIR%%/chrome/content/.DS_Store
> > 
> > These two files are probably not needed.
> > 
> 
> Yeah, i know. I saw them but decided to just add them to the plist,
> rather than hacking up the Makefile with something to use find on the
> WRKSRC and delete them.
> 
> If anybody sees this as a problem, i can hack the Makefile to delete
> them prior to installation.

This (untested) patch will probably do the trick:

Index: Makefile
===================================================================
--- Makefile    (revision 307446)
+++ Makefile    (working copy)
@@ -13,5 +13,8 @@
 XPI_ID=                {0545b830-f0aa-4d7e-8820-50a4629a56fe}
 XPI_NUM=       1368
 
+pre-patch:
+       @find ${WRKSRC} -name .DS_Store -exec rm -fv {} \;
+
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist   (revision 307446)
+++ pkg-plist   (working copy)
@@ -1,5 +1,3 @@
-%%XPI_XPIDIR%%/chrome/.DS_Store
-%%XPI_XPIDIR%%/chrome/content/.DS_Store
 %%XPI_XPIDIR%%/chrome/content/bak.png
 %%XPI_XPIDIR%%/chrome/content/bkg.png
 %%XPI_XPIDIR%%/chrome/content/border.png





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121115113452.2f24c5e606ed6c3fcbcee66a>