diff options
| author | tron <tron> | 2001-11-01 10:00:52 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-11-01 10:00:52 +0000 |
| commit | 07b846744fb20990405d052fd74832d8e0b8e69a (patch) | |
| tree | f2f363c4ab9d9ade71e9e56e19f01e7dd62ecdde /wm | |
| parent | bd7e0cda309cfb17486f6b340be0afe09baee0a2 (diff) | |
| download | pkgsrc-07b846744fb20990405d052fd74832d8e0b8e69a.tar.gz | |
Fix build problem on systems running XFree86 3.3.x in conjuction with the
"xpkgwedge" package.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/fvwm95/distinfo | 4 | ||||
| -rw-r--r-- | wm/fvwm95/patches/patch-af | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/wm/fvwm95/distinfo b/wm/fvwm95/distinfo index dc0c296e311..2bf40afd80c 100644 --- a/wm/fvwm95/distinfo +++ b/wm/fvwm95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/05/01 16:34:10 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/11/01 10:00:52 tron Exp $ SHA1 (fvwm95-2.0.43a-Autoconf.tgz) = b9e99a971413c9b69b3b7d779c9371523e4ca735 Size (fvwm95-2.0.43a-Autoconf.tgz) = 605617 bytes @@ -7,5 +7,5 @@ SHA1 (patch-ab) = ed00c17d6bceb386028811fdc59fea3f9cad230d SHA1 (patch-ac) = cceffaf54d6d5f29a2b126eb3502d5dc23688c1a SHA1 (patch-ad) = 2de2d4c175d14fce6ad28aeef9ce5a4364da957d SHA1 (patch-ae) = 94589a118015e521919a6604449143355b9c4a64 -SHA1 (patch-af) = 9ead8e490fd71e00bd17c292728787344afb8acd +SHA1 (patch-af) = 935be0959d74c0bf96ce71297316e812cee7850a SHA1 (patch-ag) = 915cec5e00605fbe2c592aab788910ee2e6f51fb diff --git a/wm/fvwm95/patches/patch-af b/wm/fvwm95/patches/patch-af index 93e7099d95a..feb3a87544f 100644 --- a/wm/fvwm95/patches/patch-af +++ b/wm/fvwm95/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2001/05/01 16:34:11 jlam Exp $ +$NetBSD: patch-af,v 1.3 2001/11/01 10:00:52 tron Exp $ ---- configure.orig Tue Dec 10 11:55:16 1996 -+++ configure +--- configure.orig Tue Dec 10 17:55:16 1996 ++++ configure Thu Nov 1 10:57:57 2001 @@ -518,8 +518,6 @@ @@ -11,15 +11,19 @@ $NetBSD: patch-af,v 1.2 2001/05/01 16:34:11 jlam Exp $ #------------------------------------------------------------------- # # Remove the ./config.cache file and rerun configure if -@@ -2126,7 +2124,7 @@ +@@ -2126,10 +2124,10 @@ fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons" if test "x$x_libraries" != x ; then - x_libraries="-L$x_libraries" -+ x_libraries="-L$x_libraries -Wl,-R$x_libraries" ++ x_libraries="-L$x_libraries -Wl,-R$x_libraries -L$prefix/lib -Wl,-R$prefix/lib" fi if test "x$x_includes" != x ; then - x_includes="-I$x_includes" +- x_includes="-I$x_includes" ++ x_includes="-I$x_includes -I${prefix}/include" + fi + + @@ -2247,7 +2245,6 @@ libs/Makefile \ mini-icons/Makefile \ |