- Update to version 4.3

PR:		56860
Submitted by:	maintainer

6 files changed, 40 insertions, 27 deletions

diff --git a/security/amap/Makefile b/security/amap/Makefile
index 7728dbde7cac..f5ce15704739 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amap
-PORTVERSION=	4.2
+PORTVERSION=	4.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
@@ -18,9 +18,6 @@ USE_REINPLACE=	yes
 
 MAN1=		amap.1
 
-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
@@ -31,7 +28,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
 .	if !defined(NOPORTDOCS)
 		${MKDIR} ${DOCSDIR}
-.		for i in README TODO CHANGES LICENSE IGNORE VOTE
+.		for i in README TODO CHANGES VOTE
 			${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .		endfor
 .	endif
diff --git a/security/amap/distinfo b/security/amap/distinfo
index ca237205c9da..3760967f7d30 100644
--- a/security/amap/distinfo
+++ b/security/amap/distinfo
@@ -1 +1 @@
-MD5 (amap-4.2.tar.gz) = ec781fe4ed97d8d3fcccf64951aefa3e
+MD5 (amap-4.3.tar.gz) = 36e59ff9dfc60effde6dab6235d2029f
diff --git a/security/amap/files/patch-Makefile.am b/security/amap/files/patch-Makefile.am
index 25dd51415afe..66446c5b06d0 100644
--- a/security/amap/files/patch-Makefile.am
+++ b/security/amap/files/patch-Makefile.am
@@ -1,13 +1,10 @@
---- Makefile.am.orig	Mon Jul 14 21:38:18 2003
-+++ Makefile.am	Wed Aug 13 15:14:22 2003
-@@ -1,8 +1,7 @@
+--- Makefile.am.orig	Sun Sep 14 11:04:11 2003
++++ Makefile.am	Sun Sep 14 11:05:29 2003
+@@ -1,6 +1,5 @@
 -CC=gcc
  LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
 -OPT=-O2
 +OPT=${CFLAGS}
  OPT_DEBUG=-ggdb -Wall -lefence
--DIR=/usr/local/bin
-+DIR=${PREFIX}/bin
+ DIR=/bin
  SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
- MANPAGE=amap.1
- all:	pcre strip
diff --git a/security/amap/files/patch-amap.h b/security/amap/files/patch-amap.h
index 49a758ba669b..7d7f6f3cb299 100644
--- a/security/amap/files/patch-amap.h
+++ b/security/amap/files/patch-amap.h
@@ -1,11 +1,11 @@
---- 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"
+--- amap.h.orig	Sun Sep 14 11:25:16 2003
++++ amap.h	Sun Sep 14 11:25:29 2003
+@@ -33,7 +33,7 @@
+  #endif
+ #endif
  
--#define AMAP_APPDEF_PATH	"/usr/local/bin"
-+#define AMAP_APPDEF_PATH	"PREFIX/share/amap"
+-#define AMAP_APPDEF_PATH	AMAP_PREFIX"/bin"
++#define AMAP_APPDEF_PATH	AMAP_PREFIX"/share/amap"
  #define AMAP_BUFSIZE		1024	// standard buffer size
  #define AMAP_BUFSIZE_BIG	65536   // big standard buffer size
- #define AMAP_REGEX_OPTIONS	( PCRE_MULTILINE | PCRE_CASELESS )
+ #define AMAP_REGEX_OPTIONS	( PCRE_MULTILINE | PCRE_CASELESS | PCRE_DOTALL )
diff --git a/security/amap/files/patch-configure b/security/amap/files/patch-configure
index 9e58b25500f0..501ee229c747 100644
--- a/security/amap/files/patch-configure
+++ b/security/amap/files/patch-configure
@@ -1,11 +1,32 @@
---- configure.orig	Tue Jul 29 14:10:16 2003
-+++ configure	Tue Jul 29 14:15:56 2003
-@@ -135,7 +135,7 @@
+--- configure.orig	Sun Sep 14 11:10:24 2003
++++ configure	Sun Sep 14 11:16:41 2003
+@@ -33,7 +33,9 @@
+ echo
+ 
+ echo "Checking for openssl ..."
+-for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
++# FreeBSD: Try port version of openssl first. LIBDIRS is irrelevant for us
++# Since we don't have /etc/ld.so.conf
++for i in ${PREFIX}/lib $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
+ /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
+ /*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib
+ do
+@@ -61,7 +63,8 @@
+     fi
+ done
+ 
+-for i in /usr/local/include /*ssl/include /usr/include \
++# FreeBSD: Change to prefer installed port over base-system openssl.
++for i in ${PREFIX}/include /usr/local/include /*ssl/include /usr/include \
+ /opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include
+ do
+     if [ "X" = "X$SSL_IPATH" ]; then
+@@ -152,7 +155,7 @@
      XLIBS="$XLIBS -lresolv"
  fi
  
 -for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
-+for i in ${MANPPREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
++for i in ${PREFIX}/man /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
    if [ -d $i ]; then
      MANDIR=$i
    fi
diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist
index 945b3a6445e6..f60ca3f8c231 100644
--- a/security/amap/pkg-plist
+++ b/security/amap/pkg-plist
@@ -5,10 +5,8 @@ share/amap/appdefs.resp
 share/amap/appdefs.rpc
 share/amap/appdefs.trig
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/IGNORE
 %%PORTDOCS%%%%DOCSDIR%%/VOTE
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/amap