summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2007-03-12 10:21:18 +0000
committerhira <hira@pkgsrc.org>2007-03-12 10:21:18 +0000
commite30dd185d3ee1e738835edd71d1dbaa94d228154 (patch)
tree16b226adfbd62e7c3e89d20e5a6a3f3e4a660f4f /misc
parent26023e3a68955dafeb597af76a355ba4b90ab28b (diff)
downloadpkgsrc-e30dd185d3ee1e738835edd71d1dbaa94d228154.tar.gz
- Use bash instead of tcsh for build.
- Change option name gnome-vfs -> gnome. - Add ${SETENV} ${MAKE_ENV} to do-build (pointed out by joerg@). - Add --with-system-freetype and --enable-cairo. - Add --enable-evolution2 with gnome option. - Fix typo in patch-aa. Bump PKGREVISION.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice2/Makefile14
-rw-r--r--misc/openoffice2/distinfo4
-rw-r--r--misc/openoffice2/options.mk16
-rw-r--r--misc/openoffice2/patches/patch-aa53
4 files changed, 44 insertions, 43 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index aa475e66539..4cf3441dcba 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2007/03/04 13:19:25 hira Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/12 10:21:18 hira Exp $
#
OO_VER= 2.1.0
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
@@ -23,7 +23,6 @@ HOMEPAGE= http://www.openoffice.org/
COMMENT= Integrated office productivity suite (version 2)
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
@@ -39,7 +38,7 @@ GCC_REQD+= 3.0
USE_PKGSRC_GCC= YES
.endif
-USE_TOOLS+= gmake imake perl pkg-config tar
+USE_TOOLS+= bash gmake imake perl pkg-config tar
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
@@ -52,14 +51,17 @@ CONFLICTS+= openoffice-linux-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-use-shell=bash
CONFIGURE_ARGS+= --enable-binfilter
+CONFIGURE_ARGS+= --enable-cairo
CONFIGURE_ARGS+= --disable-ldap
+CONFIGURE_ARGS+= --with-system-freetype
# `portable' supports all platforms.
CONFIGURE_ARGS+= --enable-epm --with-package-format=portable
# XXX: Error in OOo internal libsndfile.
-CONFIGURE_ARGS+= --disable-pasf
+CONFIGURE_ARGS+= --disable-pasf --without-nas
# Disable Java.
CONFIGURE_ARGS+= --without-java --disable-odk --disable-gcjaot
@@ -92,7 +94,7 @@ post-extract:
${WRKSRC}/bridges/inc/bridges/cpp_uno/
do-build:
- ${_ULIMIT_CMD} tcsh -c "setenv PTHREAD_DIAGASSERT Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set && dmake build_all"
+ ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "export PTHREAD_DIAGASSERT=Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
post-build:
cd ${WRKDIR} && \
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 6fa0aa2e6d4..64711eab6e8 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/03/04 13:11:18 hira Exp $
+$NetBSD: distinfo,v 1.6 2007/03/12 10:21:18 hira Exp $
SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc
RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a
@@ -15,7 +15,7 @@ Size (openoffice-2.1.0/OOo_2.1.0_src_system.tar.bz2) = 29761970 bytes
SHA1 (openoffice-2.1.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
RMD160 (openoffice-2.1.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
Size (openoffice-2.1.0/bridge.h) = 6734 bytes
-SHA1 (patch-aa) = bafba12d0421c5119cdf7122e8430af93dd41dac
+SHA1 (patch-aa) = 352774b0e509f41787573594b8f8f8bbe72d6824
SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c
SHA1 (patch-ae) = eec39a887ad19d3a8ff0a26fab7ea6981915eadd
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 8921ba819b0..b56b3ff2cf0 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2007/03/01 16:13:21 hira Exp $
+# $NetBSD: options.mk,v 1.6 2007/03/12 10:21:20 hira Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS= cups gnome-vfs2 gtk2 # kde
+PKG_SUPPORTED_OPTIONS= cups gnome gtk2 # kde
PKG_OPTIONS_REQUIRED_GROUPS= browser lang
PKG_OPTIONS_GROUP.browser= firefox firefox-gtk1 seamonkey seamonkey-gtk1
OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs cy da de \
@@ -15,6 +15,7 @@ OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs cy da de \
PKG_OPTIONS_GROUP.lang+= lang-${l}
.endfor
PKG_SUGGESTED_OPTIONS= gtk2 lang-en-US firefox
+PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome
.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.prefs.mk"
@@ -41,7 +42,6 @@ CONFIGURE_ARGS+= --with-system-mozilla
CONFIGURE_ARGS+= --with-system-mozilla
.endif
-# Not tested.
.if !empty(PKG_OPTIONS:Mcups)
.include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
@@ -49,13 +49,13 @@ CONFIGURE_ARGS+= --enable-cups
CONFIGURE_ARGS+= --disable-cups
.endif
-.if !empty(PKG_OPTIONS:Mgnome-vfs2)
+.if !empty(PKG_OPTIONS:Mgnome)
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gnome-vfs
+CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2
.else
-CONFIGURE_ARGS+= --disable-gnome-vfs
+CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2
.endif
.if !empty(PKG_OPTIONS:Mgtk2)
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --disable-gtk
# XXX: Not yet.
.if !empty(PKG_OPTIONS:Mkde)
.include "../../x11/kdelibs3/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-kde
+CONFIGURE_ARGS+= --enable-kde --enable-kdeab
.else
-CONFIGURE_ARGS+= --disable-kde
+CONFIGURE_ARGS+= --disable-kde --disable-kdeab
.endif
diff --git a/misc/openoffice2/patches/patch-aa b/misc/openoffice2/patches/patch-aa
index 0903d210c6a..adc5058b2ac 100644
--- a/misc/openoffice2/patches/patch-aa
+++ b/misc/openoffice2/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+$NetBSD: patch-aa,v 1.3 2007/03/12 10:21:20 hira Exp $
---- sal/util/sal_netbsd.map.orig 2007-02-18 01:17:57.000000000 +0900
-+++ sal/util/sal_netbsd.map 2007-02-18 01:46:52.000000000 +0900
-@@ -0,0 +1,569 @@
+--- sal/util/sal_netbsd.map.orig 2007-03-10 18:12:29.000000000 +0900
++++ sal/util/sal_netbsd.map 2007-03-10 18:24:52.000000000 +0900
+@@ -0,0 +1,568 @@
+UDK_3_0_0 {
+ global:
-+ GerVersionInfo;
++ GetVersionInfo;
+ osl_acceptConnectionOnSocket;
+ osl_acceptPipe;
+ osl_acquireSocket;
@@ -68,7 +68,6 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ osl_getFamilyOfSocketAddr;
+ osl_getFileStatus;
+ osl_getFileURLFromSystemPath;
-+ osl_getFunctionSymbol;
+ osl_getGlobalMutex;
+ osl_getHomeDir;
+ osl_getHostnameOfHostAddr;
@@ -145,7 +144,6 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ osl_sendPipe;
+ osl_sendSocket;
+ osl_sendToSocket;
-+ osl_setCommandArgs;
+ osl_setCondition;
+ osl_setFileAttributes;
+ osl_setFileTime;
@@ -257,7 +255,6 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ rtl_stringbuffer_insert;
+ rtl_stringbuffer_newFromStr_WithLength;
+ rtl_stringbuffer_newFromStringBuffer;
-+ rtl_ustr_asciil_reverseEquals_WithLength;
+ rtl_ustr_compare;
+ rtl_ustr_compare_WithLength;
+ rtl_ustr_shortenedCompare_WithLength;
@@ -494,12 +491,12 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ rtl_tres_destroy;
+ osl_getProcessLocale;
+ osl_setProcessLocale;
-+ getpwnam_r;
-+ getpwuid_r;
-+ localtime_r;
-+ gmtime_r;
-+ gethostbyname_r;
-+ readdir_r;
++ getpwnam_r;
++ getpwuid_r;
++ localtime_r;
++ gmtime_r;
++ gethostbyname_r;
++ readdir_r;
+ local:
+ *;
+};
@@ -508,7 +505,7 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ global:
+ osl_getTempDirURL;
+ osl_createTempFile;
-+
++
+ rtl_math_doubleToString;
+ rtl_math_doubleToUString;
+ rtl_math_pow10Exp;
@@ -520,13 +517,14 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ osl_joinProcessWithTimeout;
+
+ rtl_getTextEncodingFromWindowsCodePage;
-+ rtl_getWindowsCodePageFromTextEncoding;
++ rtl_getWindowsCodePageFromTextEncoding;
+} UDK_3_0_0;
+
+UDK_3.2 {
+ global:
-+ osl_syncFile;
++ osl_syncFile;
+} UDK_3.1;
++
+UDK_3.3 {
+ global:
+ osl_createDirectoryPath;
@@ -543,25 +541,25 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ rtl_uStringbuffer_insertUtf32;
+ rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths;
+ rtl_logfile_longTrace;
-+ rtl_ustr_asciil_reverseEquals_WithLength;
++ rtl_ustr_asciil_reverseEquals_WithLength;
+} UDK_3.2;
+
+UDK_3.4 {
+ global:
-+ osl_setErrorReporting;
++ osl_setErrorReporting;
+} UDK_3.3;
+
+UDK_3.5 {
+ global:
-+ rtl_arena_create;
-+ rtl_arena_destroy;
-+ rtl_arena_alloc;
-+ rtl_arena_free;
++ rtl_arena_create;
++ rtl_arena_destroy;
++ rtl_arena_alloc;
++ rtl_arena_free;
+
-+ rtl_cache_create;
-+ rtl_cache_destroy;
-+ rtl_cache_alloc;
-+ rtl_cache_free;
++ rtl_cache_create;
++ rtl_cache_destroy;
++ rtl_cache_alloc;
++ rtl_cache_free;
+} UDK_3.4;
+
+PRIVATE_1.0 {
@@ -572,3 +570,4 @@ $NetBSD: patch-aa,v 1.2 2007/03/04 13:11:18 hira Exp $
+ osl_detail_ObjectRegistry_revokeObject;
+ osl_detail_ObjectRegistry_getMutex;
+};
++