svn commit: r354539 - head/editors/abiword

[Tijl Coosemans]

Author: tijl
Date: Mon May 19 13:40:12 2014
New Revision: 354539
URL: http://svnweb.freebsd.org/changeset/ports/354539
QAT: https://qat.redports.org/buildarchive/r354539/

Log:
  Add some substitutions to ensure that plugins are linked with libabiword
  from the work or stage directory instead of a previously installed library.
  
  In pseudo code:
  s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword",
    PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS",
  s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS",
    foo_LIBS="$PLUGIN_LIBS $foo_LIBS",
  
  The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would
  have to come after -Lsrc, but -Lsrc is not correct when libtool relinks
  plugins during staging so use src/libabiword.la and let libtool figure out
  what flags are needed.  Secondly, switch around foo_LIBS and PLUGIN_LIBS
  because foo_LIBS may contain -L/usr/local/lib.

Modified:
  head/editors/abiword/Makefile

Modified: head/editors/abiword/Makefile
==============================================================================
--- head/editors/abiword/Makefile	Mon May 19 13:31:40 2014	(r354538)
+++ head/editors/abiword/Makefile	Mon May 19 13:40:12 2014	(r354539)
@@ -183,6 +183,21 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/goffice-bits/goffice/app/goffice-app.h \
 		${WRKSRC}/src/af/util/xp/ut_go_file.h
-	@${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
+# The following substitutions ensure that plugins are linked with libabiword
+# from the work or stage directory instead of a previously installed library.
+# In pseudo code:
+# s,PLUGIN_LIBS="$PLUGIN_LIBS -Lsrc -labiword",
+#   PLUGIN_LIBS="src/libabiword.la $PLUGIN_LIBS",
+# s,foo_LIBS="$foo_LIBS $PLUGIN_LIBS",
+#   foo_LIBS="$PLUGIN_LIBS $foo_LIBS",
+# The initial value of PLUGIN_LIBS may contain -L/usr/local/lib so it would
+# have to come after -Lsrc, but -Lsrc is not correct when libtool relinks
+# plugins during staging so use src/libabiword.la and let libtool figure out
+# what flags are needed.  Secondly, switch around foo_LIBS and PLUGIN_LIBS
+# because foo_LIBS may contain -L/usr/local/lib.
+	@${REINPLACE_CMD} \
+		-e "s,\$$PLUGIN_LIBS \"'-L\$${top_builddir}/src'\" -labiword-\$$ABIWORD_SERIES,\\\\\$${top_builddir}/src/libabiword-\$$ABIWORD_SERIES.la \$$PLUGIN_LIBS," \
+		-e "/_LIBS=/s,\"\\(.*\\)\"\\('\$${PLUGIN_LIBS}.*'\\),\\2\" \\1\"," \
+		-e 's|" == "|" = "|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>