summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjlam <jlam>2001-05-01 16:34:10 +0000
committerjlam <jlam>2001-05-01 16:34:10 +0000
commit4b8b8b9d1abd6401c1bfd7fe889913eb0f51e540 (patch)
treee7f0254359adaa9990784f24e0c2fac2387a2ad7 /wm
parente5e435c0dd90bf3f72a8cd29a831d793f61ace49 (diff)
downloadpkgsrc-4b8b8b9d1abd6401c1bfd7fe889913eb0f51e540.tar.gz
Honor CFLAGS passed in from environment during build.
Diffstat (limited to 'wm')
-rw-r--r--wm/fvwm95/distinfo4
-rw-r--r--wm/fvwm95/patches/patch-af21
2 files changed, 17 insertions, 8 deletions
diff --git a/wm/fvwm95/distinfo b/wm/fvwm95/distinfo
index 0fce0ea0880..dc0c296e311 100644
--- a/wm/fvwm95/distinfo
+++ b/wm/fvwm95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:46 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/01 16:34:10 jlam 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) = ba663ed30dd5b37e7462280722d1e6bf81ac5e07
+SHA1 (patch-af) = 9ead8e490fd71e00bd17c292728787344afb8acd
SHA1 (patch-ag) = 915cec5e00605fbe2c592aab788910ee2e6f51fb
diff --git a/wm/fvwm95/patches/patch-af b/wm/fvwm95/patches/patch-af
index 8c6f60465e0..93e7099d95a 100644
--- a/wm/fvwm95/patches/patch-af
+++ b/wm/fvwm95/patches/patch-af
@@ -1,8 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-af,v 1.2 2001/05/01 16:34:11 jlam Exp $
---- configure.orig Wed Dec 11 03:55:16 1996
-+++ configure Tue Jan 11 10:23:21 2000
-@@ -2126,7 +2126,7 @@
+--- configure.orig Tue Dec 10 11:55:16 1996
++++ configure
+@@ -518,8 +518,6 @@
+
+
+
+-CFLAGS=-O
+-
+ #-------------------------------------------------------------------
+ #
+ # Remove the ./config.cache file and rerun configure if
+@@ -2126,7 +2124,7 @@
fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons"
if test "x$x_libraries" != x ; then
@@ -11,7 +20,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
fi
if test "x$x_includes" != x ; then
x_includes="-I$x_includes"
-@@ -2247,7 +2247,6 @@
+@@ -2247,7 +2245,6 @@
libs/Makefile \
mini-icons/Makefile \
utils/Makefile \
@@ -19,7 +28,7 @@ $NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
sample.fvwmrc/Makefile \
modules/Makefile \
modules/FvwmAudio/Makefile \
-@@ -2329,7 +2328,6 @@
+@@ -2329,7 +2326,6 @@
libs/Makefile \
mini-icons/Makefile \
utils/Makefile \