From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 22 22:40:38 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 86FC8DDB;
 Sat, 22 Nov 2014 22:40:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 73591D34;
 Sat, 22 Nov 2014 22:40:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMMecY4044840;
 Sat, 22 Nov 2014 22:40:38 GMT (envelope-from kuriyama@FreeBSD.org)
Received: (from kuriyama@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMMecdn044839;
 Sat, 22 Nov 2014 22:40:38 GMT (envelope-from kuriyama@FreeBSD.org)
Message-Id: <201411222240.sAMMecdn044839@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kuriyama set sender to
 kuriyama@FreeBSD.org using -f
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Sat, 22 Nov 2014 22:40:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373112 - head/net-mgmt/nagios-check_memcached_paranoid
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.18-1
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: Sat, 22 Nov 2014 22:40:38 -0000

Author: kuriyama
Date: Sat Nov 22 22:40:37 2014
New Revision: 373112
URL: https://svnweb.freebsd.org/changeset/ports/373112
QAT: https://qat.redports.org/buildarchive/r373112/

Log:
  Add a hack to change linking objects which should be changed
  by net-mgmt/nagios-plugins OPTIONS setting.
  
  PR:		ports/187772
  Reported by:	Lukasz Wasikowski <lukasz@wasikowski.net>

Modified:
  head/net-mgmt/nagios-check_memcached_paranoid/Makefile

Modified: head/net-mgmt/nagios-check_memcached_paranoid/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_memcached_paranoid/Makefile	Sat Nov 22 22:37:20 2014	(r373111)
+++ head/net-mgmt/nagios-check_memcached_paranoid/Makefile	Sat Nov 22 22:40:37 2014	(r373112)
@@ -27,6 +27,8 @@ do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/${FILE} ${WRKSRC}
 
+# HACK: Linking objects may be changed by nagios-plugins OPTIONS
+# setting (EXTRAOPTS, NLS).
 do-build:
 	cd ${WRKSRC}; \
 	NDIR=$$(${NDIR_CMD}); \
@@ -34,7 +36,8 @@ do-build:
 		-I$${NDIR} -I$${NDIR}/plugins -I$${NDIR}/gl -I$${NDIR}/lib -I${LOCALBASE}/include \
 		-o ${PORTNAME} \
 		$${NDIR}/plugins/netutils.o $${NDIR}/plugins/utils.o \
-		$${NDIR}/lib/utils_base.o $${NDIR}/lib/extra_opts.o $${NDIR}/lib/parse_ini.o \
+		$${NDIR}/lib/utils_base.o \
+		`ls $${NDIR}/lib/*.o | ${GREP} -E '(extra_opts|parse_ini).o$$'` \
 		$${NDIR}/gl/getopt.o $${NDIR}/gl/getopt1.o \
 		$${NDIR}/gl/idpriv-droptemp.o $${NDIR}/gl/sha1.o \
 		-L${LOCALBASE}/lib -lintl -lmemcached ${FILE}