6 files changed, 94 insertions, 84 deletions

diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index 9929775f738d..aae1aec956ee 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -7,17 +7,16 @@
 #
 
 PORTNAME=	mx-experimental
-PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://www.lemburg.com/files/python/
+MASTER_SITES=	http://www.egenix.com/files/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergio@softshark.org
 COMMENT=	The eGenix mx Extensions - EXPERIMENTAL Package
 
-BUILD_DEPENDS=	${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp4
+BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
 
 USE_REINPLACE=	yes
diff --git a/devel/py-mx-experimental/distinfo b/devel/py-mx-experimental/distinfo
index ed01ed95ea4f..e2daae9303e2 100644
--- a/devel/py-mx-experimental/distinfo
+++ b/devel/py-mx-experimental/distinfo
@@ -1,2 +1,2 @@
-MD5 (egenix-mx-experimental-0.6.0.tar.gz) = 6e4f65d2b05af5b93d6a6b32c42834cb
-SIZE (egenix-mx-experimental-0.6.0.tar.gz) = 631307
+MD5 (egenix-mx-experimental-0.8.0.tar.gz) = 89aa8e639f301530bd25bd895259c9c7
+SIZE (egenix-mx-experimental-0.8.0.tar.gz) = 638962
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
index 32fe3f997e4a..a87a41ea0b9e 100644
--- a/devel/py-mx-experimental/files/patch-mx::Number::mxNumber::mxNumber.h
+++ b/devel/py-mx-experimental/files/patch-mx::Number::mxNumber::mxNumber.h
@@ -1,6 +1,6 @@
---- mx/Number/mxNumber/mxNumber.h.orig	Mon Nov 26 12:46:34 2001
-+++ mx/Number/mxNumber/mxNumber.h	Mon Nov 26 12:46:43 2001
-@@ -30,7 +30,7 @@
+--- mx/Number/mxNumber/mxNumber.h.orig	Sat Aug 21 20:32:58 2004
++++ mx/Number/mxNumber/mxNumber.h	Sat Aug 21 20:33:16 2004
+@@ -29,7 +29,7 @@
  #endif
  
  /* Include the GNU MP header file */
diff --git a/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py b/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py
index 59d8cb9e4aa8..d2995f6dabd6 100644
--- a/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py
+++ b/devel/py-mx-experimental/files/patch-mxEXPERIMENTAL.py
@@ -1,15 +1,15 @@
---- mxEXPERIMENTAL.py.orig	Mon Nov 26 12:44:48 2001
-+++ mxEXPERIMENTAL.py	Mon Nov 26 12:45:52 2001
-@@ -140,7 +140,7 @@
+--- mxEXPERIMENTAL.py.orig	Sat Aug 21 20:34:49 2004
++++ mxEXPERIMENTAL.py	Sat Aug 21 20:38:15 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']),
- 
-             ]
- else:
-@@ -160,7 +160,6 @@
+-                         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',
diff --git a/devel/py-mx-experimental/pkg-descr b/devel/py-mx-experimental/pkg-descr
index d0385ca23ff6..453b80ec0302 100644
--- a/devel/py-mx-experimental/pkg-descr
+++ b/devel/py-mx-experimental/pkg-descr
@@ -1,4 +1,8 @@
-eGenix.com mx Extensions - EXPERIMENTAL Package
+eGenix.com mx Extensions for Python - EXPERIMENTAL Package
+
+The mx Extension Series(TM) is a collection of software packages which aims at
+providing professional quality add-ons for the Open Source Language Python
+(see http://www.python.org).
 
 It consists of the following packages:
 
@@ -6,3 +10,5 @@ mxNumber	- Extended Numeric Types
 mxTidy		- Interface to HTML Tidy (HTML/XML cleanup tool)
 mxURL		- A URL Datatype
 mxUID		- A UID Datatype
+
+WWW: http://www.egenix.com/
diff --git a/devel/py-mx-experimental/pkg-plist b/devel/py-mx-experimental/pkg-plist
index 51fa87fa6629..9f7436d55239 100644
--- a/devel/py-mx-experimental/pkg-plist
+++ b/devel/py-mx-experimental/pkg-plist
@@ -1,15 +1,6 @@
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Doc/mxNumber.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/mxNumber.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Number/mxNumber/test.pyo
-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/mxh.h
 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
@@ -21,25 +12,21 @@ 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/Tidy/Doc/mxTidy.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/Doc/mxLicense.html
+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/mxTidy/testWalter.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxTidy.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testWalter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/testWalter.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/test.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxTidy.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/Tidy/mxTidy/input.html
 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
@@ -47,18 +34,45 @@ 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/URL/Doc/mxURL.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/mxURL.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/URL/mxURL/test.pyo
-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/mxh.h
+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
@@ -73,36 +87,27 @@ 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/UID/Doc/mxUID.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/Doc/mxLicense.html
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/mxUID.so
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/mxUID/test.pyo
-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/mxh.h
-lib/%%PYTHON_VERSION%%/site-packages/mx/UID/COPYRIGHT
-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
-@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
-@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
+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
+lib/%%PYTHON_VERSION%%/site-packages/mx/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/mx/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/mx/__init__.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
-@unexec rmdir %D/lib/%%PYTHON_VERSION%%/site-packages/mx 2>/dev/null || true
+@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