| 1 |
cardoe 08/09/03 14:42:07 |
| 2 |
|
| 3 |
Added: ed-1.0-build.patch |
| 4 |
Log: |
| 5 |
forgot to commit and use the new patch |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r8 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/ed/files/ed-1.0-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ed/files/ed-1.0-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ed-1.0-build.patch |
| 15 |
=================================================================== |
| 16 |
2008-09-03 Doug Goldstein <cardoe@g.o> |
| 17 |
* Make red man page a symlink instead of a hard link |
| 18 |
* install man pages by default |
| 19 |
|
| 20 |
2007-04-16 Mike Frysinger <vapier@g.o> |
| 21 |
|
| 22 |
* Clean locale vars from environment to maintain a sane state. |
| 23 |
* Do not set CC/CXX/CPPFLAGS/LDFLAGS to "" so that user can |
| 24 |
override if they so choose. |
| 25 |
* Only set CFLAGS/CXXFLAGS if user did not specify any. |
| 26 |
|
| 27 |
diff -u ed-1.0/configure ed-1.0-new-patch/configure |
| 28 |
--- ed-1.0/configure 2008-08-21 14:34:24.000000000 -0400 |
| 29 |
+++ ed-1.0-new-patch/configure 2008-09-03 10:33:16.000000000 -0400 |
| 30 |
@@ -14,6 +14,19 @@ |
| 31 |
progversion=1.0 |
| 32 |
srctrigger=ed.h |
| 33 |
|
| 34 |
+# NLS nuisances. |
| 35 |
+for as_var in \ |
| 36 |
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
| 37 |
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
| 38 |
+ LC_TELEPHONE LC_TIME |
| 39 |
+do |
| 40 |
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
| 41 |
+ eval $as_var=C; export $as_var |
| 42 |
+ else |
| 43 |
+ unset $as_var |
| 44 |
+ fi |
| 45 |
+done |
| 46 |
+ |
| 47 |
# clear some things potentially inherited from environment. |
| 48 |
srcdir= |
| 49 |
prefix=/usr/local |
| 50 |
@@ -24,12 +37,6 @@ |
| 51 |
mandir='$(datadir)/man' |
| 52 |
sysconfdir='$(prefix)/etc' |
| 53 |
program_prefix= |
| 54 |
-CC= |
| 55 |
-CXX= |
| 56 |
-CPPFLAGS= |
| 57 |
-CFLAGS='-Wall -W -O2' |
| 58 |
-CXXFLAGS='-Wall -W -O2' |
| 59 |
-LDFLAGS= |
| 60 |
|
| 61 |
# Loop over all args |
| 62 |
while [ x"$1" != x ] ; do |
| 63 |
@@ -106,6 +113,14 @@ |
| 64 |
esac |
| 65 |
done |
| 66 |
|
| 67 |
+# Defaults if the user did not select any |
| 68 |
+if [ x"${CFLAGS}" = x ] ; then |
| 69 |
+ CFLAGS='-Wall -W -O2' |
| 70 |
+fi |
| 71 |
+if [ x"${CXXFLAGS}" = x ] ; then |
| 72 |
+ CXXFLAGS='-Wall -W -O2' |
| 73 |
+fi |
| 74 |
+ |
| 75 |
# Find the source files, if location was not specified. |
| 76 |
srcdirtext= |
| 77 |
if [ x"${srcdir}" = x ] ; then |
| 78 |
Common subdirectories: ed-1.0/doc and ed-1.0-new-patch/doc |
| 79 |
diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in |
| 80 |
--- ed-1.0/Makefile.in 2008-05-04 11:57:10.000000000 -0400 |
| 81 |
+++ ed-1.0-new-patch/Makefile.in 2008-09-03 10:38:37.000000000 -0400 |
| 82 |
@@ -44,11 +44,11 @@ |
| 83 |
check : $(progname) $(VPATH)/testsuite/check.sh |
| 84 |
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite |
| 85 |
|
| 86 |
-install : all install-info |
| 87 |
+install : all install-info install-man |
| 88 |
if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi |
| 89 |
$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(program_prefix)$(progname) |
| 90 |
-rm -f $(DESTDIR)$(bindir)/$(program_prefix)r$(progname) |
| 91 |
- cd $(DESTDIR)$(bindir) ; ln $(program_prefix)$(progname) $(program_prefix)r$(progname) |
| 92 |
+ cd $(DESTDIR)$(bindir) ; ln -s $(program_prefix)$(progname) $(program_prefix)r$(progname) |
| 93 |
|
| 94 |
install-info : |
| 95 |
if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi |
| 96 |
@@ -59,7 +59,7 @@ |
| 97 |
if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi |
| 98 |
$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1 |
| 99 |
-rm -f $(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1 |
| 100 |
- cd $(DESTDIR)$(mandir)/man1 ; ln $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1 |
| 101 |
+ cd $(DESTDIR)$(mandir)/man1 ; ln -s $(program_prefix)$(progname).1 $(program_prefix)r$(progname).1 |
| 102 |
|
| 103 |
install-strip : all |
| 104 |
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install |
| 105 |
Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite |
Archives