Update from 0.19 to 0.22.
Make it respect CXXFLAGS/CFLAGS

files added: patch-aa patch-ab

Fix: 

-Chris--QCXXARTyLCpzorGqUon7tvqJkdJftD4z4DgFCIhjCrJtcSX4
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: flwm/Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/flwm/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1999/03/17 05:09:02	1.2
+++ Makefile	1999/04/15 01:49:54
@@ -1,16 +1,15 @@
 # New ports collection makefile for:   	flwm
-# Version required:			0.19
+# Version required:			0.22
 # Date created:				12 February 1999
 # Whom:                			Dima Sivachenko <dima@chg.ru>
 #
 # $Id: Makefile,v 1.2 1999/03/17 05:09:02 nectar Exp $
 #
 
-DISTNAME=	flwm-0.19
+DISTNAME=	flwm-0.22
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.cinenet.net/users/spitzak/flwm/ \
 		ftp://ftp.sai.msu.su/pub/X11/win_man/
-#		ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dima@chg.ru
@@ -19,6 +18,7 @@
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 MAN1=		flwm.1
 
 .include <bsd.port.mk>
Index: flwm/files/md5
===================================================================
RCS file: /cvs/FreeBSD/ports/x11-wm/flwm/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5	1999/03/15 01:14:36	1.1.1.1
+++ md5	1999/04/14 23:43:04
@@ -1 +1 @@
-MD5 (flwm-0.19.tgz) = 7d8f7abaa1e135e25df6358dedcd7394
+MD5 (flwm-0.22.tgz) = b1cf229d6e7b8907b153a04e47a14c0d
Index: flwm/patches/patch-aa
===================================================================
RCS file: patch-aa
diff -N patch-aa
--- /dev/null	Wed Apr 14 18:59:30 1999
+++ patch-aa	Wed Apr 14 18:51:07 1999
@@ -0,0 +1,11 @@
+--- Makefile.orig	Wed Apr 14 18:50:44 1999
++++ Makefile	Wed Apr 14 18:50:51 1999
+@@ -5,7 +5,7 @@
+ 
+ CXXFILES = main.C Frame.C Rotated.C Menu.C FrameWindow.C Desktop.C Hotkeys.C
+ 
+-LIBS = -lfltk
++LIBS = -lfltk -lGL
+ 
+ MANPAGE = 1
+ 
Index: flwm/patches/patch-ab
===================================================================
RCS file: patch-ab
diff -N patch-ab
--- /dev/null	Wed Apr 14 18:59:30 1999
+++ patch-ab	Wed Apr 14 18:56:38 1999
@@ -0,0 +1,26 @@
+--- configure.orig	Wed Apr 14 18:54:10 1999
++++ configure	Wed Apr 14 18:56:19 1999
+@@ -813,9 +813,9 @@
+   if test "$ac_test_CXXFLAGS" = set; then
+     CXXFLAGS="$ac_save_CXXFLAGS"
+   elif test $ac_cv_prog_cxx_g = yes; then
+-    CXXFLAGS="-g -O2"
++    CXXFLAGS="$CXXFLAGS"
+   else
+-    CXXFLAGS="-O2"
++    CXXFLAGS="$CXXFLAGS"
+   fi
+ else
+   GXX=
+@@ -1805,9 +1805,9 @@
+ if test -n "$GXX"; then
+     # GNU C compiler
+     # -Wno-return-type is necessary for Xlib header files on many systems:
+-    CFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
++    CFLAGS="-Wall -Wno-return-type $CFLAGS $X_CFLAGS"
+     CFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+-    CXXFLAGS="-Wall -Wno-return-type -O2 $X_CFLAGS"
++    CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
+     CXXFLAGS_D="-Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
+ else
+ if test "`(uname) 2>/dev/null`" = IRIX; then