Upgrade to 0.8.1, switch to the new XPI infrastructure, and unbreak.

8 files changed, 50 insertions, 12 deletions

diff --git a/www/preferential-firefox/Makefile b/www/preferential-firefox/Makefile
index 5439ebd82605..22acc09a5e37 100644
--- a/www/preferential-firefox/Makefile
+++ b/www/preferential-firefox/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	preferential
-#PKGNAMESUFFIX set to -firefox in ../mozex/Makefile.xpi
+PORTVERSION=	0.8.1
+CATEGORIES=	www
+MASTER_SITES=	http://mozdev.elliptic.fr/preferential/versions/	\
+		http://mozdev.oregonstate.edu/preferential/versions/	\
+		http://downloads.mozdev.org/preferential/versions/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI interface to view & edit all Firefox prefs
 
-MASTERDIR=	${.CURDIR}/../preferential
+XPI_ID=		{e3a1bec3-1cc1-4d20-875b-a10587471a5e}
+XPI_FILES=	chrome/preferential.jar install.js install.rdf chrome.manifest
+XPI_DIRS=	chrome
 
-BROKEN="Does not work with Firefox 1.5"
-WITH_FIREFOX=	yes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/preferential-firefox/distinfo b/www/preferential-firefox/distinfo
new file mode 100644
index 000000000000..e0e984d17a02
--- /dev/null
+++ b/www/preferential-firefox/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/preferential-0.8.1.xpi) = 3ff0d159347c878e401ae06f76d1f62a
+SHA256 (xpi/preferential-0.8.1.xpi) = 9658d342d4fde12d8e2af854c0b56af6b854434d9959696b5a194bf40870b7b1
+SIZE (xpi/preferential-0.8.1.xpi) = 86986
diff --git a/www/preferential-firefox/files/chrome.manifest b/www/preferential-firefox/files/chrome.manifest
new file mode 100644
index 000000000000..5d0f48cb33cc
--- /dev/null
+++ b/www/preferential-firefox/files/chrome.manifest
@@ -0,0 +1,7 @@
+
+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
new file mode 100644
index 000000000000..f413839b2503
--- /dev/null
+++ b/www/preferential-firefox/pkg-descr
@@ -0,0 +1,5 @@
+The Preferential project aims to provide all users of Gecko browsers
+(eg. Mozilla, Firefox) with a simple, accessible GUI that allows the
+modification of any preference set within that browser environment.
+
+WWW: http://preferential.mozdev.org/
diff --git a/www/xpi-preferential/Makefile b/www/xpi-preferential/Makefile
index 5439ebd82605..22acc09a5e37 100644
--- a/www/xpi-preferential/Makefile
+++ b/www/xpi-preferential/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	preferential
-#PKGNAMESUFFIX set to -firefox in ../mozex/Makefile.xpi
+PORTVERSION=	0.8.1
+CATEGORIES=	www
+MASTER_SITES=	http://mozdev.elliptic.fr/preferential/versions/	\
+		http://mozdev.oregonstate.edu/preferential/versions/	\
+		http://downloads.mozdev.org/preferential/versions/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI interface to view & edit all Firefox prefs
 
-MASTERDIR=	${.CURDIR}/../preferential
+XPI_ID=		{e3a1bec3-1cc1-4d20-875b-a10587471a5e}
+XPI_FILES=	chrome/preferential.jar install.js install.rdf chrome.manifest
+XPI_DIRS=	chrome
 
-BROKEN="Does not work with Firefox 1.5"
-WITH_FIREFOX=	yes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/xpi-preferential/distinfo b/www/xpi-preferential/distinfo
new file mode 100644
index 000000000000..e0e984d17a02
--- /dev/null
+++ b/www/xpi-preferential/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/preferential-0.8.1.xpi) = 3ff0d159347c878e401ae06f76d1f62a
+SHA256 (xpi/preferential-0.8.1.xpi) = 9658d342d4fde12d8e2af854c0b56af6b854434d9959696b5a194bf40870b7b1
+SIZE (xpi/preferential-0.8.1.xpi) = 86986
diff --git a/www/xpi-preferential/files/chrome.manifest b/www/xpi-preferential/files/chrome.manifest
new file mode 100644
index 000000000000..5d0f48cb33cc
--- /dev/null
+++ b/www/xpi-preferential/files/chrome.manifest
@@ -0,0 +1,7 @@
+
+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/xpi-preferential/pkg-descr b/www/xpi-preferential/pkg-descr
new file mode 100644
index 000000000000..f413839b2503
--- /dev/null
+++ b/www/xpi-preferential/pkg-descr
@@ -0,0 +1,5 @@
+The Preferential project aims to provide all users of Gecko browsers
+(eg. Mozilla, Firefox) with a simple, accessible GUI that allows the
+modification of any preference set within that browser environment.
+
+WWW: http://preferential.mozdev.org/