Make this build with FreeBSD builtin gcc. Bump PKGREVISION.

4 files changed, 19 insertions, 19 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 0dd8abb224c..937823015d4 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2008/02/05 19:17:24 hira Exp $
+# $NetBSD: Makefile,v 1.38 2008/02/06 16:41:07 hira Exp $
 #
 
 OO_VER=			2.3.1
-PKGREVISION=		3
+PKGREVISION=		4
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
 CATEGORIES=		misc
diff --git a/misc/openoffice2/Makefile.FreeBSD b/misc/openoffice2/Makefile.FreeBSD
index 614c9cf4958..9fddcf8a909 100644
--- a/misc/openoffice2/Makefile.FreeBSD
+++ b/misc/openoffice2/Makefile.FreeBSD
@@ -1,20 +1,11 @@
-# $NetBSD: Makefile.FreeBSD,v 1.2 2008/02/05 22:11:16 hira Exp $
+# $NetBSD: Makefile.FreeBSD,v 1.3 2008/02/06 16:41:07 hira Exp $
+#
 
 BUILD_DEPENDS+=		coreutils>=*:../../sysutils/coreutils
 BUILD_DEPENDS+=		patch>=*:../../devel/patch
 CONFIGURE_ARGS+=	--with-gnu-cp=${PREFIX}/bin/gcp
 CONFIGURE_ARGS+=	--with-gnu-patch=${PREFIX}/bin/gpatch
 
-# libgcc_s.so is required, but FreeBSD does not have it.
-USE_PKGSRC_GCC=		yes
-
-# Even if a conftest compiled with -Wl,-R${BUILDLINK_PREFIX.gcc34}/lib,
-# /libexec/ld-elf.so.1 cannot find libgcc_s.so.1.
-pre-configure:
-	ldconfig -m ${BUILDLINK_PREFIX.gcc34}/lib
-pre-build:
-	ldconfig -m ${BUILDLINK_PREFIX.gcc34}/lib
-
 .if ${MACHINE_ARCH} == "i386"
 #OPENOFFICE_DLLSUFFIX=	fi
 OPENOFFICE_OUTPATH=	unxfbsdi
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index f407512c50d..fa29a75d335 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2008/02/05 19:17:25 hira Exp $
+$NetBSD: distinfo,v 1.34 2008/02/06 16:41:07 hira Exp $
 
 SHA1 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 0643c52da3850a164928342e7651897b7a76ca1f
 RMD160 (openoffice-2.3.1/OOo_2.3.1_src_binfilter.tar.bz2) = 497aec1de49ea941ab8305331a9fc9e8e04a5162
@@ -65,6 +65,6 @@ SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
 SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
-SHA1 (patch-cy) = 89ded172ede9d7f998407c9a0ecd6f22207da49f
+SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
 SHA1 (patch-cz) = e9850759fccff68914b104f4075e79c61b1010eb
 SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
diff --git a/misc/openoffice2/patches/patch-cy b/misc/openoffice2/patches/patch-cy
index e973584bde6..eaa5fd11dea 100644
--- a/misc/openoffice2/patches/patch-cy
+++ b/misc/openoffice2/patches/patch-cy
@@ -1,8 +1,8 @@
-$NetBSD: patch-cy,v 1.1 2007/12/28 04:47:04 hira Exp $
+$NetBSD: patch-cy,v 1.2 2008/02/06 16:41:07 hira Exp $
 
---- store/util/makefile.mk.orig	2007-12-26 19:02:55.000000000 +0900
-+++ store/util/makefile.mk	2007-12-26 19:04:32.000000000 +0900
-@@ -79,9 +79,7 @@
+--- store/util/makefile.mk.orig	2007-07-05 08:57:12.000000000 +0000
++++ store/util/makefile.mk	2008-02-06 22:10:01.000000000 +0000
+@@ -79,14 +79,16 @@
  .IF "$(GUI)"=="WNT"
  SHL1STDLIBS+= 	-lsupc++
  .ELSE
@@ -13,3 +13,12 @@ $NetBSD: patch-cy,v 1.1 2007/12/28 04:47:04 hira Exp $
  .IF "$(CCNUMVER)"<="000399999999"
  SHL1STDLIBS+=	-lsupc++
  .ENDIF # CCNUMVER
+ .ELIF "$(CCNUMVER)"<="000400000999"
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+=	-lsupc++ -lgcc
++.ELSE
+ SHL1STDLIBS+= 	-lsupc++ -lgcc_s
++.ENDIF # FREEBSD
+ .ENDIF
+ .ENDIF
+ .ENDIF