- Rename mozex-firefox to xpi-mozex

- Update to 1.9.2
- Take maintainership

PR:		ports/98130
Submitted by:	Simon Olofsson <simon@olofsson.de>
Repocopy by:	marcus

8 files changed, 9 insertions, 49 deletions

diff --git a/www/Makefile b/www/Makefile
index c16a6ad18ee9..70a9f38fadef 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -390,7 +390,6 @@
     SUBDIR += monkey
     SUBDIR += moodle
     SUBDIR += mozex
-    SUBDIR += mozex-firefox
     SUBDIR += mozilla
     SUBDIR += mozilla-bonobo
     SUBDIR += mozilla-devel
@@ -1023,6 +1022,7 @@
     SUBDIR += xpi-locale-switcher
     SUBDIR += xpi-mldonkey
     SUBDIR += xpi-mousegestures
+    SUBDIR += xpi-mozex
     SUBDIR += xpi-no-referrer
     SUBDIR += xpi-noscript
     SUBDIR += xpi-pdf_download
diff --git a/www/mozex-firefox/Makefile b/www/mozex-firefox/Makefile
deleted file mode 100644
index 14ee27cae5b2..000000000000
--- a/www/mozex-firefox/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Ports collection makefile for:  mozex-firefox
-# Date created:			  Tue Oct 28, 2003
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mozex
-PORTVERSION=	1.9.0
-CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZDEV}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Mozex allows Firefox's users to use external programs for mail, news, etc.
-
-XPI_ID=		{01bc0112-afff-4fb5-8772-191bf35a8ffb}
-XPI_FILES=	chrome/mozex.jar install.js install.rdf chrome.manifest
-XPI_DIRS=	chrome
-
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
diff --git a/www/mozex-firefox/distinfo b/www/mozex-firefox/distinfo
deleted file mode 100644
index 20b00d2512bf..000000000000
--- a/www/mozex-firefox/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b02787999ef4..000000000000
--- a/www/mozex-firefox/files/chrome.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-
-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
deleted file mode 100644
index fe15d0df1edf..000000000000
--- a/www/mozex-firefox/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-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 14ee27cae5b2..1dccc90c1a82 100644
--- a/www/xpi-mozex/Makefile
+++ b/www/xpi-mozex/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	mozex
-PORTVERSION=	1.9.0
+PORTVERSION=	1.9.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZDEV}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Mozex allows Firefox's users to use external programs for mail, news, etc.
+MAINTAINER=	simon@olofsson.de
+COMMENT=	External commands integration
 
 XPI_ID=		{01bc0112-afff-4fb5-8772-191bf35a8ffb}
 XPI_FILES=	chrome/mozex.jar install.js install.rdf chrome.manifest
diff --git a/www/xpi-mozex/distinfo b/www/xpi-mozex/distinfo
index 20b00d2512bf..5ad734e7dd80 100644
--- a/www/xpi-mozex/distinfo
+++ b/www/xpi-mozex/distinfo
@@ -1,3 +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
+MD5 (xpi/mozex-1.9.2.xpi) = 261d6e7153955a0c47419903fc927c6d
+SHA256 (xpi/mozex-1.9.2.xpi) = 4bcaacf554d07a5d88fb4241b9c20107778943d6b549db9b0273ff1b7ae84aa8
+SIZE (xpi/mozex-1.9.2.xpi) = 61049
diff --git a/www/xpi-mozex/pkg-descr b/www/xpi-mozex/pkg-descr
index fe15d0df1edf..8aed5e4e2a24 100644
--- a/www/xpi-mozex/pkg-descr
+++ b/www/xpi-mozex/pkg-descr
@@ -7,4 +7,5 @@ external programs for these actions:
     * handle mailto, news, telnet and FTP links
     * download files
 
-WWW: http://mozex.mozdev.org/index.html
+Author: Vladimir Marek <vlmarek@volny.cz>
+WWW: http://mozex.mozdev.org/