Do not override CFLAGS while building the package, so that optimizations are

not lost.  Fixes PR pkg/20696 by tls@.  While here, fix a build failure.

4 files changed, 42 insertions, 11 deletions

diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index f832b604d29..8332b13fe32 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.6 2002/12/24 17:50:23 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2003/07/29 13:21:56 jmmv Exp $
 
 SHA1 (pspp-0.3.0.tar.gz) = 1d07a7e7ef0677e5934331ed0b80b92c7bba7074
 Size (pspp-0.3.0.tar.gz) = 1122999 bytes
 SHA1 (patch-aa) = 7d332aa82e51da9192cefd6a450d20e2d7c493c8
 SHA1 (patch-ab) = b6e70c52e780cd58fc8bed770b22642e0d67d820
 SHA1 (patch-ac) = 9b7c87e6729616b3c21d683764719c894480624a
-SHA1 (patch-ad) = 1ace1a75fdc0df11b7fe74358660efc8ab6ca914
+SHA1 (patch-ad) = 38d9173ac9fdc7f40c2ef01250d897763fd57ebd
 SHA1 (patch-ae) = 9f3f6cbe2817ab5282e70559e245cf7df0016ba3
 SHA1 (patch-ag) = 3a565a2becf76af67e1cf6b443ed51e24b4fd0f0
 SHA1 (patch-ah) = 8fd5821c09fcc5ea4f96a198186c99e0d958842d
 SHA1 (patch-ai) = f6886d4cd3779f71353dc0e013f3b37b86fe7474
 SHA1 (patch-aj) = e34a0638b8226efdf33cee4eccd40fc4dcaf6210
-SHA1 (patch-ak) = fc3eee590babb3730c76a8226a4549f32a942280
+SHA1 (patch-ak) = 468aa3904e044acb429c8b467897e6fccee44669
 SHA1 (patch-al) = b998fc5f7f6c11bc4b862c0c25fd6a810c60ec97
 SHA1 (patch-am) = 0a9cf92a8b15faa73002d7000a4fa8f6e86e1973
+SHA1 (patch-an) = 1bcb30f7a0a21a9a05cf022d18c9cf806c204f85
diff --git a/math/pspp/patches/patch-ad b/math/pspp/patches/patch-ad
index 314e07480b5..44bf6755616 100644
--- a/math/pspp/patches/patch-ad
+++ b/math/pspp/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2000/04/16 08:56:16 mycroft Exp $
+$NetBSD: patch-ad,v 1.3 2003/07/29 13:21:57 jmmv Exp $
 
---- configure.in.orig	Sat Jan  1 23:05:50 2000
-+++ configure.in	Sun Apr 16 04:44:17 2000
-@@ -47,22 +47,26 @@
+--- configure.in.orig	2000-01-02 05:05:50.000000000 +0100
++++ configure.in
+@@ -47,22 +47,26 @@ AC_CHECK_LIB(gmp, mpf_get_str, 
  AC_SUBST(GMP_SUBDIRS)
  AC_SUBST(GMP_LIBS)
  
@@ -37,3 +37,12 @@ $NetBSD: patch-ad,v 1.2 2000/04/16 08:56:16 mycroft Exp $
      AC_DEFINE(HAVE_LIBHISTORY)
    fi
  fi
+@@ -201,7 +205,7 @@ AC_PROG_LN_S
+ 
+ dnl This must be after other tests so warnings don't provoke errors above.
+ if test "$ac_cv_prog_gcc" = yes; then
+-	CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
++	CFLAGS="$CFLAGS -g -Wall -W -Wno-uninitialized -Wwrite-strings \
+ -Wstrict-prototypes -Wpointer-arith"
+ 	if test "$CC_OPTIONS" != ""; then
+ 		CFLAGS="$CFLAGS $CC_OPTIONS"
diff --git a/math/pspp/patches/patch-ak b/math/pspp/patches/patch-ak
index 035f84df309..ad598f78148 100644
--- a/math/pspp/patches/patch-ak
+++ b/math/pspp/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2002/10/02 21:23:19 dillo Exp $
+$NetBSD: patch-ak,v 1.2 2003/07/29 13:21:57 jmmv Exp $
 
---- configure.orig	Wed Oct  2 23:18:02 2002
+--- configure.orig	2000-01-08 02:36:11.000000000 +0100
 +++ configure
 @@ -3611,46 +3611,8 @@ fi
  
@@ -123,12 +123,12 @@ $NetBSD: patch-ak,v 1.1 2002/10/02 21:23:19 dillo Exp $
  else
    echo "$ac_t""no" 1>&6
 +readline=no
-+fi
-+
  fi
  
 -if test "$ac_cv_lib_readline_readline" = yes; then
 -  for ac_hdr in readline/readline.h
++fi
++
 +if test "$have_readline" = yes; then
 +  LIBS="-l$readlinelib $LIBS"
 +  for ac_hdr in readline.h readline/readline.h
@@ -213,3 +213,12 @@ $NetBSD: patch-ak,v 1.1 2002/10/02 21:23:19 dillo Exp $
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -5573,7 +5615,7 @@ fi
+ 
+ 
+ if test "$ac_cv_prog_gcc" = yes; then
+-	CFLAGS="-g -Wall -W -Wno-uninitialized -Wwrite-strings \
++	CFLAGS="$CFLAGS -g -Wall -W -Wno-uninitialized -Wwrite-strings \
+ -Wstrict-prototypes -Wpointer-arith"
+ 	if test "$CC_OPTIONS" != ""; then
+ 		CFLAGS="$CFLAGS $CC_OPTIONS"
diff --git a/math/pspp/patches/patch-an b/math/pspp/patches/patch-an
new file mode 100644
index 00000000000..7e500d36d29
--- /dev/null
+++ b/math/pspp/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2003/07/29 13:21:57 jmmv Exp $
+
+--- src/output.h.orig	2000-01-03 04:32:06.000000000 +0100
++++ src/output.h
+@@ -28,6 +28,7 @@ struct rect
+     int x1, y1;			/* Upper left. */
+     int x2, y2;			/* Lower right, not part of the rectangle. */
+   };
++typedef struct rect rect;
+ 
+ #if __GNUC__ > 1 && defined(__OPTIMIZE__)
+ extern inline int width (rect r) __attribute__ ((const));