From owner-svn-ports-all@freebsd.org  Tue Sep 13 13:59:19 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DB63BD98CF;
 Tue, 13 Sep 2016 13:59:19 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5431C80;
 Tue, 13 Sep 2016 13:59:18 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DDxISd087487;
 Tue, 13 Sep 2016 13:59:18 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DDxHgo087485;
 Tue, 13 Sep 2016 13:59:17 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609131359.u8DDxHgo087485@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 13 Sep 2016 13:59:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r422000 - in head/security/amap: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Sep 2016 13:59:19 -0000

Author: marino
Date: Tue Sep 13 13:59:17 2016
New Revision: 422000
URL: https://svnweb.freebsd.org/changeset/ports/422000

Log:
  security/amap: Fix harder
  
  The arguments passed to the configuration script were getting initialized,
  so convert these to environment variables and augment the configure script
  patch to allow them to work as intended.  Also fix a typo.

Modified:
  head/security/amap/Makefile
  head/security/amap/files/patch-configure

Modified: head/security/amap/Makefile
==============================================================================
--- head/security/amap/Makefile	Tue Sep 13 13:46:19 2016	(r421999)
+++ head/security/amap/Makefile	Tue Sep 13 13:59:17 2016	(r422000)
@@ -12,9 +12,9 @@ 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

Modified: head/security/amap/files/patch-configure
==============================================================================
--- head/security/amap/files/patch-configure	Tue Sep 13 13:46:19 2016	(r421999)
+++ head/security/amap/files/patch-configure	Tue Sep 13 13:59:17 2016	(r422000)
@@ -1,6 +1,13 @@
---- 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`
@@ -9,3 +16,12 @@
  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"