[gentoo-commits] gentoo-x86 commit in app-text/expander/files: expander-2.0.5-gentoo.patch

[gentoo-commits] gentoo-x86 commit in app-text/expander/files: expander-2.0.5-gentoo.patch

[Jeroen Roovers (jer)]

jer         10/09/18 21:14:47

  Modified:             expander-2.0.5-gentoo.patch
  Log:
  Respect LDFLAGS (bug #336155, and do not duplicate in the emake call what the patch was already trying to do). Do not set empty DEPEND. Merge cd into emake call.
  
  (Portage version: 2.2_rc83/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-text/expander/files/expander-2.0.5-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/expander/files/expander-2.0.5-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/expander/files/expander-2.0.5-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/expander/files/expander-2.0.5-gentoo.patch?r1=1.1&r2=1.2

Index: expander-2.0.5-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/expander/files/expander-2.0.5-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expander-2.0.5-gentoo.patch	30 Oct 2003 04:07:34 -0000	1.1
+++ expander-2.0.5-gentoo.patch	18 Sep 2010 21:14:47 -0000	1.2
@@ -1,13 +1,12 @@
-diff -ur expander/src/Makefile expander-gentoo/src/Makefile
---- expander/src/Makefile	2003-10-30 14:52:00.000000000 +1300
-+++ expander-gentoo/src/Makefile	2003-10-30 15:50:02.000000000 +1300
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -3,15 +3,14 @@
  bindir = $(BINDIR)/
  
  copy     = ln -fs
 -CFLAGS  += -v -g # -DNEED_GETOPT_PROTO_TYPE
 -compiler = cc $(CFLAGS)
-+compiler = gcc $(CFLAGS)
++compiler = $(CC) $(CFLAGS)
  
  executables = expander boxcomment align_columns align_comments where_is
  
@@ -24,7 +23,7 @@
  #-----------------------------------------------------------------------
  expander: expander.c             
 -	$(compiler) -o $(bindir)$@ $?  
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #--------------------------------------------------------------------------
  # Surround given text with open ended box. (with NEdit, language sensitive)
@@ -32,28 +31,28 @@
  boxcomment: boxcomment.c
 -	$(compiler) -o $(bindir)$@ $?
 -	@if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #-------------------------------------------------------------------------------
  # Align ragged looking 'C' style comments (good substitute for align_equals too)
  #-------------------------------------------------------------------------------
  align_comments: align_comments.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #----------------------------
  # Align given text in columns
  #----------------------------
  align_columns: align_columns.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #----------------------------------------------
  # File locator (substitute for which, where...)
  #----------------------------------------------
  where_is: where_is.c
 -	$(compiler) -o $(bindir)$@ $?
-+	$(compiler) -o $@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
  
  #------------------------------------------------
  # Here is how to uninstall the executables built.