svn commit: r362788 - head/textproc/srilm/files

[Dmitry Sivachenko]

Author: demon
Date: Thu Jul 24 12:02:32 2014
New Revision: 362788
URL: http://svnweb.freebsd.org/changeset/ports/362788
QAT: https://qat.redports.org/buildarchive/r362788/

Log:
  Respect CFLAGS;
  Respect LDFLAGS so binaries find the correct libstdc++.so.6 (it picked
  this library from lib/compat before this change).
  
  Thanks gerald at .

Modified:
  head/textproc/srilm/files/patch-Makefile.machine.freebsd

Modified: head/textproc/srilm/files/patch-Makefile.machine.freebsd
==============================================================================
--- head/textproc/srilm/files/patch-Makefile.machine.freebsd	Thu Jul 24 11:40:29 2014	(r362787)
+++ head/textproc/srilm/files/patch-Makefile.machine.freebsd	Thu Jul 24 12:02:32 2014	(r362788)
@@ -1,5 +1,20 @@
---- common/Makefile.machine.freebsd.orig	Mon Oct 20 02:59:58 2003
-+++ common/Makefile.machine.freebsd	Sat Oct 23 11:12:06 2004
+--- common/Makefile.machine.freebsd.orig	2006-01-05 23:25:59.000000000 +0300
++++ common/Makefile.machine.freebsd	2014-07-24 15:58:41.000000000 +0400
+@@ -26,11 +26,11 @@
+    EXPORT_LDFLAGS = -s
+ 
+    # Shared compilation flags.
+-   CFLAGS = $(ADDITIONAL_CFLAGS) $(INCLUDES)
+-   CXXFLAGS = $(ADDITIONAL_CXXFLAGS) $(INCLUDES)
++   CFLAGS += $(ADDITIONAL_CFLAGS) $(INCLUDES)
++   CXXFLAGS += $(ADDITIONAL_CXXFLAGS) $(INCLUDES)
+ 
+    # Shared linking flags.
+-   LDFLAGS = $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR)
++   LDFLAGS += $(ADDITIONAL_LDFLAGS) -L$(SRILM_LIBDIR)
+ 
+    # Other useful compilation flags.
+    ADDITIONAL_CFLAGS =
 @@ -49,8 +49,8 @@
     RLD_FLAG = -R