Date: Tue, 13 Sep 2016 13:59:17 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422000 - in head/security/amap: . files Message-ID: <201609131359.u8DDxHgo087485@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131359.u8DDxHgo087485>