- Fix platform comparison of extension on NetBSD/i386 and amd64.

 - Install files of the following platform dependent extensions.
      * Sun PDF Import Extension
      * Sun Presentation Minimizer
      * Sun Presenter Console

NOTE: These extensions are not installed to OOo because you must agree
      the license before use.  Please see MESSAGE how to install.

Bump PKGREVISION.

5 files changed, 62 insertions, 15 deletions

diff --git a/misc/openoffice3/MESSAGE b/misc/openoffice3/MESSAGE
index 45b0696a6c0..eb94b338952 100644
--- a/misc/openoffice3/MESSAGE
+++ b/misc/openoffice3/MESSAGE
@@ -1,10 +1,23 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2008/10/20 12:30:16 hira Exp $
+$NetBSD: MESSAGE,v 1.3 2008/10/24 11:35:28 hira Exp $
 
-  OpenOffice has now been installed in ${OO_PREFIX}.
+  OpenOffice.org has now been installed in ${OO_PREFIX}.
 
   Before using this package for the first time, each user has to run
   a setup program, which is automatically invoked at the first start.
   Thereafter, OpenOffice can be started using the
   ${DESTDIR}${PREFIX}/bin/soffice command.
+
+  And the files of platform dependent extensions have been installed in
+  ${OO_PREFIX}/extensions.
+
+  How to install/uninstall the extensions:
+
+    For all users (run by root):
+      ${DESTDIR}${PREFIX}/bin/unopkg add --shared /path/to/extension.oxt
+      ${DESTDIR}${PREFIX}/bin/unopkg remove --shared extension.oxt
+
+    Per user:
+      Run the above commands without `--shared' or use Extension Manager.
+
 ===========================================================================
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 7ad55583f35..2b9431b78f1 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/10/23 09:18:12 hira Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/24 11:35:28 hira Exp $
 #
 
 OO_VER=			3.0.0
-PKGREVISION=		3
+PKGREVISION=		4
 OO_TAG=			OOO300_m9
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice3-${OO_VER}
@@ -14,7 +14,7 @@ DISTFILES=		OOo_${OO_VER}_src_core.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_binfilter.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_l10n.tar.bz2
 DISTFILES+=		OOo_${OO_VER}_src_system.tar.bz2
-#DISTFILES+=		OOo_${OO_VER}_src_extensions.tar.bz2
+DISTFILES+=		OOo_${OO_VER}_src_extensions.tar.bz2
 
 MAINTAINER=		hira@NetBSD.org
 HOMEPAGE=		http://www.openoffice.org/
@@ -106,12 +106,12 @@ CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-dynamic-xinerama
 
 # Extensions
-#CONFIGURE_ARGS+=	--enable-minimizer
-#CONFIGURE_ARGS+=	--enable-presenter-console
-#CONFIGURE_ARGS+=	--enable-pdfimport
-#CONFIGURE_ARGS+=	--enable-wiki-publisher
-#CONFIGURE_ARGS+=	--enable-ogltrans
-#CONFIGURE_ARGS+=	--enable-report-builder
+CONFIGURE_ARGS+=	--enable-minimizer
+CONFIGURE_ARGS+=	--enable-presenter-console
+CONFIGURE_ARGS+=	--enable-pdfimport
+OO_EXTENSIONS+=		minimizer/sun-presentation-minimizer.oxt
+OO_EXTENSIONS+=		pdfimport/pdfimport.oxt
+OO_EXTENSIONS+=		presenter/presenter-screen.oxt
 
 # `portable' supports all platforms.
 CONFIGURE_ARGS+=	--enable-epm --with-package-format=portable
@@ -132,7 +132,8 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 PLIST_SRC+=		${WRKDIR}/PLIST
 MESSAGE_SUBST+=		DESTDIR=${DESTDIR}
 MESSAGE_SUBST+=		OO_PREFIX=${OO_PREFIX}
-INSTALLATION_DIRS=	bin lib/${OO_RELEASE} share/applications
+INSTALLATION_DIRS=	bin lib/${OO_RELEASE} share/applications	\
+			lib/${OO_RELEASE}/extensions
 
 OO_UNXNAME=	openoffice.org3
 OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
@@ -176,6 +177,8 @@ do-install:
 		ln -sf ${OO_PREFIX}/${OO_UNXNAME}/program/$$f	\
 			${DESTDIR}${PREFIX}/bin/$$f;		\
 	done
+	cd ${WRKDIR}/${OO_TAG}/solver/300/${OPENOFFICE_OUTPATH}.pro/bin &&  \
+	${INSTALL_DATA}	${OO_EXTENSIONS} ${OO_PREFIX}/extensions
 	${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin	\
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 56a1833cbf4..f1e46e2fe45 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/10/23 09:18:12 hira Exp $
+$NetBSD: distinfo,v 1.11 2008/10/24 11:35:28 hira Exp $
 
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
@@ -6,6 +6,9 @@ Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d
 Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes
+SHA1 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f
+RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b
+Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes
 SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97
 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13
 Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes
@@ -79,3 +82,4 @@ SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
 SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
 SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247
 SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604
+SHA1 (patch-ee) = 6a77e56645484367a96660e7f9a3ac402bad9f2a
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 21a553f988a..4a46f7f2207 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2008/10/20 23:03:25 hira Exp $
+# $NetBSD: options.mk,v 1.9 2008/10/24 11:35:28 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 java kde ooo-external-libwpd
@@ -90,7 +90,10 @@ CONFIGURE_ARGS+=	--disable-gtk
 .if !empty(PKG_OPTIONS:Mjava)
 USE_JAVA2=		yes
 DEPENDS+=		apache-ant>=1.7.0:../../devel/apache-ant
-CONFIGURE_ARGS+=	--with-java --disable-mediawiki
+CONFIGURE_ARGS+=	--with-java
+# Extensions (MI)
+#CONFIGURE_ARGS+=	--enable-report-builder
+#CONFIGURE_ARGS+=	--enable-wiki-publisher
 
 JAVA_LIB_ROOT=	${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
 LIB.jawt=	-L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
diff --git a/misc/openoffice3/patches/patch-ee b/misc/openoffice3/patches/patch-ee
new file mode 100644
index 00000000000..9beed58ba96
--- /dev/null
+++ b/misc/openoffice3/patches/patch-ee
@@ -0,0 +1,24 @@
+$NetBSD: patch-ee,v 1.1 2008/10/24 11:35:28 hira Exp $
+
+--- desktop/source/deployment/misc/dp_platform.cxx.orig	2008-10-24 00:09:00.000000000 +0900
++++ desktop/source/deployment/misc/dp_platform.cxx	2008-10-24 00:33:34.000000000 +0900
+@@ -61,6 +61,8 @@
+ #define PLATFORM_SOLARIS_X86        "solaris_x86"
+ #define PLATFORM_FREEBSD_X86        "freebsd_x86"
+ #define PLATFORM_FREEBSD_X86_64     "freebsd_x86_64"
++#define PLATFORM_NETBSD_X86         "netbsd_x86"
++#define PLATFORM_NETBSD_X86_64      "netbsd_x86_64"
+ #define PLATFORM_MACOSX_X86         "macosx_x86"
+ #define PLATFORM_MACOSX_PPC         "macosx_powerpc"
+ #define PLATFORM_OS2_X86            "os/2_x86"
+@@ -158,6 +160,10 @@
+             ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
+         else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
+             ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64"));
++        else if (token.equals(OUSTR(PLATFORM_NETBSD_X86)))
++            ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("x86"));
++        else if (token.equals(OUSTR(PLATFORM_NETBSD_X86_64)))
++            ret = checkOSandCPU(OUSTR("NetBSD"), OUSTR("X86_64"));
+         else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
+             ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
+         else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))