- Make this build on FreeBSD (tested on 6.3-RELEASE/i386 only).

    This should fix PR pkg/37929.
  - Merge Makefile.NetBSD.i386 and Makefile.NetBSD.x86_64 to
    Makefile.NetBSD.

8 files changed, 103 insertions, 32 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index af5bf68087c..0dd8abb224c 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/01/18 22:31:41 hira Exp $
+# $NetBSD: Makefile,v 1.37 2008/02/05 19:17:24 hira Exp $
 #
 
 OO_VER=			2.3.1
@@ -35,8 +35,6 @@ CONFIGURE_DIRS=		config_office
 GCC_REQD+=		3.4
 USE_LANGUAGES+=		c c++
 
-.include "../../mk/compiler.mk"
-
 USE_TOOLS+=		bash gmake imake perl pkg-config tar
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
@@ -47,7 +45,8 @@ CONFLICTS+=		openoffice-bin-[0-9]*
 CONFLICTS+=		openoffice2-bin-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
-ONLY_FOR_PLATFORM=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
+ONLY_FOR_PLATFORM=	FreeBSD-*-i386 FreeBSD-*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
 
 GNU_CONFIGURE=		yes
@@ -96,9 +95,6 @@ CONFIGURE_ARGS+=	--enable-epm --with-package-format=portable
 # XXX: Error in OOo internal libsndfile.
 CONFIGURE_ARGS+=	--disable-pasf
 
-# systray quickstarter is broken with mutex handling.
-CONFIGURE_ARGS+=	--disable-systray
-
 # Disable Java.
 CONFIGURE_ARGS+=	--without-java --disable-odk --disable-gcjaot
 
@@ -168,22 +164,12 @@ post-install:
 	${ECHO} bin/${OO_UNXNAME} >> ${PLIST_SRC}
 	${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${PLIST_SRC}
 
-# everything specific to your OS/Arch goes into its own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-#
-ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
-
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
+# OS specific Makefile
+.if exists(Makefile.${OPSYS})
+.  include "Makefile.${OPSYS}"
 .endif
 
-# *.pc files are required, but these don't exist on NetBSD.
-.if ${OPSYS} == "NetBSD" && defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-USE_BUILTIN.freetype2=	no
-USE_BUILTIN.Xfixes=     no
-USE_BUILTIN.Xrandr=     no
-USE_BUILTIN.Xrender=    no
-.endif
+.include "../../mk/compiler.mk"
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
 .include "../../lang/python/application.mk"
diff --git a/misc/openoffice2/Makefile.FreeBSD b/misc/openoffice2/Makefile.FreeBSD
new file mode 100644
index 00000000000..921b644b5ab
--- /dev/null
+++ b/misc/openoffice2/Makefile.FreeBSD
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.FreeBSD,v 1.1 2008/02/05 19:17:24 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
+
+# Is this required every time?
+pre-build:
+	ldconfig -m ${BUILDLINK_PREFIX.gcc34}/lib
+
+.if ${MACHINE_ARCH} == "i386"
+#OPENOFFICE_DLLSUFFIX=	fi
+OPENOFFICE_OUTPATH=	unxfbsdi
+OPENOFFICE_SETFILE=	FreeBSDX86
+.elif ${MACHINE_ARCH} == "x86_64"
+#OPENOFFICE_DLLSUFFIX=	fx
+OPENOFFICE_OUTPATH=	unxfbsdx
+OPENOFFICE_SETFILE=	FreeBSDAMD
+.endif
diff --git a/misc/openoffice2/Makefile.NetBSD b/misc/openoffice2/Makefile.NetBSD
new file mode 100644
index 00000000000..fb0eee2d070
--- /dev/null
+++ b/misc/openoffice2/Makefile.NetBSD
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.NetBSD,v 1.1 2008/02/05 19:17:24 hira Exp $
+#
+
+# systray quickstarter is broken with mutex handling?
+CONFIGURE_ARGS+=	--disable-systray
+
+# *.pc files are required, but these don't exist on NetBSD.
+.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
+USE_BUILTIN.freetype2=  no
+USE_BUILTIN.Xfixes=     no
+USE_BUILTIN.Xrandr=     no
+USE_BUILTIN.Xrender=    no
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+#OPENOFFICE_DLLSUFFIX=	bi
+OPENOFFICE_OUTPATH=	unxbsdi3
+OPENOFFICE_SETFILE=	NetBSDX86
+.elif ${MACHINE_ARCH} == "x86_64"
+#OPENOFFICE_DLLSUFFIX=	bx
+OPENOFFICE_OUTPATH=	unxbsdx3
+OPENOFFICE_SETFILE=	NetBSDX86-64
+.endif
diff --git a/misc/openoffice2/Makefile.NetBSD.i386 b/misc/openoffice2/Makefile.NetBSD.i386
deleted file mode 100644
index 2618e48d15a..00000000000
--- a/misc/openoffice2/Makefile.NetBSD.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.3 2007/11/11 03:35:35 hira Exp $
-
-#OPENOFFICE_DLLSUFFIX=	bi
-OPENOFFICE_OUTPATH=	unxbsdi3
-OPENOFFICE_SETFILE=	NetBSDX86
diff --git a/misc/openoffice2/Makefile.NetBSD.x86_64 b/misc/openoffice2/Makefile.NetBSD.x86_64
deleted file mode 100644
index d98f7e28dea..00000000000
--- a/misc/openoffice2/Makefile.NetBSD.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile.NetBSD.x86_64,v 1.4 2007/12/28 04:47:04 hira Exp $
-
-#OPENOFFICE_DLLSUFFIX=	bx
-OPENOFFICE_OUTPATH=	unxbsdx3
-OPENOFFICE_SETFILE=	NetBSDX86-64
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 394e5ea3ffe..f407512c50d 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2007/12/28 04:47:04 hira Exp $
+$NetBSD: distinfo,v 1.33 2008/02/05 19:17:25 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
@@ -66,3 +66,5 @@ SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 48545a27326abbfc464cae877262bc8735bb5c01
 SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
 SHA1 (patch-cy) = 89ded172ede9d7f998407c9a0ecd6f22207da49f
+SHA1 (patch-cz) = e9850759fccff68914b104f4075e79c61b1010eb
+SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
diff --git a/misc/openoffice2/patches/patch-cz b/misc/openoffice2/patches/patch-cz
new file mode 100644
index 00000000000..73578628ab3
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cz
@@ -0,0 +1,30 @@
+$NetBSD: patch-cz,v 1.1 2008/02/05 19:17:25 hira Exp $
+
+From FreeBSD ports patch-i78875.
+
+--- libtextcat/libtextcat-2.2.patch.orig	2007-10-26 15:01:46.000000000 +0000
++++ libtextcat/libtextcat-2.2.patch	2008-02-03 00:35:33.000000000 +0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Fri Aug 17 21:51:26 2007
+ ***************
diff --git a/misc/openoffice2/patches/patch-da b/misc/openoffice2/patches/patch-da
new file mode 100644
index 00000000000..10061d58177
--- /dev/null
+++ b/misc/openoffice2/patches/patch-da
@@ -0,0 +1,17 @@
+$NetBSD: patch-da,v 1.1 2008/02/05 19:17:25 hira Exp $
+
+--- solenv/inc/unxfbsd.mk.orig	2008-02-05 20:42:15.000000000 +0000
++++ solenv/inc/unxfbsd.mk	2008-02-05 20:43:58.000000000 +0000
+@@ -180,10 +180,10 @@
+ STDSLOCUI=
+ 
+ # libraries for linking applications
+-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBGUIMT=$(X11_LDFLAGS) -lX11 $(PTHREAD_LIBS) -lm
+ STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+ # libraries for linking shared libraries
+-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLGUIMT=$(X11_LDFLAGS) -lX11 -lXext $(PTHREAD_LIBS) -lm
+ STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+ 
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive