Make ntlmaps consistent with other python ports and improve performance.

Suggested by: sat

2 files changed, 52 insertions, 7 deletions

diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index aec234e3b094..826b296a3199 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -6,21 +6,27 @@
 
 PORTNAME=	ntlmaps
 PORTVERSION=	0.9.9.0.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kevlo@FreeBSD.org
-COMMENT=	A proxy software that authenticates using the NTLM protocol
+COMMENT=	A proxy that authenticates the user using the NTLM protocol
 
 USE_PYTHON=	yes
-NO_BUILD=	yes
 
 DOCS=		COPYING Install.txt changelog.txt readme.txt research.txt
 
 post-patch:
 	${REINPLACE_CMD} -e \
 	    's,^#! /usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/main.py
+	@${RM} -rf ${WRKSRC}/main.py.bak
+
+do-build:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+
 do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -30,8 +36,8 @@ do-install:
 .endif
 	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
 	@${MKDIR} ${PREFIX}/share/examples/ntlmaps
-	${INSTALL_DATA} ${WRKSRC}/*.py ${PYTHON_SITELIBDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/lib/*.py ${PYTHON_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/*.py* ${PYTHON_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.py* ${PYTHON_SITELIBDIR}/${PORTNAME}
 	${CHMOD} +x ${PYTHON_SITELIBDIR}/${PORTNAME}/main.py
 	${LN} -fs ${PYTHON_SITELIBDIR}/${PORTNAME}/main.py ${PREFIX}/bin/ntlmaps
 	${INSTALL_DATA} ${WRKSRC}/server.cfg ${PREFIX}/share/examples/ntlmaps
diff --git a/net/ntlmaps/pkg-plist b/net/ntlmaps/pkg-plist
index a5fe301e0298..8386701b4c2d 100644
--- a/net/ntlmaps/pkg-plist
+++ b/net/ntlmaps/pkg-plist
@@ -1,31 +1,70 @@
 bin/ntlmaps
-%%EXAMPLESDIR%%/server.cfg
+share/examples/ntlmaps/server.cfg
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Install.txt
 %%PORTDOCS%%%%DOCSDIR%%/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/research.txt
 %%PYTHON_SITELIBDIR%%/ntlmaps/U32.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/U32.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/U32.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/__init__.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/__init__.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/basic_auth.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/basic_auth.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/basic_auth.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/config.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/config.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/config.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/config_affairs.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/config_affairs.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/config_affairs.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/des.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/des.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/des.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/des_c.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/des_c.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/des_c.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/des_data.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/des_data.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/des_data.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/http_header.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/http_header.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/http_header.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/logger.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/logger.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/logger.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/main.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/main.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/main.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/md4.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/md4.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/md4.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/monitor_upstream.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/monitor_upstream.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/monitor_upstream.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_auth.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_auth.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_auth.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_messages.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_messages.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_messages.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_procs.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_procs.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/ntlm_procs.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/proxy_client.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/proxy_client.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/proxy_client.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/server.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/server.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/server.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/utils.py
+%%PYTHON_SITELIBDIR%%/ntlmaps/utils.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/utils.pyo
 %%PYTHON_SITELIBDIR%%/ntlmaps/www_client.py
-@unexec rm %D/%%PYTHON_SITELIBDIR%%/ntlmaps/*.pyc 2>/dev/null || true
+%%PYTHON_SITELIBDIR%%/ntlmaps/www_client.pyc
+%%PYTHON_SITELIBDIR%%/ntlmaps/www_client.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/ntlmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+@dirrm share/examples/ntlmaps