pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/openoffice2 remove firefox3 option and add xulrun...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a5886aac2f5e
branches: trunk
changeset: 398873:a5886aac2f5e
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Sep 10 00:27:08 2009 +0000
description:
remove firefox3 option and add xulrunner option instead ...
... but leave it commented out because of build problems.
I suppose this package is going away soon anyway(?)
diffstat:
misc/openoffice2/Makefile | 4 +-
misc/openoffice2/distinfo | 5 +-
misc/openoffice2/options.mk | 27 +++-----------
misc/openoffice2/patches/patch-ba | 74 ++++++++++++++++++++++++--------------
misc/openoffice2/patches/patch-ec | 13 ------
5 files changed, 57 insertions(+), 66 deletions(-)
diffs (293 lines):
diff -r 1741a62ab647 -r a5886aac2f5e misc/openoffice2/Makefile
--- a/misc/openoffice2/Makefile Thu Sep 10 00:22:34 2009 +0000
+++ b/misc/openoffice2/Makefile Thu Sep 10 00:27:08 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.72 2009/08/26 19:58:03 sno Exp $
+# $NetBSD: Makefile,v 1.73 2009/09/10 00:27:08 tnn Exp $
#
OO_VER= 2.4.2
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 11
+PKGREVISION= 12
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
diff -r 1741a62ab647 -r a5886aac2f5e misc/openoffice2/distinfo
--- a/misc/openoffice2/distinfo Thu Sep 10 00:22:34 2009 +0000
+++ b/misc/openoffice2/distinfo Thu Sep 10 00:27:08 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2009/02/12 09:17:51 hira Exp $
+$NetBSD: distinfo,v 1.54 2009/09/10 00:27:08 tnn Exp $
SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
@@ -26,7 +26,7 @@
SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 1cc6fcc5ae1964bab7bf0be281ecc33297aba1c6
+SHA1 (patch-ba) = 86d4f2fa8554ba69cb026197543494750ef8add7
SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
@@ -68,7 +68,6 @@
SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
-SHA1 (patch-ec) = 05f45563ab1f27984e81945a4ea2ddd9e40b16ac
SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
SHA1 (patch-eg) = 0c6119bd2a91c91ab71348558b8c75224ffa90dc
diff -r 1741a62ab647 -r a5886aac2f5e misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk Thu Sep 10 00:22:34 2009 +0000
+++ b/misc/openoffice2/options.mk Thu Sep 10 00:27:08 2009 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: options.mk,v 1.25 2009/08/05 01:35:42 tnn Exp $
+# $NetBSD: options.mk,v 1.26 2009/09/10 00:27:08 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd
-PKG_OPTIONS_OPTIONAL_GROUPS= browser
-PKG_OPTIONS_GROUP.browser= firefox3 seamonkey
+PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd # xulrunner
# The list from completelangiso in solenv/inc/postset.mk.
OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
cs cy da de dz el en-GB en-US en-ZA eo es et \
@@ -16,7 +14,7 @@
.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
PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome
.include "../../mk/bsd.options.mk"
@@ -36,26 +34,13 @@
OO_BASELANG?= en-US
OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
-.if !empty(PKG_OPTIONS:Mfirefox3)
-CONFIGURE_ARGS+= --with-system-mozilla=firefox3
-.include "../../www/firefox3/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mseamonkey)
-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"
.else
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 -r 1741a62ab647 -r a5886aac2f5e misc/openoffice2/patches/patch-ba
--- a/misc/openoffice2/patches/patch-ba Thu Sep 10 00:22:34 2009 +0000
+++ b/misc/openoffice2/patches/patch-ba Thu Sep 10 00:27:08 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.14 2008/10/31 11:02:55 hira Exp $
+$NetBSD: patch-ba,v 1.15 2009/09/10 00:27:08 tnn Exp $
---- config_office/configure.orig 2008-05-21 01:28:55.000000000 +0900
-+++ config_office/configure 2008-10-31 19:19:14.000000000 +0900
-@@ -3176,11 +3176,11 @@
+--- config_office/configure.orig 2008-05-20 18:28:55.000000000 +0200
++++ config_office/configure
+@@ -3176,11 +3176,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
test_cups=no
_os=OSF1
;;
@@ -16,7 +16,7 @@
PTHREAD_CFLAGS="-pthread"
PTHREAD_LIBS="-pthread -lpthread"
_os=NetBSD
-@@ -10304,7 +10304,7 @@
+@@ -10304,7 +10304,7 @@ echo "$as_me: error: $_javadoc_path not
fi
if test "$SOLAR_JAVA" != ""; then
@@ -25,7 +25,7 @@
if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
cat > findhome.java <<_ACEOF
import java.io.File;
-@@ -10404,7 +10404,7 @@
+@@ -10404,7 +10404,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 @@
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
-@@ -13098,7 +13098,7 @@
+@@ -13098,7 +13098,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 @@
# 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
-@@ -13108,7 +13108,7 @@
+@@ -13108,7 +13108,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 @@
# 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
-@@ -13591,13 +13591,14 @@
+@@ -13591,13 +13591,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 @@
fi
save_CPPFLAGS="$CPPFLAGS"
-@@ -13868,7 +13869,7 @@
+@@ -13868,7 +13869,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 @@
else
CFLAGS=-I/usr/include/db4
-@@ -13991,13 +13992,13 @@
+@@ -13991,13 +13992,13 @@ echo "${ECHO_T}no. you need at least db
#AC_CHECK_LIB(db, db_create, [],
# [AC_MSG_ERROR([db library not installed or functional])], [])
@@ -94,7 +94,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14054,7 +14055,7 @@
+@@ -14054,7 +14055,7 @@ if test $ac_cv_lib_db_main = yes; then
#define HAVE_LIBDB 1
_ACEOF
@@ -103,16 +103,36 @@
else
{ { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -15695,6 +15696,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
-@@ -19718,7 +19721,7 @@
+@@ -15758,23 +15759,23 @@ fi
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
+-echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for libxul" >&5
++echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom " ; then
++ if $PKG_CONFIG --exists libxul; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
+ echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
+- MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom "`
++ MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags libxul`
+ echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
+ echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
+ echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
+- MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom "`
++ MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs libxul`
+ echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
+ echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
+ else
+@@ -19718,7 +19719,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
if test $ac_cv_header_audio_audiolib_h = yes; then
@@ -121,7 +141,7 @@
else
CFLAGS=-I/usr/X11R6/include
-@@ -20526,7 +20529,7 @@
+@@ -20526,7 +20527,7 @@ echo "${ECHO_T}internal" >&6
NEON_CFLAGS=
BUILD_TYPE="$BUILD_TYPE NEON"
fi
@@ -130,7 +150,7 @@
with_system_openssl=yes
fi
echo "$as_me:$LINENO: checking which libssl to use" >&5
-@@ -20537,7 +20540,7 @@
+@@ -20537,7 +20538,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 +159,7 @@
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
-@@ -23949,7 +23952,7 @@
+@@ -23949,7 +23950,7 @@ echo "${ECHO_T}yes" >&6
ENABLE_REPORTDESIGN=YES
echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
@@ -148,7 +168,7 @@
SYSTEM_JFREEREPORT=YES
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
-@@ -24466,7 +24469,7 @@
+@@ -24466,7 +24467,7 @@ your KDE installation by exporting KDEDI
fi
KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -157,7 +177,7 @@
fi
-@@ -25019,7 +25022,7 @@
+@@ -25019,7 +25020,7 @@ if test "$_os" = "Darwin"; then
XINERAMA_LINK=dynamic
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
diff -r 1741a62ab647 -r a5886aac2f5e misc/openoffice2/patches/patch-ec
--- a/misc/openoffice2/patches/patch-ec Thu Sep 10 00:22:34 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2008/10/31 11:02:55 hira Exp $
-
---- shell/source/unix/misc/open-url.sh.orig 2008-10-31 10:47:30.000000000 +0900
-+++ shell/source/unix/misc/open-url.sh 2008-10-31 10:47:42.000000000 +0900
-@@ -118,7 +118,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"
Home |
Main Index |
Thread Index |
Old Index