From owner-svn-ports-all@FreeBSD.ORG Sat Sep 14 17:24:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BFB46CDF; Sat, 14 Sep 2013 17:24:48 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9EB8520BB; Sat, 14 Sep 2013 17:24:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EHOmWt060971; Sat, 14 Sep 2013 17:24:48 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EHOmiQ060969; Sat, 14 Sep 2013 17:24:48 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201309141724.r8EHOmiQ060969@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 14 Sep 2013 17:24:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327309 - head/databases/xapian-bindings 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 17:24:48 -0000 Author: sunpoet Date: Sat Sep 14 17:24:48 2013 New Revision: 327309 URL: http://svnweb.freebsd.org/changeset/ports/327309 Log: - Fix build without libstdc++ by removing hardcoded libstdc++ linkage [1] - Convert to new LIB_DEPENDS format - Use USE+= after bsd.port.*.mk inclusion Reported by: pkg-fallout [1] Modified: head/databases/xapian-bindings/Makefile Modified: head/databases/xapian-bindings/Makefile ============================================================================== --- head/databases/xapian-bindings/Makefile Sat Sep 14 17:16:04 2013 (r327308) +++ head/databases/xapian-bindings/Makefile Sat Sep 14 17:24:48 2013 (r327309) @@ -12,7 +12,7 @@ COMMENT= Bindings allowing Xapian to be LICENSE= GPLv2 -LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core +LIB_DEPENDS= libxapian.so:${PORTSDIR}/databases/xapian-core OPTIONS_DEFINE= DOCS LUA PERL PHP PYTHON RUBY OPTIONS_DEFAULT=PHP PYTHON RUBY @@ -37,7 +37,7 @@ PLIST_SUB+= LUA="@comment " .if ${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+=--with-perl CONFIGURE_ENV+= PERL_LIB="${SITE_PERL}" -USES= perl5 +USES+= perl5 PLIST_SUB+= PERL="" .else PLIST_SUB+= PERL="@comment " @@ -75,6 +75,7 @@ PLIST_SUB+= RUBY="@comment " .endif post-patch: + @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure # do not install rdoc @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in .if !${PORT_OPTIONS:MDOCS}