Upgrade to 1.9.0, switch to the new XPI mechanism, and unbreak.

8 files changed, 56 insertions, 14 deletions

diff --git a/www/mozex-firefox/Makefile b/www/mozex-firefox/Makefile
index bc1ae0d5549..44bd1c494d9 100644
--- a/www/mozex-firefox/Makefile
+++ b/www/mozex-firefox/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	mozex
-PORTREVISION=	4
-#PKGNAMESUFFIX set to -firefox in ../mozex/Makefile.xpi
+PORTVERSION=	1.9.0
+CATEGORIES=	www
+MASTER_SITES=	http://mozdev.oregonstate.edu/mozex/	\
+		http://downloads.mozdev.org/mozex/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mozex allows Firefox's users to use external programs for mail, news, etc.
 
-MASTERDIR=	${.CURDIR}/../mozex
+XPI_ID=		{01bc0112-afff-4fb5-8772-191bf35a8ffb}
+XPI_FILES=	chrome/mozex.jar install.js install.rdf chrome.manifest
+XPI_DIRS=	chrome
 
-WITH_FIREFOX=	yes
-BROKEN="Does not work with Firefox 1.5"
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/mozex-firefox/distinfo b/www/mozex-firefox/distinfo
new file mode 100644
index 00000000000..20b00d2512b
--- /dev/null
+++ b/www/mozex-firefox/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/mozex-1.9.0.xpi) = a492bbe8076f70f4c4f43306d22973ba
+SHA256 (xpi/mozex-1.9.0.xpi) = b9f357d05ec14d62e834a65106723dae7843a21bff8232d23e12fc2c1bd6321a
+SIZE (xpi/mozex-1.9.0.xpi) = 60082
diff --git a/www/mozex-firefox/files/chrome.manifest b/www/mozex-firefox/files/chrome.manifest
new file mode 100644
index 00000000000..b02787999ef
--- /dev/null
+++ b/www/mozex-firefox/files/chrome.manifest
@@ -0,0 +1,6 @@
+
+overlay	chrome://navigator/content/navigator.xul	chrome://mozex/content/mozex.xul
+overlay	chrome://communicator/content/pref/preftree.xul	chrome://mozex/content/mozexPrefOverlay.xul
+overlay	chrome://browser/content/browser.xul	chrome://mozex/content/mozex.xul
+overlay	chrome://browser/content/pref/pref.xul	chrome://mozex/content/mozexPrefOverlay.xul
+content	mozex	jar:chrome/mozex.jar!/content/mozex/
diff --git a/www/mozex-firefox/pkg-descr b/www/mozex-firefox/pkg-descr
new file mode 100644
index 00000000000..fe15d0df1ed
--- /dev/null
+++ b/www/mozex-firefox/pkg-descr
@@ -0,0 +1,10 @@
+Mozex is an extension to Mozilla or Firefox which allows the user to use
+external programs for these actions:
+
+    * view page source
+    * edit content of textareas (possibly utilizing a spell-checker in the
+      text editor)
+    * handle mailto, news, telnet and FTP links
+    * download files
+
+WWW: http://mozex.mozdev.org/index.html
diff --git a/www/xpi-mozex/Makefile b/www/xpi-mozex/Makefile
index bc1ae0d5549..44bd1c494d9 100644
--- a/www/xpi-mozex/Makefile
+++ b/www/xpi-mozex/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	mozex
-PORTREVISION=	4
-#PKGNAMESUFFIX set to -firefox in ../mozex/Makefile.xpi
+PORTVERSION=	1.9.0
+CATEGORIES=	www
+MASTER_SITES=	http://mozdev.oregonstate.edu/mozex/	\
+		http://downloads.mozdev.org/mozex/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mozex allows Firefox's users to use external programs for mail, news, etc.
 
-MASTERDIR=	${.CURDIR}/../mozex
+XPI_ID=		{01bc0112-afff-4fb5-8772-191bf35a8ffb}
+XPI_FILES=	chrome/mozex.jar install.js install.rdf chrome.manifest
+XPI_DIRS=	chrome
 
-WITH_FIREFOX=	yes
-BROKEN="Does not work with Firefox 1.5"
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/xpi-mozex/distinfo b/www/xpi-mozex/distinfo
new file mode 100644
index 00000000000..20b00d2512b
--- /dev/null
+++ b/www/xpi-mozex/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/mozex-1.9.0.xpi) = a492bbe8076f70f4c4f43306d22973ba
+SHA256 (xpi/mozex-1.9.0.xpi) = b9f357d05ec14d62e834a65106723dae7843a21bff8232d23e12fc2c1bd6321a
+SIZE (xpi/mozex-1.9.0.xpi) = 60082
diff --git a/www/xpi-mozex/files/chrome.manifest b/www/xpi-mozex/files/chrome.manifest
new file mode 100644
index 00000000000..b02787999ef
--- /dev/null
+++ b/www/xpi-mozex/files/chrome.manifest
@@ -0,0 +1,6 @@
+
+overlay	chrome://navigator/content/navigator.xul	chrome://mozex/content/mozex.xul
+overlay	chrome://communicator/content/pref/preftree.xul	chrome://mozex/content/mozexPrefOverlay.xul
+overlay	chrome://browser/content/browser.xul	chrome://mozex/content/mozex.xul
+overlay	chrome://browser/content/pref/pref.xul	chrome://mozex/content/mozexPrefOverlay.xul
+content	mozex	jar:chrome/mozex.jar!/content/mozex/
diff --git a/www/xpi-mozex/pkg-descr b/www/xpi-mozex/pkg-descr
new file mode 100644
index 00000000000..fe15d0df1ed
--- /dev/null
+++ b/www/xpi-mozex/pkg-descr
@@ -0,0 +1,10 @@
+Mozex is an extension to Mozilla or Firefox which allows the user to use
+external programs for these actions:
+
+    * view page source
+    * edit content of textareas (possibly utilizing a spell-checker in the
+      text editor)
+    * handle mailto, news, telnet and FTP links
+    * download files
+
+WWW: http://mozex.mozdev.org/index.html