From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 26 16:18:09 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 81CCB106564A;
	Thu, 26 Jul 2012 16:18:09 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CEC78FC14;
	Thu, 26 Jul 2012 16:18:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QGI9Yd002382;
	Thu, 26 Jul 2012 16:18:09 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QGI9ZA002380;
	Thu, 26 Jul 2012 16:18:09 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201207261618.q6QGI9ZA002380@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 26 Jul 2012 16:18:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301566 - head/ftp/vsftpd
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 26 Jul 2012 16:18:09 -0000

Author: dinoex
Date: Thu Jul 26 16:18:08 2012
New Revision: 301566
URL: http://svn.freebsd.org/changeset/ports/301566

Log:
  - Fix pass -rpath from compiler to linker
  PR:		170101
  Submitted by:	Hung-te Liang

Modified:
  head/ftp/vsftpd/Makefile

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Thu Jul 26 15:30:27 2012	(r301565)
+++ head/ftp/vsftpd/Makefile	Thu Jul 26 16:18:08 2012	(r301566)
@@ -65,7 +65,7 @@ do-configure:
 		-e "s|^CC 	=	gcc|CC	= ${CC}|" \
 		-e "s|^CFLAGS	=|CFLAGS	= ${CFLAGS}|" \
 		-e "s|^INSTALL	=|INSTALL	= ${INSTALL_PROGRAM}|" \
-		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS}|" \
+		-e "s|	-Wl,-s| -Wl,-s ${LDFLAGS:S/-rpath=/-Wl,-rpath,/g}|" \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh
 	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \