6 files changed, 23 insertions, 20 deletions

diff --git a/security/amap/Makefile b/security/amap/Makefile
index 29229e503b28..7728dbde7cac 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amap
-PORTVERSION=	4.0
+PORTVERSION=	4.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
@@ -22,13 +22,13 @@ post-patch:
 	${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|' ${WRKSRC}/amap.h
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/amap ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/amap
-	${INSTALL_DATA} ${WRKSRC}/appdefs.resp ${PREFIX}/share/amap/
-	${INSTALL_DATA} ${WRKSRC}/appdefs.rpc ${PREFIX}/share/amap/
-	${INSTALL_DATA} ${WRKSRC}/appdefs.trig ${PREFIX}/share/amap/
-	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1/
+.	for i in appdefs.resp appdefs.rpc appdefs.trig
+		${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/amap
+.	endfor
+	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
 .		for i in README TODO CHANGES LICENSE IGNORE VOTE
diff --git a/security/amap/distinfo b/security/amap/distinfo
index bd04171961d1..ca237205c9da 100644
--- a/security/amap/distinfo
+++ b/security/amap/distinfo
@@ -1 +1 @@
-MD5 (amap-4.0.tar.gz) = c92a0f159c1ccd34f63e932b81a5b660
+MD5 (amap-4.2.tar.gz) = ec781fe4ed97d8d3fcccf64951aefa3e
diff --git a/security/amap/files/patch-Makefile.am b/security/amap/files/patch-Makefile.am
index 9ac9c477a6bb..25dd51415afe 100644
--- a/security/amap/files/patch-Makefile.am
+++ b/security/amap/files/patch-Makefile.am
@@ -1,7 +1,7 @@
---- Makefile.am.orig	Mon Jul 14 17:38:18 2003
-+++ Makefile.am	Tue Jul 29 13:58:40 2003
-@@ -1,8 +1,8 @@
- CC=gcc
+--- Makefile.am.orig	Mon Jul 14 21:38:18 2003
++++ Makefile.am	Wed Aug 13 15:14:22 2003
+@@ -1,8 +1,7 @@
+-CC=gcc
  LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
 -OPT=-O2
 +OPT=${CFLAGS}
diff --git a/security/amap/files/patch-amap-inc.h b/security/amap/files/patch-amap-inc.h
index de7d2917e6ac..4f1c3f0be61e 100644
--- a/security/amap/files/patch-amap-inc.h
+++ b/security/amap/files/patch-amap-inc.h
@@ -1,10 +1,13 @@
---- amap-inc.h.orig	Tue Jul 29 14:26:51 2003
-+++ amap-inc.h	Tue Jul 29 14:27:05 2003
-@@ -13,7 +13,6 @@
+--- amap-inc.h.orig	Tue Aug  5 21:21:37 2003
++++ amap-inc.h	Wed Aug 13 11:54:03 2003
+@@ -12,9 +12,9 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <sys/socket.h>
 -#include <arpa/inet.h>
  #include <netdb.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>
++#include <arpa/inet.h>
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
diff --git a/security/amap/files/patch-amap.h b/security/amap/files/patch-amap.h
index a9c06fcaf727..dbc6b3de55d6 100644
--- a/security/amap/files/patch-amap.h
+++ b/security/amap/files/patch-amap.h
@@ -1,5 +1,5 @@
---- amap.h.orig	Tue Jul 22 13:54:37 2003
-+++ amap.h	Tue Jul 29 14:06:27 2003
+--- amap.h.orig	Tue Aug  5 21:18:29 2003
++++ amap.h	Wed Aug 13 11:48:47 2003
 @@ -24,7 +24,7 @@
  #define AMAP_EMAIL     "amap-dev@thc.org"
  #define AMAP_RESOURCE  "www.thc.org"
@@ -7,5 +7,5 @@
 -#define AMAP_APPDEF_PATH	"/usr/local/bin"
 +#define AMAP_APPDEF_PATH	"PREFIX/bin"
  #define AMAP_BUFSIZE		1024	// standard buffer size
- #define AMAP_BUFSIZE_BIG	16348   // big standard buffer size
+ #define AMAP_BUFSIZE_BIG	65536   // big standard buffer size
  #define AMAP_REGEX_OPTIONS	( PCRE_MULTILINE | PCRE_CASELESS )
diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist
index 72c42230dc4e..945b3a6445e6 100644
--- a/security/amap/pkg-plist
+++ b/security/amap/pkg-plist
@@ -10,5 +10,5 @@ share/amap/appdefs.trig
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm share/doc/amap
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/amap