summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-31 09:16:52 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-31 09:16:52 +0000
commitb103d8f3a74777595a8e11adacf694511bd7efe6 (patch)
tree0f5a55db8d717afc3cd489b11637934d5db80cd2 /sys-apps/ed
parentold (diff)
downloadhistorical-b103d8f3a74777595a8e11adacf694511bd7efe6.tar.gz
historical-b103d8f3a74777595a8e11adacf694511bd7efe6.tar.bz2
historical-b103d8f3a74777595a8e11adacf694511bd7efe6.zip
touchup
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64
Diffstat (limited to 'sys-apps/ed')
-rw-r--r--sys-apps/ed/Manifest13
-rw-r--r--sys-apps/ed/files/ed-1.0-build.patch16
2 files changed, 10 insertions, 19 deletions
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 9531f3e232d5..4e2f91df3d01 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,20 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX ed-0.5-build.patch 1797 RMD160 37be69f082f5927f059b60eab23ce543bd711524 SHA1 0aea8161d9e363067f9fc1defc0a21e58aa7c4c3 SHA256 ec9f8a7e569a087bdcc68ec76d4418028a93ebe6389872e44fb6d24b68f7be65
-AUX ed-1.0-build.patch 3169 RMD160 3accbbd668f258e0d778be4f62119579ef675991 SHA1 43d6f1025624a72b9aefb6ade7758492986c565c SHA256 0d53ac43d9b3024750f85f15a6e01f6b02ff05263ccd856a07187ada9eeefc87
-DIST ed-0.8.tar.bz2 68052 RMD160 456a0cb1236651e65c3b0f0552c2c24aeab4daba SHA1 d191031fa8f1a424fa15c87b7332e1f42fbfca51 SHA256 37983c87cf1bd2b1162e9277d1bf304222924e9d1fb4ac05bb9be56d78e2ea1f
-DIST ed-0.9.tar.bz2 67941 RMD160 ed73a7e4ea39100f491d207109387e08c6109b80 SHA1 233a942964653598e3915f8396be7dd3b688b95f SHA256 22fa075554b669178b7c073aab5274c473d311a5a10b1ccdae2f45759e21c7f7
+AUX ed-1.0-build.patch 2782 RMD160 436dd14b8245507c7d06ef4b4786b0b0e83f391d SHA1 018ff59c90ee467305bf55ed334d7abaffc6118c SHA256 6ff0be1082081751249459f67f98cfc61458a506945e05a9f3fec0aa4f454b24
DIST ed-1.0.tar.bz2 68074 RMD160 d944beaba67e0f998e840628a7359415af35a42e SHA1 d826461be5247dab4db90055d5248e67eb6cad7c SHA256 f964b1800692d91fcab55e81b303b4a56ae9c311867278665b181a8fcd5f9357
-EBUILD ed-0.8.ebuild 936 RMD160 af71e5b92a2cc6c62d3f5f7bad805b55f29df0d3 SHA1 aa8974d298034a039b1ca04e92a93a517f8fb759 SHA256 9b441aefe4ef4ca91491607746e6d863dc01497a0f1c56c60dbb6f2ae9f1f651
-EBUILD ed-0.9.ebuild 938 RMD160 9119e2b222f0e2d99685f89cf1cecca36c1e52e7 SHA1 e0f9d13fc48a2c306059b9484b9f92b53ab4f3df SHA256 dd04f8f556e67401268561e03ce192a04c1c902bb6b78b31c896e749b2207416
EBUILD ed-1.0.ebuild 894 RMD160 f75a6bfce08318d5c15153bbfbf045928551955e SHA1 afa5671be730fc8663a36d442d03b26b0a1b272f SHA256 88575e0dd590d0f19ce0c6aa9a444910a63fef752128bfd5b3561af77a81477c
MISC ChangeLog 7943 RMD160 de1a4a0149235a05492e842326732711687f3f4f SHA1 b1bb41b70ce050628840d877045abf3c5fb97082 SHA256 da8df61c7958785076f1d9e311d5cf2b7bec51370d18c95577119817bbff5326
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkFWC4ACgkQ67wieSYcaxcvkwCePOVFaBqOQvtth3J8GUCwICy4
-GrMAn3T2qc9LKYFRgIyVzSirWD2pTn1s
-=hy2G
+iEYEARECAAYFAklbOIsACgkQn/5bYzqsSmEZCQCfXjOjMazDUlbe9tukqlckchvQ
+dNAAn1Lb08MroaIrH/YtkpcU+1d/HS1l
+=MGiT
-----END PGP SIGNATURE-----
diff --git a/sys-apps/ed/files/ed-1.0-build.patch b/sys-apps/ed/files/ed-1.0-build.patch
index e0a45329b942..a4b48fc1c9a3 100644
--- a/sys-apps/ed/files/ed-1.0-build.patch
+++ b/sys-apps/ed/files/ed-1.0-build.patch
@@ -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 @@ diff -u ed-1.0/configure ed-1.0-new-patch/configure
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 @@ diff -u ed-1.0/Makefile.in ed-1.0-new-patch/Makefile.in
install-strip : all
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
-Common subdirectories: ed-1.0/testsuite and ed-1.0-new-patch/testsuite