Index: head/security/amap/Makefile
===================================================================
--- head/security/amap/Makefile	(revision 421999)
+++ head/security/amap/Makefile	(revision 422000)
@@ -1,58 +1,58 @@
 # Created by: Yonatan <onatan@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	amap
 PORTVERSION=	5.2
 PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	PACKETSTORM/groups/thc
 
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Application mapper
 
 USES=		ssl
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		SSL_PATH=${OPENSSLLIB} \
-		CRYPTO_PATH=${OPENSSLIB} \
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ENV=	SSL_PATH=${OPENSSLLIB} \
+		CRYPTO_PATH=${OPENSSLLIB} \
 		SSL_IPATH=${OPENSSLINC}
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	README TODO CHANGES AMAP-LIB-INTERFACE
 
 LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|g; \
 		 s|\(-DAMAP_PREFIX\)=\(\$$PREFIX\)|\1=\\\\\\"\2\\\\\\"|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|; s|^CC=.*||' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|etc/|etc/amap/|g' ${WRKSRC}/amap-lib.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/amap ${STAGEDIR}${PREFIX}/bin
 	${LN} -s amap ${STAGEDIR}${PREFIX}/bin/amap6
 	${INSTALL_PROGRAM} ${WRKSRC}/amapcrap ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/amap-lib.o ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 .for i in amap.h amap-inc.h amap-lib.h
 		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for i in ${LOCAL_CONF_FILES}
 		${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/amap.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 		${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/amap/files/patch-configure
===================================================================
--- head/security/amap/files/patch-configure	(revision 421999)
+++ head/security/amap/files/patch-configure	(revision 422000)
@@ -1,11 +1,27 @@
---- configure.orig	Wed Jun 29 17:40:57 2005
-+++ configure	Wed Jun 29 17:41:18 2005
-@@ -29,7 +29,7 @@
+--- configure.orig	2005-06-03 13:34:19 UTC
++++ configure
+@@ -22,14 +22,11 @@ echo
+ echo "Starting amap auto configuration ..."
+ rm -f Makefile.in
+ PREFIX=""
+-SSL_PATH=""
+-SSL_IPATH=""
+-CRYPTO_PATH=""
+ NSL_PATH=""
  SOCKET_PATH=""
  MANDIR=""
  LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null`
 -PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//i'`
 +PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//'`
  echo
  
  echo "Checking for openssl ..."
+@@ -80,7 +77,7 @@ if [ "X" = "X$SSL_IPATH" ]; then
+     CRYPTO_PATH=""
+ fi
+ if [ -n "$SSL_PATH" ]; then
+-    echo "                     ... found"
++    echo "                     ... found: $SSL_PATH"
+ fi
+ if [ "X" = "X$SSL_PATH" ]; then
+     echo "                     ... NOT found, SSL support disabled"