Honor CFLAGS passed in from environment during build.

6 files changed, 40 insertions, 21 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 \
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index f2d7e0fea19..160312376f3 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/01 16:43:39 jlam Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -18,6 +18,7 @@ USE_LIBTOOL=	yes
 QTPREFIX=${PREFIX}/qt1
 
 MAKE_ENV=	QTDIR=${WRKSRC} QTPREFIX=${QTPREFIX}
+MAKE_ENV+=	CXXOPTS="${CFLAGS}"
 ALL_TARGET=	src
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/qt1/distinfo b/x11/qt1/distinfo
index a44f4cde382..4c80d7de097 100644
--- a/x11/qt1/distinfo
+++ b/x11/qt1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:43 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/01 16:43:39 jlam Exp $
 
 SHA1 (qt-1.44.tar.gz) = 08848fe5534bb210b151a1d9f3480fe83c0053c1
 Size (qt-1.44.tar.gz) = 2659999 bytes
-SHA1 (patch-aa) = 5481b8c096ef6ddf2d48ace2c34642e8440a4fcb
+SHA1 (patch-aa) = b94f2fadee75696e0afb98cd2d0839d991f98573
 SHA1 (patch-ab) = 76d0ac60cd386518b5d8a48d15552abc5c8737ef
-SHA1 (patch-ac) = e277ab0aaf539cd620678562f6721072ab6276a6
+SHA1 (patch-ac) = 5554b60c0f4cbd13ea2fde8fcb8c287e8ac8b651
diff --git a/x11/qt1/patches/patch-aa b/x11/qt1/patches/patch-aa
index c383fcdde77..35d4d74ef94 100644
--- a/x11/qt1/patches/patch-aa
+++ b/x11/qt1/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/03/03 14:36:01 skrll Exp $
+$NetBSD: patch-aa,v 1.7 2001/05/01 16:43:40 jlam Exp $
 
---- configs/netbsd-g++-static.orig	Fri Feb 26 17:02:07 1999
+--- configs/netbsd-g++-static.orig	Fri Feb 26 12:02:07 1999
 +++ configs/netbsd-g++-static
 @@ -1,5 +1,6 @@
  # Compiling
@@ -59,7 +59,8 @@ $NetBSD: patch-aa,v 1.6 2001/03/03 14:36:01 skrll Exp $
 +	$(LIBTOOL) --mode=link c++ -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
 +	-o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) 
  # Compiling application source
- SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
+-SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
++SYSCONF_CXXFLAGS	= ${CXXOPTS} -fno-strength-reduce
  # Compiling library source
 -SYSCONF_CXXFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
 +SYSCONF_CXXFLAGS_LIB	=
@@ -67,4 +68,4 @@ $NetBSD: patch-aa,v 1.6 2001/03/03 14:36:01 skrll Exp $
 -SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
 -SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
 -SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
-+SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce
++SYSCONF_CXXFLAGS_SHOBJ	= ${CXXOPTS} -fno-strength-reduce
diff --git a/x11/qt1/patches/patch-ac b/x11/qt1/patches/patch-ac
index acb6a969d75..33793e08662 100644
--- a/x11/qt1/patches/patch-ac
+++ b/x11/qt1/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2000/07/07 07:47:25 skrll Exp $
+$NetBSD: patch-ac,v 1.5 2001/05/01 16:43:40 jlam Exp $
 
---- configs/solaris-g++-static.orig	Fri Feb 26 17:02:12 1999
-+++ configs/solaris-g++-static	Thu Jun 15 12:37:59 2000
+--- configs/solaris-g++-static.orig	Fri Feb 26 12:02:12 1999
++++ configs/solaris-g++-static
 @@ -1,30 +1,31 @@
  # Compiling
 -SYSCONF_CXX		= g++
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.4 2000/07/07 07:47:25 skrll Exp $
  SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
  SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -h $(TARGET1) -shared  \
  				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-@@ -54,10 +55,10 @@
+@@ -54,15 +55,15 @@
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
  #   - Place target in $(DESTDIR) - which has a trailing /
  #
@@ -62,5 +62,13 @@ $NetBSD: patch-ac,v 1.4 2000/07/07 07:47:25 skrll Exp $
 -				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 +				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) 
  # Compiling application source
- SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
+-SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
++SYSCONF_CXXFLAGS	= ${CXXOPTS} -fno-strength-reduce
  # Compiling library source
+-SYSCONF_CXXFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
++SYSCONF_CXXFLAGS_LIB	= ${CXXOPTS} -fno-strength-reduce -fPIC
+ # Compiling shared-object source
+-SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
++SYSCONF_CXXFLAGS_SHOBJ	= ${CXXOPTS} -fno-strength-reduce -fPIC
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)