5 files changed, 61 insertions, 145 deletions

diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index 2fc3f4016e1a..0fadda74fa56 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mx-experimental
-PORTVERSION=	0.9.0
+PORTVERSION=	3.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.egenix.com/files/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,8 +16,9 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sergio@softshark.org
 COMMENT=	The eGenix mx Extensions - EXPERIMENTAL Package
 
+FETCH_CMD=	/usr/bin/fetch -ar
 BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
+#RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/devel/py-mx-experimental/distinfo b/devel/py-mx-experimental/distinfo
index f113c6528b7e..7a2b40a9582a 100644
--- a/devel/py-mx-experimental/distinfo
+++ b/devel/py-mx-experimental/distinfo
@@ -1,3 +1,3 @@
-MD5 (egenix-mx-experimental-0.9.0.tar.gz) = bb1f39be6bad6b35db6fad1908c83658
-SHA256 (egenix-mx-experimental-0.9.0.tar.gz) = 63205e2533952b244638606026ec2021712a1d9535cbbba3377822b5f89a18f8
-SIZE (egenix-mx-experimental-0.9.0.tar.gz) = 640274
+MD5 (egenix-mx-experimental-3.0.0.tar.gz) = f47a4f653631afdc41ca95471f8e359e
+SHA256 (egenix-mx-experimental-3.0.0.tar.gz) = 6e563576e90ad9aecaf8e3c6e795701fb2e245b41e93e3af8a65134554802a47
+SIZE (egenix-mx-experimental-3.0.0.tar.gz) = 1125783
diff --git a/devel/py-mx-experimental/files/patch-mx::Number::mxNumber::mxNumber.h b/devel/py-mx-experimental/files/patch-mx::Number::mxNumber::mxNumber.h
deleted file mode 100644
index f865b8ac1a44..000000000000
--- a/devel/py-mx-experimental/files/patch-mx::Number::mxNumber::mxNumber.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mx/Number/mxNumber/mxNumber.h.orig	Wed Dec  8 07:14:00 2004
-+++ mx/Number/mxNumber/mxNumber.h	Wed Dec  8 07:14:28 2004
-@@ -29,7 +29,7 @@
- #endif
- 
- /* Include the GNU MP header file */
--#include "gmp.h"
-+#include <gmp.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py b/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py
deleted file mode 100644
index cfeff0f9b9cb..000000000000
--- a/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- mxEXPERIMENTAL.py.orig	Wed Dec  8 07:11:42 2004
-+++ mxEXPERIMENTAL.py	Wed Dec  8 07:12:40 2004
-@@ -133,7 +133,7 @@
- 
-             mx_Extension('mx.Number.mxNumber.mxNumber',
-                          ['mx/Number/mxNumber/mxNumber.c'],
--                         include_dirs=['mx/Number/mxNumber'],
-+                         include_dirs=['mx/Number/mxNumber', 'LIBGMPH'],
-                          libraries=['gmp'],
-                          optional_libraries=[('mpfr', ['gmp.h', 'mpfr.h']),
-                                              ]),
-@@ -156,7 +156,6 @@
-     'mx/Number/README',
-     'mx/Number/mxNumber/mxNumber.h',
-     'mx/Number/mxNumber/mxh.h',
--    'mx/Number/mxNumber/gmp.h',
- 
-     # mxTidy
-     'mx/Tidy/Doc/mxTidy.html',
diff --git a/devel/py-mx-experimental/pkg-plist b/devel/py-mx-experimental/pkg-plist
index c8cbc3baf87a..523848843be5 100644
--- a/devel/py-mx-experimental/pkg-plist
+++ b/devel/py-mx-experimental/pkg-plist
@@ -1,110 +1,55 @@
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/COPYRIGHT
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Doc/mxNumber.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/LICENSE
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/LazyModule.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/LazyModule.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/LazyModule.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Number.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Number.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Number.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/README
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/mxNumber.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/mxNumber.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/Overview.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/mxTidy.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/pending.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/release-notes.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/tidy.gif
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/README
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Tidy.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Tidy.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Tidy.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/input.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxTidy.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxTidy.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testMateusz.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testMateusz.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testMateusz.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testWalter.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testWalter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testWalter.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/COPYRIGHT
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/Doc/mxUID.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/LICENSE
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/README
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/UID.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/UID.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/UID.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/mxUID.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/mxUID.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/COPYRIGHT
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Doc/mxURL.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/LICENSE
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/LazyModule.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/LazyModule.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/LazyModule.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Listing.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Listing.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Listing.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/README
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/URL.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/URL.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/URL.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/mxURL.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/mxURL.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Doc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/URL
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/UID/Doc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/UID
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Doc
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/mx/Number
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/mxTidy.so
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testWalter.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/test.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMateusz.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMadjakarta.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/__init__.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testWalter.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/test.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMateusz.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMadjakarta.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testWalter.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/test.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMateusz.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/testMadjakarta.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/mxTidy.h
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/mxh.h
+%%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy/input.html
+%%PYTHON_SITELIBDIR%%/mx/Tidy/Tidy.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/__init__.py
+%%PYTHON_SITELIBDIR%%/mx/Tidy/Tidy.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mx/Tidy/Tidy.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mx/Tidy/README
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/mxNumber.so
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/test.py
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/__init__.py
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/test.pyc
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/test.pyo
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/mxNumber.h
+%%PYTHON_SITELIBDIR%%/mx/Number/mxNumber/mxh.h
+%%PYTHON_SITELIBDIR%%/mx/Number/LazyModule.py
+%%PYTHON_SITELIBDIR%%/mx/Number/Number.py
+%%PYTHON_SITELIBDIR%%/mx/Number/__init__.py
+%%PYTHON_SITELIBDIR%%/mx/Number/LazyModule.pyc
+%%PYTHON_SITELIBDIR%%/mx/Number/Number.pyc
+%%PYTHON_SITELIBDIR%%/mx/Number/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mx/Number/LazyModule.pyo
+%%PYTHON_SITELIBDIR%%/mx/Number/Number.pyo
+%%PYTHON_SITELIBDIR%%/mx/Number/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mx/Number/COPYRIGHT
+%%PYTHON_SITELIBDIR%%/mx/Number/LICENSE
+%%PYTHON_SITELIBDIR%%/mx/Number/README
+%%PYTHON_SITELIBDIR%%/mx/__init__.py
+%%PYTHON_SITELIBDIR%%/mx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mx/__init__.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/mx/Tidy/mxTidy
+@dirrm %%PYTHON_SITELIBDIR%%/mx/Tidy
+@dirrm %%PYTHON_SITELIBDIR%%/mx/Number/mxNumber
+@dirrm %%PYTHON_SITELIBDIR%%/mx/Number
+@dirrm %%PYTHON_SITELIBDIR%%/mx/