From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 28 19:21:44 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 012E4304;
 Fri, 28 Jun 2013 19:21:43 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E7B6210EB;
 Fri, 28 Jun 2013 19:21:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SJLhhn066573;
 Fri, 28 Jun 2013 19:21:43 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SJLhR8066572;
 Fri, 28 Jun 2013 19:21:43 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201306281921.r5SJLhR8066572@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Fri, 28 Jun 2013 19:21:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321976 - head/www/xpi-adblock
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jun 2013 19:21:44 -0000

Author: flo
Date: Fri Jun 28 19:21:42 2013
New Revision: 321976
URL: http://svnweb.freebsd.org/changeset/ports/321976

Log:
  - fix xpi-* installation for firefox [1]
  - update XPI_APPS_ALL to match reality
  - trim header
  
  Submitted by:	bapt [1]

Modified:
  head/www/xpi-adblock/Makefile.xpi   (contents, props changed)

Modified: head/www/xpi-adblock/Makefile.xpi
==============================================================================
--- head/www/xpi-adblock/Makefile.xpi	Fri Jun 28 18:37:20 2013	(r321975)
+++ head/www/xpi-adblock/Makefile.xpi	Fri Jun 28 19:21:42 2013	(r321976)
@@ -1,12 +1,5 @@
-#-*- mode: makefile; tab-width: 4; -*
-# ex:ts=4
-#
-# New ports collection makefile for:	xpi infrastructure
-# Date created:		28 March 2006
-# Whom:				Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
-#
 
 # XPI_ID		- Extension id, might be in {12345-...} or dev@org format
 # XPI_NUM		- Extension number, as in addons.mozilla.org URL
@@ -87,9 +80,8 @@ EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 XPI_DISTNAME?=	${PORTNAME}
 XPI_APPS_ALL_WC=	*firefox* *thunderbird* *seamonkey*
 
-XPI_APPS_ALL=	firefox firefox3 linux-firefox linux-firefox-devel \
-		thunderbird thunderbird3 linux-thunderbird \
-		seamonkey seamonkey2 linux-seamonkey
+XPI_APPS_ALL=	firefox linux-firefox thunderbird linux-thunderbird \
+		seamonkey linux-seamonkey
 # kompozer linux-kompozer
 # Other apps: mango
 
@@ -131,7 +123,17 @@ USE_XPI=	${WITH_XPI_APPS}
 USE_XPI=	${XPI_APPS_ALL_WC}
 .endif
 
-XPI_APPS?=	${USE_XPI:S.^.${LOCALBASE}/lib/.:S.$./extensions.}
+.if !defined(XPI_APPS)
+.for xpi in ${USE_XPI}
+_xpi:=	${xpi}
+.if ${_xpi:M*firefox*}
+XPI_APPS+=	${LOCALBASE}/lib/${xpi}/browser/extensions
+.else
+XPI_APPS+=	${LOCALBASE}/lib/${xpi}/extensions
+.endif
+.endfor
+.endif
+
 XPI_SLDIRS_ALL=	${XPI_APPS_ALL:S.^.${XPI_SLDIR}/.}
 XPI_SLDIRS=		${USE_XPI:S.^.${XPI_SLDIR}/.}
 XPI_LINKFARMS=	${XPI_APPS} ${XPI_SLDIRS}