- Move www/preferential-firefox to www/xpi-preferential

- Changed comment and added Author
- Take maintainership

PR:		ports/97495
Submitted by:	Simon Olofsson <simon@olofsson.de>
Approved by:	krion (mentor)

7 files changed, 5 insertions, 46 deletions

diff --git a/www/Makefile b/www/Makefile
index f68fa1e..9870cc9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -793,7 +793,6 @@
     SUBDIR += postnuke
     SUBDIR += pound
     SUBDIR += preferential
-    SUBDIR += preferential-firefox
     SUBDIR += privoxy
     SUBDIR += privoxy+ipv6
     SUBDIR += pserv
@@ -1005,6 +1004,7 @@
     SUBDIR += xpi-no-referrer
     SUBDIR += xpi-noscript
     SUBDIR += xpi-pdf_download
+    SUBDIR += xpi-preferential
     SUBDIR += xpi-savegenpage
     SUBDIR += xpi-searchstatus
     SUBDIR += xpi-server_switcher
diff --git a/www/preferential-firefox/Makefile b/www/preferential-firefox/Makefile
deleted file mode 100644
index 3a95fbb..0000000
--- a/www/preferential-firefox/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Ports collection makefile for:	preferential-firefox
-# Date created:				Tue Oct 28, 2003
-# Whom:					Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	preferential
-PORTVERSION=	0.8.1
-DISTVERSIONSUFFIX=	-fx+mz+tb
-CATEGORIES=	www
-MASTER_SITE_SUBDIR=	extensions/preferential_new_guid_
-DISTNAME=	preferential_new_guid_-${PORTVERSION}${DISTVERSIONSUFFIX}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GUI interface to view & edit all Firefox prefs
-
-XPI_ID=		{e3a1bec3-1cc1-4d20-875b-a10587471a5e}
-XPI_FILES=	chrome/preferential.jar install.js install.rdf chrome.manifest
-XPI_DIRS=	chrome
-
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
diff --git a/www/preferential-firefox/distinfo b/www/preferential-firefox/distinfo
deleted file mode 100644
index c96fac2..0000000
--- a/www/preferential-firefox/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xpi/preferential_new_guid_-0.8.1-fx+mz+tb.xpi) = 2d38b18292744cba5362c137ac59f669
-SHA256 (xpi/preferential_new_guid_-0.8.1-fx+mz+tb.xpi) = 9892e3f01e30ce216a933dec802b0e007f0e92dbac782f7afeb03213ee0394ab
-SIZE (xpi/preferential_new_guid_-0.8.1-fx+mz+tb.xpi) = 86987
diff --git a/www/preferential-firefox/files/chrome.manifest b/www/preferential-firefox/files/chrome.manifest
deleted file mode 100644
index 5d0f48c..0000000
--- a/www/preferential-firefox/files/chrome.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-
-overlay	chrome://navigator/content/navigator.xul	chrome://preferential/content/preferential-nav-overlay.xul
-overlay	chrome://browser/content/browser.xul	chrome://preferential/content/preferential-phn-overlay.xul
-overlay	chrome://messenger/content/mailWindowOverlay.xul	chrome://preferential/content/preferential-thn-overlay.xul
-content	preferential	jar:chrome/preferential.jar!/content/
-
-locale	preferential	en-US	jar:chrome/preferential.jar!/locale/en-US/preferential/
diff --git a/www/preferential-firefox/pkg-descr b/www/preferential-firefox/pkg-descr
deleted file mode 100644
index 3928069..0000000
--- a/www/preferential-firefox/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-The Preferential project aims to provide a comprehensive resource
-for finding Mozilla preference documentation. It is also a popular
-Mozilla extension that provides all Gecko-based products (eg.
-Mozilla Suite, Firefox & Thunderbird) with a simple, accessible
-GUI to use when browsing and modifying preferences set within that
-product.
-
-WWW: http://preferential.mozdev.org/
diff --git a/www/xpi-preferential/Makefile b/www/xpi-preferential/Makefile
index 3a95fbb..baaf22c 100644
--- a/www/xpi-preferential/Makefile
+++ b/www/xpi-preferential/Makefile
@@ -9,12 +9,11 @@ PORTNAME=	preferential
 PORTVERSION=	0.8.1
 DISTVERSIONSUFFIX=	-fx+mz+tb
 CATEGORIES=	www
-MASTER_SITE_SUBDIR=	extensions/preferential_new_guid_
-DISTNAME=	preferential_new_guid_-${PORTVERSION}${DISTVERSIONSUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GUI interface to view & edit all Firefox prefs
+MAINTAINER=	simon@olofsson.de
+COMMENT=	Advanced preferences manager for Mozilla-based products
 
+XPI_DISTNAME=	preferential_new_guid_
 XPI_ID=		{e3a1bec3-1cc1-4d20-875b-a10587471a5e}
 XPI_FILES=	chrome/preferential.jar install.js install.rdf chrome.manifest
 XPI_DIRS=	chrome
diff --git a/www/xpi-preferential/pkg-descr b/www/xpi-preferential/pkg-descr
index 3928069..bd41f07 100644
--- a/www/xpi-preferential/pkg-descr
+++ b/www/xpi-preferential/pkg-descr
@@ -5,4 +5,5 @@ Mozilla Suite, Firefox & Thunderbird) with a simple, accessible
 GUI to use when browsing and modifying preferences set within that
 product.
 
+Author:	Stephen Bounds <guruj@mbox.com.au>
 WWW: http://preferential.mozdev.org/