4 files changed, 115 insertions, 51 deletions

diff --git a/net/py-smb/Makefile b/net/py-smb/Makefile
index 678fdd8fa56d..604bd5f08e7b 100644
--- a/net/py-smb/Makefile
+++ b/net/py-smb/Makefile
@@ -7,34 +7,32 @@
 #
 
 PORTNAME=	smb
-PORTVERSION=	0.4.5
+PORTVERSION=	1.0.0
 CATEGORIES=	net python
-MASTER_SITES=	http://miketeo.net/files/Projects/py${PORTNAME}/
+MASTER_SITES=	http://miketeo.net/files/Projects/py${PORTNAME}/ \
+		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pysmb-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	SMB/CIFS library written in Python
 
-USE_PYTHON=	yes
-WRKSRC=		${WRKDIR}/pysmb
-NO_BUILD=	yes
-DATADIR=	${PREFIX}/share/py-smb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
+
+USE_PYTHON=	2.6-2.7
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGNAME=	py${PORTNAME}
+
 DOCSDIR=	${PREFIX}/share/doc/py-smb
 
-do-install:
-.for file in nmb.py smb.py pysmb_version.py
-	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PYTHON_SITELIBDIR}
-.endfor
-.for file in nmbquery smbcp smbdu smblistshare
-	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
-.endfor
-	@${MKDIR} ${DATADIR}
-	${CP} ${WRKSRC}/extra/*.reg ${DATADIR}
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/README ${DOCSDIR}
-	${CP} ${WRKSRC}/docs/*.html ${WRKSRC}/docs/*.gif ${DOCSDIR}
+	@(cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} _modules/ ${DOCSDIR}/)
+	@(cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} _static/ ${DOCSDIR}/)
+	@(cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} api/ ${DOCSDIR}/)
+	@(cd ${WRKSRC}/docs/html/ && ${CP} *.html ${DOCSDIR}/)
+	@(cd ${WRKSRC}/docs/html/ && ${CP} *.js ${DOCSDIR}/)
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/py-smb/distinfo b/net/py-smb/distinfo
index 3f8214942f5d..245f55b0f9d9 100644
--- a/net/py-smb/distinfo
+++ b/net/py-smb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pysmb-0.4.5.tar.gz) = 2b29884de1ac6897267b095807d9e61ce85a76827d366f557401eca0c311998d
-SIZE (pysmb-0.4.5.tar.gz) = 30255
+SHA256 (pysmb-1.0.0.tar.gz) = 6d458f4e22f7add276d1a1913d3d152e3563342d88b4c85110836cf6279f71cd
+SIZE (pysmb-1.0.0.tar.gz) = 1052636
diff --git a/net/py-smb/pkg-descr b/net/py-smb/pkg-descr
index dbf9ae008810..41eb693e67e7 100644
--- a/net/py-smb/pkg-descr
+++ b/net/py-smb/pkg-descr
@@ -1,12 +1,12 @@
 pysmb is an experimental SMB/CIFS library written in Python.
-The library has been tested to be able to connect Win 98 SE and Samba 2.0
-machines, and upload/download files to and from these machines. Unfortunately,
-some users have reported that pysmb is unable to work with Windows 2000 and
-Windows XP.
+It implements the client-side SMB/CIFS protocol which allows your Python
+application to access and transfer files to/from SMB/CIFS shared folders
+like your Windows file sharing and Samba folders. 
+It was tested with Windows XP SP3, Windows Vista, Windows 7 and Samba 3.x.
 
 Modules
-    smb - Contains all the SMB operations and constants 
+    smb - Contains all the SMB operations and constants
     nmb - Contains some of the NetBIOS over TCP/IP operations which is
-          necessary for the smb module to operate. 
+          necessary for the smb module to operate.
 
-WWW: http://miketeo.net/wp/index.php/projects/pysmb
+WWW:	http://miketeo.net/wp/index.php/projects/pysmb
diff --git a/net/py-smb/pkg-plist b/net/py-smb/pkg-plist
index c278bd9d740c..5d8f0b3df96a 100644
--- a/net/py-smb/pkg-plist
+++ b/net/py-smb/pkg-plist
@@ -1,27 +1,93 @@
-bin/nmbquery
-bin/smbcp
-bin/smbdu
-bin/smblistshare
-%%PYTHON_SITELIBDIR%%/nmb.py
-%%PYTHON_SITELIBDIR%%/smb.py
-%%PYTHON_SITELIBDIR%%/pysmb_version.py
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOS.py
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOS.pyc
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOS.pyo
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOSProtocol.py
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOSProtocol.pyc
+%%PYTHON_SITELIBDIR%%/nmb/NetBIOSProtocol.pyo
+%%PYTHON_SITELIBDIR%%/nmb/__init__.py
+%%PYTHON_SITELIBDIR%%/nmb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/nmb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/nmb/base.py
+%%PYTHON_SITELIBDIR%%/nmb/base.pyc
+%%PYTHON_SITELIBDIR%%/nmb/base.pyo
+%%PYTHON_SITELIBDIR%%/nmb/nmb_constants.py
+%%PYTHON_SITELIBDIR%%/nmb/nmb_constants.pyc
+%%PYTHON_SITELIBDIR%%/nmb/nmb_constants.pyo
+%%PYTHON_SITELIBDIR%%/nmb/nmb_structs.py
+%%PYTHON_SITELIBDIR%%/nmb/nmb_structs.pyc
+%%PYTHON_SITELIBDIR%%/nmb/nmb_structs.pyo
+%%PYTHON_SITELIBDIR%%/nmb/utils.py
+%%PYTHON_SITELIBDIR%%/nmb/utils.pyc
+%%PYTHON_SITELIBDIR%%/nmb/utils.pyo
+%%PYTHON_SITELIBDIR%%/smb/SMBConnection.py
+%%PYTHON_SITELIBDIR%%/smb/SMBConnection.pyc
+%%PYTHON_SITELIBDIR%%/smb/SMBConnection.pyo
+%%PYTHON_SITELIBDIR%%/smb/SMBProtocol.py
+%%PYTHON_SITELIBDIR%%/smb/SMBProtocol.pyc
+%%PYTHON_SITELIBDIR%%/smb/SMBProtocol.pyo
+%%PYTHON_SITELIBDIR%%/smb/__init__.py
+%%PYTHON_SITELIBDIR%%/smb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/smb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/smb/base.py
+%%PYTHON_SITELIBDIR%%/smb/base.pyc
+%%PYTHON_SITELIBDIR%%/smb/base.pyo
+%%PYTHON_SITELIBDIR%%/smb/ntlm.py
+%%PYTHON_SITELIBDIR%%/smb/ntlm.pyc
+%%PYTHON_SITELIBDIR%%/smb/ntlm.pyo
+%%PYTHON_SITELIBDIR%%/smb/securityblob.py
+%%PYTHON_SITELIBDIR%%/smb/securityblob.pyc
+%%PYTHON_SITELIBDIR%%/smb/securityblob.pyo
+%%PYTHON_SITELIBDIR%%/smb/smb_constants.py
+%%PYTHON_SITELIBDIR%%/smb/smb_constants.pyc
+%%PYTHON_SITELIBDIR%%/smb/smb_constants.pyo
+%%PYTHON_SITELIBDIR%%/smb/smb_structs.py
+%%PYTHON_SITELIBDIR%%/smb/smb_structs.pyc
+%%PYTHON_SITELIBDIR%%/smb/smb_structs.pyo
+%%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/nmb/NetBIOS.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/nmb/NetBIOSProtocol.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/smb/SMBConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/smb/SMBProtocol.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/smb/base.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/smb/smb_structs.html
+%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
+%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/navigation.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinxdoc.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
+%%PORTDOCS%%%%DOCSDIR%%/api/nmb_NBNSProtocol.html
+%%PORTDOCS%%%%DOCSDIR%%/api/nmb_NetBIOS.html
+%%PORTDOCS%%%%DOCSDIR%%/api/smb_SMBConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/api/smb_SMBProtocolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/api/smb_SharedDevice.html
+%%PORTDOCS%%%%DOCSDIR%%/api/smb_SharedFile.html
+%%PORTDOCS%%%%DOCSDIR%%/api/smb_exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/extending.html
+%%PORTDOCS%%%%DOCSDIR%%/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/nmb.html
-%%PORTDOCS%%%%DOCSDIR%%/nmb_nbhostentry.html
-%%PORTDOCS%%%%DOCSDIR%%/nmb_nbnodeentry.html
-%%PORTDOCS%%%%DOCSDIR%%/nmb_netbios.html
-%%PORTDOCS%%%%DOCSDIR%%/nmb_netbiossession.html
-%%PORTDOCS%%%%DOCSDIR%%/return.gif
-%%PORTDOCS%%%%DOCSDIR%%/smb.html
-%%PORTDOCS%%%%DOCSDIR%%/smb_shareddevice.html
-%%PORTDOCS%%%%DOCSDIR%%/smb_sharedfile.html
-%%PORTDOCS%%%%DOCSDIR%%/smb_smb.html
-%%PORTDOCS%%%%DOCSDIR%%/smb_smbmachine.html
-%%DATADIR%%/NT4_PlainPassword.reg
-%%DATADIR%%/Win2000_PlainPassword.reg
-%%DATADIR%%/Win95_PlainPassword.reg
-%%DATADIR%%/Win98_PlainPassword.reg
-%%DATADIR%%/WinME_PlainPassword.reg
-@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/api
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_static
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_modules/smb
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_modules/nmb
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/_modules
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/smb
+@dirrm %%PYTHON_SITELIBDIR%%/nmb