summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-05-19 04:45:20 +0000
committerMike Frysinger <vapier@gentoo.org>2007-05-19 04:45:20 +0000
commit3bcb622df7d085d6f014613ea34d5b6e6b400567 (patch)
tree074a837911396be7432b9442ac3698c5040177ba /sys-process/lsof
parentadd >=sys-apps/util-linux-2.12r-r7 to DEPEND to help people with upgrades / c... (diff)
downloadgentoo-2-3bcb622df7d085d6f014613ea34d5b6e6b400567.tar.gz
gentoo-2-3bcb622df7d085d6f014613ea34d5b6e6b400567.tar.bz2
gentoo-2-3bcb622df7d085d6f014613ea34d5b6e6b400567.zip
scrub crap from patch
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-process/lsof')
-rw-r--r--sys-process/lsof/files/lsof-4.78-answer-config.patch24
1 files changed, 6 insertions, 18 deletions
diff --git a/sys-process/lsof/files/lsof-4.78-answer-config.patch b/sys-process/lsof/files/lsof-4.78-answer-config.patch
index 8aa51c5a8c75..a5e5f1202795 100644
--- a/sys-process/lsof/files/lsof-4.78-answer-config.patch
+++ b/sys-process/lsof/files/lsof-4.78-answer-config.patch
@@ -1,28 +1,17 @@
-diff -ur a/Configure b/Configure
---- a/Configure 2007-05-18 15:02:13 +0100
-+++ b/Configure 2007-05-18 15:03:04 +0100
-@@ -2294,7 +2294,7 @@
-
- LSOF_VERS=`echo $LSOF_VSTR | sed 's/\./ /g' | awk '{printf "%d%d%03d",\$1,\$2,\$3}'`
+--- a/Configure
++++ b/Configure
+@@ -2294,3 +2294,3 @@
fi # }
- LSOF_CFGF="-DLINUXV=$LSOF_VERS"
+ LSOF_CFGF="${CFLAGS} -DLINUXV=$LSOF_VERS"
if test $LSOF_VERS -lt 21072 # {
- then
- echo ""
-@@ -4828,7 +4828,7 @@
- if test "X$LSOF_LIB_NO" = "X" # {
- then
+@@ -4828,3 +4828,3 @@
echo "" >> $LSOF_MKFC
- echo "CFGL= $LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL" >> $LSOF_MKFC
+ echo "CFGL= $LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL ${LDFLAGS}" >> $LSOF_MKFC
fi # }
- echo "" >> $LSOF_MKFC
- if test "X$LSOF_DEBUG" = "X" # {
-Only in b: Configure.orig
-diff -ur a/Customize b/Customize
---- a/Customize 2007-05-18 15:02:13 +0100
-+++ b/Customize 2007-05-18 15:05:46 +0100
+--- a/Customize
++++ b/Customize
@@ -110,7 +110,7 @@
do
echo ""
@@ -104,4 +93,3 @@ diff -ur a/Customize b/Customize
if test "X$ANS" = "Xn" -o "X$ANS" = "XN"
then
END=1
-Only in b: Customize.orig