From owner-svn-ports-head@FreeBSD.ORG  Fri Jul 19 14:09:29 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4D2763E8;
 Fri, 19 Jul 2013 14:09:29 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FBDCC4E;
 Fri, 19 Jul 2013 14:09:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JE9TDJ097354;
 Fri, 19 Jul 2013 14:09:29 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6JE9Tjl097353;
 Fri, 19 Jul 2013 14:09:29 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201307191409.r6JE9Tjl097353@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 19 Jul 2013 14:09:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323294 - head/ftp/bsdftpd-ssl
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jul 2013 14:09:29 -0000

Author: bapt
Date: Fri Jul 19 14:09:28 2013
New Revision: 323294
URL: http://svnweb.freebsd.org/changeset/ports/323294

Log:
  Fix build on HEAD, by properly defining the MAKE_ENV and by actually using it.
  
  Reported by:	pkg-fallout

Modified:
  head/ftp/bsdftpd-ssl/Makefile

Modified: head/ftp/bsdftpd-ssl/Makefile
==============================================================================
--- head/ftp/bsdftpd-ssl/Makefile	Fri Jul 19 14:08:02 2013	(r323293)
+++ head/ftp/bsdftpd-ssl/Makefile	Fri Jul 19 14:09:28 2013	(r323294)
@@ -19,7 +19,7 @@ COMMENT=	FTP command-line client utility
 
 USE_OPENSSL=	yes
 
-MAKE_ENV+=	OBJFORMAT=	elf
+MAKE_ENV+=	OBJFORMAT=elf
 
 .include <bsd.port.pre.mk>
 
@@ -61,10 +61,10 @@ pre-build:
 
 do-build:
 # Client part
-	(cd ${WRKSRC}/port && make && cd ${WRKSRC}/ftp && make) || exit
+	(cd ${WRKSRC}/port && ${SETENV} ${MAKE_ENV} make && cd ${WRKSRC}/ftp && ${SETENV} ${MAKE_ENV} make) || exit
 # Server part
 .if !defined(CLIENT_ONLY)
-	(cd ${WRKSRC}/ftpd && make) || exit
+	(cd ${WRKSRC}/ftpd && ${SETENV} ${MAKE_ENV} make) || exit
 .endif
 
 do-install: