3 files changed, 47 insertions, 50 deletions

diff --git a/security/hmap/Makefile b/security/hmap/Makefile
index 56969a166644..913a96640f75 100644
--- a/security/hmap/Makefile
+++ b/security/hmap/Makefile
@@ -7,37 +7,35 @@
 
 PORTNAME=	hmap
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://ujeni.murkyroc.com/hmap/code/current/	\
-		http://wwwcsif.cs.ucdavis.edu/~leed/hmap/code/current/
+MASTER_SITES=	http://ujeni.murkyroc.com/hmap/code/current/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Web server fingerprinting utility
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/GPL
+
+USE_DOS2UNIX=	yes
+USE_PYTHON=	yes
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-pre-patch:
-	${CP} ${WRKSRC}/hmap.py ${WRKSRC}/hmap.py.old
-	${TR} -d "\r" < ${WRKSRC}/hmap.py.old > ${WRKSRC}/hmap.py
-
 post-patch:
-	${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/hmap.py
+	${REINPLACE_CMD} -e 's|DATADIR|${DATADIR}|' ${WRKSRC}/hmap.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/hmap.py ${PREFIX}/bin/
-	${MKDIR} ${PREFIX}/share/hmap/
-.	for i in apache.1.3.12.win32 apache.2.0.44.win32 apache.1.3.14.win32 badblue.2.1.win32 apache.1.3.17.win32 dwhttpd.4.1a6.solaris.8 apache.1.3.22.win32 hpws.2.00.1454.solaris.8 apache.1.3.23.rhl.7.3 ibm_http_server.2.0.42.win32 apache.1.3.26.freebsd.4.6.2.r iis.5.0.win32 apache.1.3.26.solaris.8 jigsaw.2.0.5.win32 apache.1.3.27.freebsd.4.7 jigsaw.2.2.0.win32 apache.1.3.27.freebsd.5.0 jigsaw.2.2.2.solaris.8 apache.1.3.27.mac.10.1.5 ncsa.1.3.ultrix.4.4 apache.1.3.27.mac.10.2.4 thttpd.2.23beta1.freebsd.4.6.st apache.1.3.27.rhl.8.0 thttpd.2.23beta1.rhl.7.3 apache.1.3.9.win32 zope.2.6.0.solaris.8 apache.2.0.40.rhl.8.0
-		${INSTALL_DATA} ${WRKSRC}/known.servers/$i ${PREFIX}/share/hmap/
-.	endfor
-.	if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-.		for i in README BUGS GPL FAQS HIDING_GUIDE KNOWN_TESTS
-			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
-.		endfor
-.	endif
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/known.servers/ && ${COPYTREE_SHARE} \* ${DATADIR})
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in README BUGS FAQS HIDING_GUIDE KNOWN_TESTS
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/security/hmap/files/patch-hmap.py b/security/hmap/files/patch-hmap.py
index b3a59c5db139..b90df0c46bb3 100644
--- a/security/hmap/files/patch-hmap.py
+++ b/security/hmap/files/patch-hmap.py
@@ -5,7 +5,7 @@
  
  known_servers = []
 -for f in glob.glob('known.servers/*'):
-+for f in glob.glob('PREFIX/share/hmap/*'):
++for f in glob.glob('DATADIR/*'):
      ksf = file(f)
      ks = eval(ksf.read())
      known_servers.append(ks)
diff --git a/security/hmap/pkg-plist b/security/hmap/pkg-plist
index 98c863404aab..1c80a4a763dd 100644
--- a/security/hmap/pkg-plist
+++ b/security/hmap/pkg-plist
@@ -1,36 +1,35 @@
 bin/hmap.py
-share/hmap/apache.1.3.12.win32
-share/hmap/apache.2.0.44.win32
-share/hmap/apache.1.3.14.win32
-share/hmap/badblue.2.1.win32
-share/hmap/apache.1.3.17.win32
-share/hmap/dwhttpd.4.1a6.solaris.8
-share/hmap/apache.1.3.22.win32
-share/hmap/hpws.2.00.1454.solaris.8
-share/hmap/apache.1.3.23.rhl.7.3
-share/hmap/ibm_http_server.2.0.42.win32
-share/hmap/apache.1.3.26.freebsd.4.6.2.r
-share/hmap/iis.5.0.win32
-share/hmap/apache.1.3.26.solaris.8
-share/hmap/jigsaw.2.0.5.win32
-share/hmap/apache.1.3.27.freebsd.4.7
-share/hmap/jigsaw.2.2.0.win32
-share/hmap/apache.1.3.27.freebsd.5.0
-share/hmap/jigsaw.2.2.2.solaris.8
-share/hmap/apache.1.3.27.mac.10.1.5
-share/hmap/ncsa.1.3.ultrix.4.4
-share/hmap/apache.1.3.27.mac.10.2.4
-share/hmap/thttpd.2.23beta1.freebsd.4.6.st
-share/hmap/apache.1.3.27.rhl.8.0
-share/hmap/thttpd.2.23beta1.rhl.7.3
-share/hmap/apache.1.3.9.win32
-share/hmap/zope.2.6.0.solaris.8
-share/hmap/apache.2.0.40.rhl.8.0
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/FAQS
 %%PORTDOCS%%%%DOCSDIR%%/HIDING_GUIDE
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_TESTS
-%%PORTDOCS%%@dirrm share/doc/hmap
-@dirrm share/hmap
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/apache.1.3.12.win32
+%%DATADIR%%/apache.1.3.14.win32
+%%DATADIR%%/apache.1.3.17.win32
+%%DATADIR%%/apache.1.3.22.win32
+%%DATADIR%%/apache.1.3.23.rhl.7.3
+%%DATADIR%%/apache.1.3.26.freebsd.4.6.2.r
+%%DATADIR%%/apache.1.3.26.solaris.8
+%%DATADIR%%/apache.1.3.27.freebsd.4.7
+%%DATADIR%%/apache.1.3.27.freebsd.5.0
+%%DATADIR%%/apache.1.3.27.mac.10.1.5
+%%DATADIR%%/apache.1.3.27.mac.10.2.4
+%%DATADIR%%/apache.1.3.27.rhl.8.0
+%%DATADIR%%/apache.1.3.9.win32
+%%DATADIR%%/apache.2.0.40.rhl.8.0
+%%DATADIR%%/apache.2.0.44.win32
+%%DATADIR%%/badblue.2.1.win32
+%%DATADIR%%/dwhttpd.4.1a6.solaris.8
+%%DATADIR%%/hpws.2.00.1454.solaris.8
+%%DATADIR%%/ibm_http_server.2.0.42.win32
+%%DATADIR%%/iis.5.0.win32
+%%DATADIR%%/jigsaw.2.0.5.win32
+%%DATADIR%%/jigsaw.2.2.0.win32
+%%DATADIR%%/jigsaw.2.2.2.solaris.8
+%%DATADIR%%/ncsa.1.3.ultrix.4.4
+%%DATADIR%%/thttpd.2.23beta1.freebsd.4.6.st
+%%DATADIR%%/thttpd.2.23beta1.rhl.7.3
+%%DATADIR%%/zope.2.6.0.solaris.8
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%