[pkgsrc/trunk]: pkgsrc/misc/openoffice replace the (somewhat broken) test to ...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff3f04296ddb
branches:  trunk
changeset: 466669:ff3f04296ddb
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Jan 22 08:57:03 2004 +0000

description:
replace the (somewhat broken) test to figure out the compiler version
with GCC_REQD=2.95.2.

diffstat:

 misc/openoffice/Makefile |  22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diffs (36 lines):

diff -r d3779bacc3fc -r ff3f04296ddb misc/openoffice/Makefile
--- a/misc/openoffice/Makefile  Thu Jan 22 08:47:32 2004 +0000
+++ b/misc/openoffice/Makefile  Thu Jan 22 08:57:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/01/20 12:21:02 agc Exp $
+# $NetBSD: Makefile,v 1.43 2004/01/22 08:57:03 grant Exp $
 
 DISTNAME=              openoffice-0.0.0.641
 PKGREVISION=           2
@@ -19,24 +19,8 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-# OpenOffice requires gcc 2.95.2 or better,
-GCC_VERSION!=          ${CC} --version
-.if (${GCC_VERSION} != "2.95.2") && (${GCC_VERSION} != "2.95.3")
-BUILD_DEPENDS+= gcc>=2.95.3:../../lang/gcc
-.  if ${OPSYS} == "SunOS"
-GCCPREFIX=             ${LOCALBASE}
-CC=                    ${GCCPREFIX}/bin/gcc
-CXX=                   ${GCCPREFIX}/bin/g++
-.  else
-GCCPREFIX=             ${LOCALBASE}/gcc-2.95.3
-CC=                    ${GCCPREFIX}/bin/cc
-CXX=                   ${GCCPREFIX}/bin/c++
-.  endif
-CPP=                   ${GCCPREFIX}/bin/cpp
-F77=                   ${GCCPREFIX}/bin/g77
-PKG_FC=                        ${GCCPREFIX}/bin/g77
-LDFLAGS+=              ${RPATH_FLAG}${GCCPREFIX}/lib
-.endif
+# OpenOffice requires gcc 2.95.2 or better.
+GCC_REQD=              2.95.2
 
 BUILD_DEPENDS+=                bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=                {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh