2 files changed, 71 insertions, 81 deletions

diff --git a/security/sqlmap/Makefile b/security/sqlmap/Makefile
index 7e4e1e6a8aea..1985b4e4a5b4 100644
--- a/security/sqlmap/Makefile
+++ b/security/sqlmap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sqlmap
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 MASTER_SITES=	https://github.com/sqlmapproject/sqlmap/downloads/ \
 		SF
@@ -18,11 +18,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		PATH=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
+PORTDOCS=	AUTHORS ChangeLog README.html README.pdf THANKS
 
 OPTIONS_DEFINE=	MSF
 MSF_DESC=	Enable Metasploit Framework integration
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if  ${PORT_OPTIONS:MMSF}
@@ -46,18 +46,14 @@ do-build:
 .endfor
 
 do-install:
-.if  ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for F in AUTHORS ChangeLog README.html README.pdf THANKS
-	${INSTALL_DATA} ${WRKDIR}/build/doc/${F} ${DOCSDIR}/
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/build/doc/|} ${STAGEDIR}${DOCSDIR}
 
-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/extra
-	( cd ${WRKDIR}/build/extra/ && ${COPYTREE_SHARE} . ${DATADIR} )
-	( cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} )
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/extra
+	( cd ${WRKDIR}/build/extra/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} )
+	( cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sqlmap )
 
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf-dist
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/sqlmap.conf ${STAGEDIR}${PREFIX}/etc/sqlmap.conf-dist
+	${INSTALL_SCRIPT} ${WRKDIR}/sqlmap.sh ${STAGEDIR}${PREFIX}/bin/sqlmap
 
 .include <bsd.port.mk>
diff --git a/security/sqlmap/pkg-plist b/security/sqlmap/pkg-plist
index 76dd943d0e4d..b29e8c912022 100644
--- a/security/sqlmap/pkg-plist
+++ b/security/sqlmap/pkg-plist
@@ -668,74 +668,68 @@ bin/sqlmap
 %%PYTHON_SITELIBDIR%%/sqlmap/xml/phpids_rules.xml
 %%PYTHON_SITELIBDIR%%/sqlmap/xml/queries.xml
 %%PYTHON_SITELIBDIR%%/sqlmap/xml/sqlmap.xsd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/README.pdf
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%DATADIR%%/msfauxmod/README.txt
-%%DATADIR%%/msfauxmod/sqlmap.rb
-%%DATADIR%%/runcmd/README.txt
-%%DATADIR%%/runcmd/windows/README.txt
-%%DATADIR%%/runcmd/windows/runcmd.sln
-%%DATADIR%%/runcmd/windows/runcmd/runcmd.cpp
-%%DATADIR%%/runcmd/windows/runcmd/runcmd.vcproj
-%%DATADIR%%/runcmd/windows/runcmd/stdafx.cpp
-%%DATADIR%%/runcmd/windows/runcmd/stdafx.h
-%%DATADIR%%/udfhack/README.txt
-%%DATADIR%%/udfhack/linux/32/lib_mysqludf_sys/Makefile
-%%DATADIR%%/udfhack/linux/32/lib_mysqludf_sys/install.sh
-%%DATADIR%%/udfhack/linux/32/lib_mysqludf_sys/lib_mysqludf_sys.c
-%%DATADIR%%/udfhack/linux/32/lib_mysqludf_sys/lib_mysqludf_sys.sql
-%%DATADIR%%/udfhack/linux/32/lib_postgresqludf_sys/Makefile
-%%DATADIR%%/udfhack/linux/32/lib_postgresqludf_sys/install.sh
-%%DATADIR%%/udfhack/linux/32/lib_postgresqludf_sys/lib_postgresqludf_sys.c
-%%DATADIR%%/udfhack/linux/32/lib_postgresqludf_sys/lib_postgresqludf_sys.sql
-%%DATADIR%%/udfhack/linux/64/lib_mysqludf_sys/Makefile
-%%DATADIR%%/udfhack/linux/64/lib_mysqludf_sys/install.sh
-%%DATADIR%%/udfhack/linux/64/lib_mysqludf_sys/lib_mysqludf_sys.c
-%%DATADIR%%/udfhack/linux/64/lib_mysqludf_sys/lib_mysqludf_sys.sql
-%%DATADIR%%/udfhack/linux/64/lib_postgresqludf_sys/Makefile
-%%DATADIR%%/udfhack/linux/64/lib_postgresqludf_sys/install.sh
-%%DATADIR%%/udfhack/linux/64/lib_postgresqludf_sys/lib_postgresqludf_sys.c
-%%DATADIR%%/udfhack/linux/64/lib_postgresqludf_sys/lib_postgresqludf_sys.sql
-%%DATADIR%%/udfhack/linux/README.txt
-%%DATADIR%%/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys.sln
-%%DATADIR%%/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.c
-%%DATADIR%%/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
-%%DATADIR%%/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys.sln
-%%DATADIR%%/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.c
-%%DATADIR%%/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.vcproj
-%%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys.sln
-%%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/__exec_payload.asm
-%%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.c
-%%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
-%%DATADIR%%/udfhack/windows/64/lib_postgresqludf_sys/README.txt
-%%DATADIR%%/udfhack/windows/README.txt
-@dirrm %%DATADIR%%/udfhack/windows/64/lib_postgresqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/64/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/64
-@dirrm %%DATADIR%%/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/32/lib_postgresqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/32/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/windows/32
-@dirrm %%DATADIR%%/udfhack/windows
-@dirrm %%DATADIR%%/udfhack/linux/64/lib_postgresqludf_sys
-@dirrm %%DATADIR%%/udfhack/linux/64/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/linux/64
-@dirrm %%DATADIR%%/udfhack/linux/32/lib_postgresqludf_sys
-@dirrm %%DATADIR%%/udfhack/linux/32/lib_mysqludf_sys
-@dirrm %%DATADIR%%/udfhack/linux/32
-@dirrm %%DATADIR%%/udfhack/linux
-@dirrm %%DATADIR%%/udfhack
-@dirrm %%DATADIR%%/runcmd/windows/runcmd
-@dirrm %%DATADIR%%/runcmd/windows
-@dirrm %%DATADIR%%/runcmd
-@dirrm %%DATADIR%%/msfauxmod
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/sqlmap/msfauxmod/README.txt
+share/sqlmap/msfauxmod/sqlmap.rb
+share/sqlmap/runcmd/README.txt
+share/sqlmap/runcmd/windows/README.txt
+share/sqlmap/runcmd/windows/runcmd.sln
+share/sqlmap/runcmd/windows/runcmd/runcmd.cpp
+share/sqlmap/runcmd/windows/runcmd/runcmd.vcproj
+share/sqlmap/runcmd/windows/runcmd/stdafx.cpp
+share/sqlmap/runcmd/windows/runcmd/stdafx.h
+share/sqlmap/udfhack/README.txt
+share/sqlmap/udfhack/linux/32/lib_mysqludf_sys/Makefile
+share/sqlmap/udfhack/linux/32/lib_mysqludf_sys/install.sh
+share/sqlmap/udfhack/linux/32/lib_mysqludf_sys/lib_mysqludf_sys.c
+share/sqlmap/udfhack/linux/32/lib_mysqludf_sys/lib_mysqludf_sys.sql
+share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys/Makefile
+share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys/install.sh
+share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys/lib_postgresqludf_sys.c
+share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys/lib_postgresqludf_sys.sql
+share/sqlmap/udfhack/linux/64/lib_mysqludf_sys/Makefile
+share/sqlmap/udfhack/linux/64/lib_mysqludf_sys/install.sh
+share/sqlmap/udfhack/linux/64/lib_mysqludf_sys/lib_mysqludf_sys.c
+share/sqlmap/udfhack/linux/64/lib_mysqludf_sys/lib_mysqludf_sys.sql
+share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys/Makefile
+share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys/install.sh
+share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys/lib_postgresqludf_sys.c
+share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys/lib_postgresqludf_sys.sql
+share/sqlmap/udfhack/linux/README.txt
+share/sqlmap/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys.sln
+share/sqlmap/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.c
+share/sqlmap/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
+share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys.sln
+share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.c
+share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys/lib_postgresqludf_sys.vcproj
+share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys.sln
+share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/__exec_payload.asm
+share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.c
+share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys/lib_mysqludf_sys.vcproj
+share/sqlmap/udfhack/windows/64/lib_postgresqludf_sys/README.txt
+share/sqlmap/udfhack/windows/README.txt
+@dirrm share/sqlmap/udfhack/windows/64/lib_postgresqludf_sys
+@dirrm share/sqlmap/udfhack/windows/64/lib_mysqludf_sys/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/windows/64/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/windows/64
+@dirrm share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys/lib_postgresqludf_sys
+@dirrm share/sqlmap/udfhack/windows/32/lib_postgresqludf_sys
+@dirrm share/sqlmap/udfhack/windows/32/lib_mysqludf_sys/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/windows/32/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/windows/32
+@dirrm share/sqlmap/udfhack/windows
+@dirrm share/sqlmap/udfhack/linux/64/lib_postgresqludf_sys
+@dirrm share/sqlmap/udfhack/linux/64/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/linux/64
+@dirrm share/sqlmap/udfhack/linux/32/lib_postgresqludf_sys
+@dirrm share/sqlmap/udfhack/linux/32/lib_mysqludf_sys
+@dirrm share/sqlmap/udfhack/linux/32
+@dirrm share/sqlmap/udfhack/linux
+@dirrm share/sqlmap/udfhack
+@dirrm share/sqlmap/runcmd/windows/runcmd
+@dirrm share/sqlmap/runcmd/windows
+@dirrm share/sqlmap/runcmd
+@dirrm share/sqlmap/msfauxmod
+@dirrm share/sqlmap
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml/banner
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/xml
 @dirrm %%PYTHON_SITELIBDIR%%/sqlmap/udf/postgresql/windows/64/8.4