diff options
Diffstat (limited to 'x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch')
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch new file mode 100644 index 000000000000..b4001dfc5b2e --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-4.20-norpm.patch @@ -0,0 +1,39 @@ +--- configure.orig 2005-02-23 01:59:54.000000000 -0800 ++++ configure 2005-02-23 10:10:12.082129160 -0800 +@@ -21762,36 +21762,6 @@ + + # M4 sucks!! + +-rpmv=`(rpm -qv xscreensaver) 2>/dev/null | \ +- sed -n 's/^xscreensaver-\([0-9][0-9]*[.][0-9][0-9]*\)-.*$/\1/p'` +- +- +-if test \! -z "$rpmv" ; then +- rpmbdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'` +- rpmhdir=`rpm -ql xscreensaver | sed -n 's@^\(.*\)/attraction$@\1@p'` +- +- warning=no +- warnL "There is already an installed RPM of xscreensaver $rpmv" +- warn2 "on this system. You might want to remove it (with" +- warn2 '"rpm -ve xscreensaver") before running "make install"' +- warn2 "from this directory." +- echo "" +- warn2 "Alternately, you could build this version of xscreensaver" +- warn2 'as an RPM, and then install that. An "xscreensaver.spec"' +- warn2 'file is included. Try "rpmbuild -v -ba xscreensaver.spec".' +- warn2 "See the RPM documentation for more info." +- echo "" +- +- if test "$rpmbdir" = "$rpmhdir" ; then +- warn2 "The RPM version was installed in $rpmbdir/." +- do_dir_warning=yes +- else +- warn2 "The RPM version was installed in $rpmbdir/," +- warn2 "with demos in $rpmhdir/." +- fi +-fi +- +- + if test "${bindir}" = "${HACKDIR}" ; then + do_dir_warning=yes + fi |