From owner-svn-ports-head@freebsd.org Sun Jul 26 10:31:36 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02EFC9A7761; Sun, 26 Jul 2015 10:31:36 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.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 CD5BAD9D; Sun, 26 Jul 2015 10:31:35 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6QAVZLq070646; Sun, 26 Jul 2015 10:31:35 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6QAVZu7070645; Sun, 26 Jul 2015 10:31:35 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201507261031.t6QAVZu7070645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 26 Jul 2015 10:31:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392917 - head/multimedia/gstreamer1-plugins 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.20 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: Sun, 26 Jul 2015 10:31:36 -0000 Author: tijl Date: Sun Jul 26 10:31:34 2015 New Revision: 392917 URL: https://svnweb.freebsd.org/changeset/ports/392917 Log: r392902 removed a command from post-patch that looked like a duplicate but wasn't. Restore it by combining both in one RE. Reported by: kwm Modified: head/multimedia/gstreamer1-plugins/Makefile Modified: head/multimedia/gstreamer1-plugins/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins/Makefile Sun Jul 26 09:30:40 2015 (r392916) +++ head/multimedia/gstreamer1-plugins/Makefile Sun Jul 26 10:31:34 2015 (r392917) @@ -137,18 +137,9 @@ post-patch: .endif .if ${DIST} != ugly @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ - ${XARGS} -n 10 ${REINPLACE_CMD} -e \ - '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \ - 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la|-lgsttag-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|-lgstaudio-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|-lgstpbutils-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|-lgstriff-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|-lgstsignalprocessor-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \ - s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|' + ${XARGS} -n 10 ${REINPLACE_CMD} \ + -e '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/[^[:space:]]*\.la,,' \ + -e 's|$$(top_builddir)/gst-libs/[^[:space:]]*/lib\([^/[:space:]]*\)\.la|-l\1|' .endif # workaround a crash in clang 3.3 crash llvm bug # 15840