svn commit: r392950 - head/multimedia/gstreamer1-plugins

[Koop Mast]

Author: kwm
Date: Sun Jul 26 22:06:58 2015
New Revision: 392950
URL: https://svnweb.freebsd.org/changeset/ports/392950

Log:
  Revert r392917 and part of r392902 (to gstreamer1-plugins/Makefile).
  
  The new regex was too broad and broke the plugins from the -bad package.

Modified:
  head/multimedia/gstreamer1-plugins/Makefile

Modified: head/multimedia/gstreamer1-plugins/Makefile
==============================================================================
--- head/multimedia/gstreamer1-plugins/Makefile	Sun Jul 26 21:54:32 2015	(r392949)
+++ head/multimedia/gstreamer1-plugins/Makefile	Sun Jul 26 22:06:58 2015	(r392950)
@@ -137,9 +137,32 @@ 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/[^[:space:]]*\.la,,' \
-	-e 's|$$(top_builddir)/gst-libs/[^[:space:]]*/lib\([^/[:space:]]*\)\.la|-l\1|'
+	${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- at GST_API_VERSION@.la|-lgsttag-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio- at GST_API_VERSION@.la|-lgstaudio-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils- at GST_API_VERSION@.la|-lgstpbutils-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/riff/libgstriff- at GST_API_VERSION@.la|-lgstriff-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor- at GST_API_VERSION@.la|-lgstsignalprocessor-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo- at GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/video/libgstvideo- at GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase- at GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \
+	 s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader- at GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \
+	s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo- at GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|'
+
+	 @${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}|'
 .endif
 
 # workaround a crash in clang 3.3 crash llvm bug # 15840