Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/ed/files: ed-1.0-build.patch
Date: Wed, 31 Dec 2008 09:16:54
Message-Id: E1LHxC8-0000y2-5X@stork.gentoo.org
vapier      08/12/31 09:16:52

  Modified:             ed-1.0-build.patch
  Log:
  touchup
  (Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

Revision  Changes    Path
1.2                  sys-apps/ed/files/ed-1.0-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?r1=1.1&r2=1.2

Index: ed-1.0-build.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ed-1.0-build.patch	3 Sep 2008 14:42:07 -0000	1.1
+++ ed-1.0-build.patch	31 Dec 2008 09:16:52 -0000	1.2
@@ -9,9 +9,8 @@
 	  override if they so choose.
 	* Only set CFLAGS/CXXFLAGS if user did not specify any.
 
-diff -u ed-1.0/configure ed-1.0-new-patch/configure
---- ed-1.0/configure	2008-08-21 14:34:24.000000000 -0400
-+++ ed-1.0-new-patch/configure	2008-09-03 10:33:16.000000000 -0400
+--- ed-1.0/configure
++++ ed-1.0/configure
 @@ -14,6 +14,19 @@
  progversion=1.0
  srctrigger=ed.h
@@ -50,20 +49,18 @@
  done
  
 +# Defaults if the user did not select any
-+if [ x"${CFLAGS}" = x ] ; then
++if [ x"${CFLAGS+set}" != xset ] ; then
 +	CFLAGS='-Wall -W -O2'
 +fi
-+if [ x"${CXXFLAGS}" = x ] ; then
++if [ x"${CXXFLAGS+set}" = xset ] ; then
 +	CXXFLAGS='-Wall -W -O2'
 +fi
 +
  # Find the source files, if location was not specified.
  srcdirtext=
  if [ x"${srcdir}" = x ] ; then
-Common subdirectories: ed-1.0/doc and ed-1.0-new-patch/doc
-diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in
---- ed-1.0/Makefile.in	2008-05-04 11:57:10.000000000 -0400
-+++ ed-1.0-new-patch/Makefile.in	2008-09-03 10:38:37.000000000 -0400
+--- ed-1.0/Makefile.in
++++ ed-1.0/Makefile.in
 @@ -44,11 +44,11 @@
  check : $(progname) $(VPATH)/testsuite/check.sh
  	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
@@ -87,4 +84,3 @@
  
  install-strip : all
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
-Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite