better cross-compile patch

diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 4017b412c0b23f6f354ff10d6ccec406c38afcc5..c7f784d56ae4986dbe7277cf48dbcb1748e25d0c 100644 (file)
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -9,7 +9,7 @@ MD5 295a1076025b39ae76d9113ee9b785a2 files/digest-man-1.5o_p1 61
 MD5 7e4bd368680d1c95bdaa6c6d5ee556f1 files/man-1.5m-locale-order.patch 454
 MD5 a1fe892ffb27e5e044ed342b611d2db1 files/makewhatis.cron 126
 MD5 9feb57fe5fbc4c123a42c7cf0314e628 files/digest-man-1.5m-r2 61
-MD5 aefc4e52d394932d7b55a5475e9284b8 files/man-1.5m-cross-compile.patch 296
+MD5 932c883a826094eb89ed6683b6f61338 files/man-1.5m-cross-compile.patch 1043
 MD5 43a67f127cf7051e3399773c5e8d56f6 files/man-1.5o_p1-man2html-CFLAGS.patch 343
 MD5 963a9363ab4bdb32e5fccaf0edc48d19 files/man-1.5m-LL-linelength.patch 475
 MD5 fc750a4d956da7cb889e89722fe8f4e2 files/man-1.5m-defmanpath-symlinks.patch 750
@@ -23,7 +23,7 @@ MD5 de02d99d60fb0e923c37e9130989b324 files/man-1.5m-wrong-quotes-v2.patch 328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBvfstroRuSHgZdywRAmJEAJ9MydRCimMHZ1sxG4T4GdZv2+/gQgCbBcTX
-4z3x+u1TokjWgHHXOZX97hw=
-=PvTV
+iD8DBQFBvkXEroRuSHgZdywRAsw/AJsGBPeuAnNVKUYiK2QgFv52OgiOsACghR5N
+pGo9uOkrHkRJCh21HaIhW3I=
+=6xrn
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/man/files/man-1.5m-cross-compile.patch b/sys-apps/man/files/man-1.5m-cross-compile.patch
index bd498ae261471c0e75d34249fb1efb7bed6af040..a86a61d02dc02a42c7d03378121ff5a04f703e3b 100644 (file)
--- a/sys-apps/man/files/man-1.5m-cross-compile.patch
+++ b/sys-apps/man/files/man-1.5m-cross-compile.patch
@@ -1,6 +1,36 @@
---- man-1.5m2/src/Makefile.in.orig     2004-12-13 14:10:10.234084393 -0500
-+++ man-1.5m2/src/Makefile.in  2004-12-13 14:10:32.624709119 -0500
-@@ -37,4 +37,7 @@
+diff -ur man-1.5o1.orig/configure man-1.5o1/configure
+--- man-1.5o1.orig/configure   2004-12-13 20:39:38.711558600 -0500
++++ man-1.5o1/configure        2004-12-13 20:40:42.946793360 -0500
+@@ -211,6 +211,7 @@
+ fi
+ 
+ CC=${CC-cc}
++BUILD_CC=${BUILD_CC-${CC}}
+ INSTALL=${INSTALL-install}
+ INCLUDEDIR=${INCLUDEDIR-/usr/include}
+ 
+@@ -1265,6 +1266,7 @@
+   sed -e '
+ s,@version@,$version,
+ s,@CC@,$CC,
++s,@BUILD_CC@,$BUILD_CC,
+ s,@INSTALL@,$INSTALL,
+ s,@DEFS@,$DEFS,
+ s,@LIBS@,$LIBS,
+diff -ur man-1.5o1.orig/src/Makefile.in man-1.5o1/src/Makefile.in
+--- man-1.5o1.orig/src/Makefile.in     2004-12-13 20:39:38.721557080 -0500
++++ man-1.5o1/src/Makefile.in  2004-12-13 20:40:15.417978376 -0500
+@@ -12,6 +12,7 @@
+ # use of catalogs - aeb, June 1994
+ 
+ CC = @CC@
++BUILD_CC = @BUILD_CC@
+ INSTALL = @INSTALL@
+ 
+ pager = @pager@
+@@ -36,6 +37,9 @@
+ man: $(MANOBJS) $(LIBOBJS)
+       $(CC) $(LDFLAGS) -o man $(MANOBJS) $(LIBOBJS) $(LIBS)
  
 +makemsg:
 +      $(BUILD_CC) -o makemsg makemsg.c