From owner-svn-ports-head@FreeBSD.ORG Sat Dec 7 09:11:55 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id 3CC1C4C7; Sat, 7 Dec 2013 09:11:55 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 290D61FCE; Sat, 7 Dec 2013 09:11:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB79Bt7x080111; Sat, 7 Dec 2013 09:11:55 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB79Btem080110; Sat, 7 Dec 2013 09:11:55 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201312070911.rB79Btem080110@svn.freebsd.org> From: Boris Samorodov Date: Sat, 7 Dec 2013 09:11:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335818 - head/graphics/dia 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 09:11:55 -0000 Author: bsam Date: Sat Dec 7 09:11:54 2013 New Revision: 335818 URL: http://svnweb.freebsd.org/changeset/ports/335818 Log: Fix build at 10.x and up (hardcoded -lstdc++): ----- libtool: link: c++ -shared -nostdlib /usr/lib/crti.o /usr/lib/crtbeginS.o .libs/wmf.o -Wl,-rpath -Wl,/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -L/usr/local/lib /usr/local/lib/libEMF.so -lstdc++ -lpng -lz -L/usr/lib -lc++ -lm -lc -lgcc -lgcc_s /usr/lib/crtendS.o /usr/lib/crtn.o -Wl,-soname -Wl,libwmf_filter.so -o .libs/libwmf_filter.so /usr/bin/ld: cannot find -lstdc++ ----- PR: ports/184138 Submitted by: bsam (me) Approved by: gnome (maintainer timeout, 2 weeks) Modified: head/graphics/dia/Makefile Modified: head/graphics/dia/Makefile ============================================================================== --- head/graphics/dia/Makefile Sat Dec 7 09:07:40 2013 (r335817) +++ head/graphics/dia/Makefile Sat Dec 7 09:11:54 2013 (r335818) @@ -72,7 +72,7 @@ post-patch: 's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \ s,\(^GTK_CFLAGS = \),\1 ${PTHREAD_CFLAGS} ,' @${REINPLACE_CMD} -e 's|http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl| ; \ - s|echo aout|echo elf|g ; s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g' \ - ${WRKSRC}/configure + s|echo aout|echo elf|g ; s|/usr/include/libEMF|${LOCALBASE}/include/libEMF|g ; \ + s|-lstdc++||g' ${WRKSRC}/configure .include