Remove the firefox3 option and replace it with a xulrunner option.

Bump PKGREVISION.

5 files changed, 48 insertions, 71 deletions

diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index 419725810da..6099361d0d9 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2009/08/29 09:48:54 hira Exp $
+# $NetBSD: Makefile,v 1.38 2009/09/10 00:14:55 tnn Exp $
 #
 
 OO_VER=			3.1.1
 OO_TAG=			OOO310_m19
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice3-${OO_VER}
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 16da79f9558..283e701e64c 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2009/08/29 09:48:54 hira Exp $
+$NetBSD: distinfo,v 1.23 2009/09/10 00:14:55 tnn Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -29,7 +29,7 @@ SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = c8a532c2b8a4dd676f09aba8d42677349f58c0a9
 SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511
-SHA1 (patch-ba) = 1f006516f7773407206a54001ef43f46db743646
+SHA1 (patch-ba) = 8379e5fd3be80eda480911017a4091b9190251ea
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bd) = 8faf878760e476ed13a4506f0615f8b544a2abd4
 SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
@@ -79,7 +79,6 @@ SHA1 (patch-dy) = 517a3b55418daf6639c7b42d157347efff38cfbc
 SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
 SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
 SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
-SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247
 SHA1 (patch-ee) = fb6711c4c4ab53b6c213feed13883af7ffde1a16
 SHA1 (patch-ef) = e53a75d497bc661467ca19fd0d00fa6dac17579d
 SHA1 (patch-eg) = 970dae007766bea5c76c2312cfa7b35d44d3cb70
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index edb53f05a69..59d6d543ce7 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,10 +1,8 @@
-# $NetBSD: options.mk,v 1.16 2009/08/05 01:35:42 tnn Exp $
+# $NetBSD: options.mk,v 1.17 2009/09/10 00:14:55 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
-PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde ooo-external-libwpd
-PKG_OPTIONS_OPTIONAL_GROUPS=	browser
-PKG_OPTIONS_GROUP.browser=	firefox3 seamonkey
+PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde ooo-external-libwpd xulrunner
 # The list from completelangiso in solenv/inc/postset.mk.
 OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
 				by ca cs cy da de dgo dz el en-GB en-US en-ZA \
@@ -18,7 +16,7 @@ OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
 .for l in ${OO_SUPPORTED_LANGUAGES}
 PKG_SUPPORTED_OPTIONS+=		lang-${l}
 .endfor
-PKG_SUGGESTED_OPTIONS=		firefox3 gtk2 lang-en-US
+PKG_SUGGESTED_OPTIONS=		gtk2 lang-en-US xulrunner
 PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
@@ -42,29 +40,30 @@ OO_LANGS?=	en-US
 OO_BASELANG?=	en-US
 OO_LANGPACKS?=	${OO_LANGS:S/${OO_BASELANG}//1}
 
-.if !empty(PKG_OPTIONS:Mfirefox3)
-MOZ_FLAVOUR=		firefox3
-CONFIGURE_ARGS+=	--with-system-mozilla=firefox3
-.include "../../www/firefox3/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mseamonkey)
-MOZ_FLAVOUR=		seamonkey
-CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
-.include "../../www/seamonkey/buildlink3.mk"
-# The following browsers do not install *.pc files.
-#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1)
-#CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
-#.include "../../www/seamonkey-gtk1/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mxulrunner)
+CONFIGURE_ARGS+=	--with-system-mozilla=mozilla
+.include "../../devel/xulrunner/buildlink3.mk"
+#
+# OOo ships headers that are too old and conflict with xulrunner headers.
+# Instead of patching everything to include external headers, we just
+# Update what they have in the tree to match our xulrunner package.
+#
+.PHONY: copy-mozilla-headers
+post-wrapper:	copy-mozilla-headers
+copy-mozilla-headers:
+	cp \
+	  ${BUILDLINK_DIR}/include/xulrunner/stable/npapi.h \
+	  ${BUILDLINK_DIR}/include/xulrunner/stable/nptypes.h \
+	  ${WRKSRC}/np_sdk/mozsrc
+	  echo "typedef int16_t int16;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
+	  echo "typedef uint16_t uint16;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
+	  echo "typedef int32_t int32;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
+	  echo "typedef uint32_t uint32;" >> ${WRKSRC}/np_sdk/mozsrc/nptypes.h
+
 .else
-MOZ_FLAVOUR=
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
 
-SUBST_CLASSES+=		browser
-SUBST_STAGE.browser=	post-patch
-SUBST_MESSAGE.browser=	Adding MOZ_FLAVOUR
-SUBST_FILES.browser=	shell/source/unix/misc/open-url.sh
-SUBST_SED.browser+=	-e 's,@MOZ_FLAVOUR@,${MOZ_FLAVOUR},g'
-
 .if !empty(PKG_OPTIONS:Mooo-external-libwpd)
 CONFIGURE_ARGS+=	--with-system-libwpd
 .include "../../converters/libwpd/buildlink3.mk"
diff --git a/misc/openoffice3/patches/patch-ba b/misc/openoffice3/patches/patch-ba
index 17e9041d513..bb156931c19 100644
--- a/misc/openoffice3/patches/patch-ba
+++ b/misc/openoffice3/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
+$NetBSD: patch-ba,v 1.5 2009/09/10 00:14:55 tnn Exp $
 
---- configure.orig	2009-04-22 23:54:40.000000000 +0900
-+++ configure	2009-05-09 12:42:15.000000000 +0900
-@@ -4222,11 +4222,11 @@
+--- configure.orig	2009-04-22 16:54:40.000000000 +0200
++++ configure
+@@ -4222,11 +4222,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6; }
          test_randr=no
  		_os=OSF1
  		;;
@@ -16,7 +16,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
          test_randr=yes
  		test_freetype=yes
  		PTHREAD_CFLAGS="-pthread"
-@@ -11414,7 +11414,7 @@
+@@ -11414,7 +11414,7 @@ echo "$as_me: error: $_javadoc_path not 
  fi
  
  if test "$SOLAR_JAVA" != ""; then
@@ -25,7 +25,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
        if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
          cat > findhome.java <<_ACEOF
  import java.io.File;
-@@ -11515,7 +11515,7 @@
+@@ -11515,7 +11515,7 @@ echo "$as_me: WARNING: in case JAVA_HOME
           echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
           echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
           echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
@@ -34,7 +34,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
  #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
  #         fi
        fi
-@@ -14196,7 +14196,7 @@
+@@ -14196,7 +14196,7 @@ fi
  if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
     test "$with_system_libxslt" != "no"; then
      if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
@@ -43,7 +43,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
        # somehow AC_MSG_WARN won't work...
         echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
         echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-@@ -14206,7 +14206,7 @@
+@@ -14206,7 +14206,7 @@ fi
  if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
     test "$with_system_libxml" != "no"; then
      if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
@@ -52,7 +52,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
        # somehow AC_MSG_WARN won't work...
         echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
         echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-@@ -14728,13 +14728,14 @@
+@@ -14728,13 +14728,14 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
  
  
     python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
@@ -68,7 +68,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
     fi
  
        save_CPPFLAGS="$CPPFLAGS"
-@@ -14991,7 +14992,7 @@
+@@ -14991,7 +14992,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
  echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
  if test $ac_cv_header_db_h = yes; then
@@ -77,7 +77,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
  else
  
               CFLAGS=-I/usr/include/db4
-@@ -15122,13 +15123,13 @@
+@@ -15122,13 +15123,13 @@ echo "$as_me: error: no. you need at lea
      #AC_CHECK_LIB(db, db_create, [],
      #  [AC_MSG_ERROR([db library not installed or functional])], [])
  
@@ -94,7 +94,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15182,7 +15183,7 @@
+@@ -15182,7 +15183,7 @@ if test $ac_cv_lib_db_main = yes; then
  #define HAVE_LIBDB 1
  _ACEOF
  
@@ -103,16 +103,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
  
  else
    { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -16734,6 +16735,8 @@
-       MOZ_FLAVOUR=seamonkey
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
-       MOZ_FLAVOUR=firefox
-+    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox3"; then
-+      MOZ_FLAVOUR=firefox3
-     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
-       MOZ_FLAVOUR=mozilla
-     else
-@@ -17470,7 +17473,7 @@
+@@ -17470,7 +17471,7 @@ Please recompile $tmp with --enable-ldap
  
      #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
      #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
@@ -121,7 +112,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
          MOZ_FLAVOUR="mozilla"
      fi
  
-@@ -21353,7 +21356,7 @@
+@@ -21353,7 +21354,7 @@ echo "${ECHO_T}internal" >&6; }
      NEON_CFLAGS=
      BUILD_TYPE="$BUILD_TYPE NEON"
  fi
@@ -130,7 +121,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
     with_system_openssl=yes
  fi
  { echo "$as_me:$LINENO: checking which libssl to use" >&5
-@@ -21364,7 +21367,7 @@
+@@ -21364,7 +21365,7 @@ if test -n "$with_system_openssl" -o -n 
  echo "${ECHO_T}external" >&6; }
      # Mac OS builds should get out without extra stuff is the Mac porters'
      # wish. And pkg-config is although Xcode ships a .pc for openssl
@@ -139,7 +130,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
          OPENSSL_CFLAGS=
          OPENSSL_LIBS="-lssl -lcrypto"
      else
-@@ -25460,7 +25463,7 @@
+@@ -25460,7 +25461,7 @@ echo "${ECHO_T}no" >&6; }
  fi
  
  
@@ -148,7 +139,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
    { echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5
  echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6; }
    if test -n "$with_system_servlet_api"; then
-@@ -25525,7 +25528,7 @@
+@@ -25525,7 +25526,7 @@ echo "$as_me: error: not existing. get i
    fi
    { echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
  echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; }
@@ -157,7 +148,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
     	SYSTEM_JFREEREPORT=YES
    	   { echo "$as_me:$LINENO: result: external" >&5
  echo "${ECHO_T}external" >&6; }
-@@ -26733,7 +26736,7 @@
+@@ -26733,7 +26734,7 @@ your KDE installation by exporting KDEDI
      fi
  
          KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -166,7 +157,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
  fi
  
  
-@@ -27269,7 +27272,7 @@
+@@ -27269,7 +27270,7 @@ if test "$_os" = "Darwin"; then
     XINERAMA_LINK=dynamic
     { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
@@ -175,7 +166,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
     if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
        # we have both versions, let the user decide but use the dynamic one
        # per default
-@@ -27754,9 +27757,13 @@
+@@ -27754,9 +27755,13 @@ echo $ECHO_N "checking Ant lib directory
                  if test -f $ANT_HOME/lib/ant/ant.jar; then
                      ANT_LIB="$ANT_HOME/lib/ant"
                  else
@@ -189,7 +180,7 @@ $NetBSD: patch-ba,v 1.4 2009/05/09 18:43:41 hira Exp $
                  fi
               fi
            fi
-@@ -27964,12 +27971,12 @@
+@@ -27964,12 +27969,12 @@ fi
  { echo "$as_me:$LINENO: checking build verbosity" >&5
  echo $ECHO_N "checking build verbosity... $ECHO_C" >&6; }
  if test -n "$enable_verbose"; then
diff --git a/misc/openoffice3/patches/patch-ec b/misc/openoffice3/patches/patch-ec
deleted file mode 100644
index bd0367c3127..00000000000
--- a/misc/openoffice3/patches/patch-ec
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2008/10/20 23:03:25 hira Exp $
-
---- shell/source/unix/misc/open-url.sh.orig	2008-10-21 07:41:00.000000000 +0900
-+++ shell/source/unix/misc/open-url.sh	2008-10-21 07:41:22.000000000 +0900
-@@ -69,7 +69,7 @@
-     exit 0
-   else
-     # mozilla derivates may need -remote semantics
--    for i in firefox mozilla netscape; do
-+    for i in @MOZ_FLAVOUR@ firefox mozilla netscape; do
-       browser=`which $i`
-       if [ ! -z "$browser" ]; then
-         run_mozilla "$browser" "$1"