pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice-linux Update to version 1.1.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/55358f7a2664
branches:  trunk
changeset: 467025:55358f7a2664
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sun Jan 25 16:57:57 2004 +0000

description:
Update to version 1.1.0.
New features include:
* PDF, DocBook/XML, XHTML and Macromedia Flash (SWF) export
* Accessibility
* Support for Complex Text Layout (CTL)
* Macro Recorder
* Integrated Python-UNO bridge
* Locking of user installations against accesses from multiple machines
  with shared directories
* Support for recovering slightly damaged OpenOffice.org files

diffstat:

 misc/openoffice-linux/MESSAGE                  |     4 +-
 misc/openoffice-linux/Makefile                 |    50 +-
 misc/openoffice-linux/Makefile.NetBSD.i386     |     3 +-
 misc/openoffice-linux/PLIST                    |  7429 +++++++++++++----------
 misc/openoffice-linux/distinfo                 |     8 +-
 misc/openoffice-linux/files/oo_setup.resp      |     8 -
 misc/openoffice-linux/files/soffice            |     6 +-
 misc/openoffice-linux/files/soffice.test.patch |    12 -
 8 files changed, 4179 insertions(+), 3341 deletions(-)

diffs (truncated from 7606 to 300 lines):

diff -r 98b9aa0fcc52 -r 55358f7a2664 misc/openoffice-linux/MESSAGE
--- a/misc/openoffice-linux/MESSAGE     Sun Jan 25 16:57:48 2004 +0000
+++ b/misc/openoffice-linux/MESSAGE     Sun Jan 25 16:57:57 2004 +0000
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/05/06 17:42:00 jmmv Exp $
+$NetBSD: MESSAGE,v 1.5 2004/01/25 16:57:57 mrauch Exp $
 
-  OpenOffice has now been installed in ${PREFIX}/OpenOffice.org1.0.3.
+  OpenOffice has now been installed in ${PREFIX}/OpenOffice.org1.1.0.
 
   Before using this package for the first time, each user has to run
   a setup program, which is automatically invoked at the first start. 
diff -r 98b9aa0fcc52 -r 55358f7a2664 misc/openoffice-linux/Makefile
--- a/misc/openoffice-linux/Makefile    Sun Jan 25 16:57:48 2004 +0000
+++ b/misc/openoffice-linux/Makefile    Sun Jan 25 16:57:57 2004 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 22:09:56 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/25 16:57:57 mrauch Exp $
 
-DISTNAME=              OOo_1.0.3.1_LinuxIntel_install
-PKGNAME=               openoffice-linux-1.0.3.1
+DISTNAME=              OOo_1.1.0_LinuxIntel_install
+PKGNAME=               openoffice-linux-1.1.0
 CATEGORIES=            misc
-MASTER_SITES=          http://mirrors.isc.org/pub/openoffice/stable/1.0.3/ \
+MASTER_SITES=          http://mirrors.isc.org/pub/openoffice/stable/1.1.0/ \
                        http://www.fs.tum.de/~mrauch/OpenOffice/download/
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=            openoffice-linux-110-services.rdb.bz2
 
 MAINTAINER=            mrauch%NetBSD.org@localhost
 HOMEPAGE=              http://www.openoffice.org/
@@ -18,27 +20,14 @@
 ONLY_FOR_PLATFORM=     NetBSD-1.[6-9]*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=    Linux-*-i[3-6]86
 
-WRKSRC=                        ${WRKDIR}/install
 TEMP?=                 ${WRKSRC}
+CHECK_SHLIBS=          no
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_JVM?=      sun-jdk
 PLIST_SUBST+=  JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
 
-DISPLAY?=       # empty, if unset
-checkforx:
-.if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO"
-.  if exists(${X11BASE}/bin/Xvfb)
-       -${X11BASE}/bin/Xvfb :2 &
-DISPLAY= ':2'
-.  else
-       @${ECHO} "Error: Environment variable DISPLAY must be set"
-       @${ECHO} "       and point to a connectible X server."
-       @${FALSE}
-.  endif  #Xvfb
-.endif  #DISPLAY
-
 do-build:
 
 .if ${OPSYS} == "NetBSD"
@@ -46,27 +35,26 @@
 SUPPORT_FILES=          /dev/null /emul/linux/etc/mtab
 .endif
 
-pre-install: checkforx
-       ${SED}  -e "s|@@PREFIX@@|${PREFIX}|g"                           \
-               < ${FILESDIR}/oo_setup.resp > ${WRKSRC}/oo_setup.resp
+pre-install:
+       ${CP} ${WRKSRC}/setup.ins ${WRKSRC}/setup.ins.orig
+       ${SED}  -e "s|/usr/bin/soffice|${PREFIX}/bin/soffice.orig|g"    \
+               <${WRKSRC}/setup.ins.orig >${WRKSRC}/setup.ins
 .     if ${OPSYS}=="NetBSD" && !exists(/emul/linux/etc/mtab)
        ${CP} /dev/null /emul/linux/etc/mtab
 .     endif
 
 do-install:
-       -${SH} -c "cd ${WRKSRC};                                        \
-                 TEMP=${WRKSRC}; export TEMP;                          \
-                 DISPLAY=${DISPLAY}; export DISPLAY;                   \
-                 ./setup -r:oo_setup.resp"
-       @if [ ! -x ${PREFIX}/OpenOffice.org1.0.3/setup ]; then          \
-               ${ECHO} "Installation was not successful.";             \
-               ${FALSE};                                               \
-       fi
+       ${INSTALL_DATA_DIR} ${PREFIX}/OpenOffice.org1.1.0/program
+       ${INSTALL_DATA} ${WRKDIR}/openoffice-linux-110-services.rdb     \
+               ${PREFIX}/OpenOffice.org1.1.0/program/services.rdb
+       ${SH} -c "cd ${WRKSRC}; ./install --prefix=${PREFIX}"
+       ${RM} -f ${PREFIX}/bin/soffice.orig
        ${SED}  -e "s|@@PREFIX@@|${PREFIX}|g"                           \
                < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
        ${CHMOD} +x ${PREFIX}/bin/soffice
-       ${PATCH} ${PATCH_ARGS} ${PREFIX}/OpenOffice.org1.0.3/program/soffice \
-               < ${FILESDIR}/soffice.test.patch
+.for i in scalc sdraw simpress swriter
+       ${LN} -sf ${PREFIX}/OpenOffice.org1.1.0/program/$i ${PREFIX}/bin/$i
+.endfor
        ${LN} -sf ${PKG_JAVA_HOME} ${PKG_JAVA_HOME}/jre
 
 # everything specific to your OS/Arch goes into its own Makefile
diff -r 98b9aa0fcc52 -r 55358f7a2664 misc/openoffice-linux/Makefile.NetBSD.i386
--- a/misc/openoffice-linux/Makefile.NetBSD.i386        Sun Jan 25 16:57:48 2004 +0000
+++ b/misc/openoffice-linux/Makefile.NetBSD.i386        Sun Jan 25 16:57:57 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.4 2003/10/20 20:23:49 mrauch Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.5 2004/01/25 16:57:57 mrauch Exp $
 
 DEPENDS+=               suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=               suse_libc5>=7.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
 DEPENDS+=               suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 
 .if !exists(/emul/linux/proc/curproc/cmdline) && !exists(/proc/curproc/cmdline)
diff -r 98b9aa0fcc52 -r 55358f7a2664 misc/openoffice-linux/PLIST
--- a/misc/openoffice-linux/PLIST       Sun Jan 25 16:57:48 2004 +0000
+++ b/misc/openoffice-linux/PLIST       Sun Jan 25 16:57:57 2004 +0000
@@ -1,3282 +1,4151 @@
-@comment $NetBSD: PLIST,v 1.5 2003/04/26 15:44:16 mrauch Exp $
-OpenOffice.org1.0.3/LICENSE
-OpenOffice.org1.0.3/LICENSE.html
-OpenOffice.org1.0.3/README
-OpenOffice.org1.0.3/README.html
-OpenOffice.org1.0.3/help/en/common.jar
-OpenOffice.org1.0.3/help/en/custom.css
-OpenOffice.org1.0.3/help/en/err.html
-OpenOffice.org1.0.3/help/en/picture.db
-OpenOffice.org1.0.3/help/en/picture.jar
-OpenOffice.org1.0.3/help/en/sbasic.cfg
-OpenOffice.org1.0.3/help/en/sbasic.db
-OpenOffice.org1.0.3/help/en/sbasic.ht
-OpenOffice.org1.0.3/help/en/sbasic.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/sbasic.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/sbasic.idx/DOCS
-OpenOffice.org1.0.3/help/en/sbasic.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/sbasic.idx/EDGE
-OpenOffice.org1.0.3/help/en/sbasic.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/sbasic.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/sbasic.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/sbasic.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/sbasic.jar
-OpenOffice.org1.0.3/help/en/sbasic.key
-OpenOffice.org1.0.3/help/en/sbasic.tree
-OpenOffice.org1.0.3/help/en/scalc.cfg
-OpenOffice.org1.0.3/help/en/scalc.db
-OpenOffice.org1.0.3/help/en/scalc.ht
-OpenOffice.org1.0.3/help/en/scalc.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/scalc.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/scalc.idx/DOCS
-OpenOffice.org1.0.3/help/en/scalc.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/scalc.idx/EDGE
-OpenOffice.org1.0.3/help/en/scalc.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/scalc.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/scalc.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/scalc.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/scalc.jar
-OpenOffice.org1.0.3/help/en/scalc.key
-OpenOffice.org1.0.3/help/en/scalc.tree
-OpenOffice.org1.0.3/help/en/schart.jar
-OpenOffice.org1.0.3/help/en/sdraw.cfg
-OpenOffice.org1.0.3/help/en/sdraw.db
-OpenOffice.org1.0.3/help/en/sdraw.ht
-OpenOffice.org1.0.3/help/en/sdraw.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/sdraw.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/sdraw.idx/DOCS
-OpenOffice.org1.0.3/help/en/sdraw.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/sdraw.idx/EDGE
-OpenOffice.org1.0.3/help/en/sdraw.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/sdraw.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/sdraw.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/sdraw.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/sdraw.jar
-OpenOffice.org1.0.3/help/en/sdraw.key
-OpenOffice.org1.0.3/help/en/sdraw.tree
-OpenOffice.org1.0.3/help/en/simpress.cfg
-OpenOffice.org1.0.3/help/en/simpress.db
-OpenOffice.org1.0.3/help/en/simpress.ht
-OpenOffice.org1.0.3/help/en/simpress.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/simpress.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/simpress.idx/DOCS
-OpenOffice.org1.0.3/help/en/simpress.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/simpress.idx/EDGE
-OpenOffice.org1.0.3/help/en/simpress.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/simpress.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/simpress.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/simpress.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/simpress.jar
-OpenOffice.org1.0.3/help/en/simpress.key
-OpenOffice.org1.0.3/help/en/simpress.tree
-OpenOffice.org1.0.3/help/en/smath.cfg
-OpenOffice.org1.0.3/help/en/smath.db
-OpenOffice.org1.0.3/help/en/smath.ht
-OpenOffice.org1.0.3/help/en/smath.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/smath.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/smath.idx/DOCS
-OpenOffice.org1.0.3/help/en/smath.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/smath.idx/EDGE
-OpenOffice.org1.0.3/help/en/smath.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/smath.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/smath.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/smath.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/smath.jar
-OpenOffice.org1.0.3/help/en/smath.key
-OpenOffice.org1.0.3/help/en/smath.tree
-OpenOffice.org1.0.3/help/en/swriter.cfg
-OpenOffice.org1.0.3/help/en/swriter.db
-OpenOffice.org1.0.3/help/en/swriter.ht
-OpenOffice.org1.0.3/help/en/swriter.idx/CONTEXTS
-OpenOffice.org1.0.3/help/en/swriter.idx/DICTIONARY
-OpenOffice.org1.0.3/help/en/swriter.idx/DOCS
-OpenOffice.org1.0.3/help/en/swriter.idx/DOCS.TAB
-OpenOffice.org1.0.3/help/en/swriter.idx/EDGE
-OpenOffice.org1.0.3/help/en/swriter.idx/LINKNAMES
-OpenOffice.org1.0.3/help/en/swriter.idx/OFFSETS
-OpenOffice.org1.0.3/help/en/swriter.idx/POSITIONS
-OpenOffice.org1.0.3/help/en/swriter.idx/SCHEMA
-OpenOffice.org1.0.3/help/en/swriter.jar
-OpenOffice.org1.0.3/help/en/swriter.key
-OpenOffice.org1.0.3/help/en/swriter.tree
-OpenOffice.org1.0.3/help/main_transform.xsl
-OpenOffice.org1.0.3/program/addin/source/addin.h
-OpenOffice.org1.0.3/program/addin/source/dfa.hrc
-OpenOffice.org1.0.3/program/addin/source/rot13.hrc
-OpenOffice.org1.0.3/program/addin/source/xdfa.c
-OpenOffice.org1.0.3/program/addin/source/xlang.h
-OpenOffice.org1.0.3/program/addin/source/xrot.c
-OpenOffice.org1.0.3/program/allgemein_o.bmp
-OpenOffice.org1.0.3/program/applicat.rdb
-OpenOffice.org1.0.3/program/bootstraprc
-OpenOffice.org1.0.3/program/calc_o.bmp
-OpenOffice.org1.0.3/program/classes/classes.jar
-OpenOffice.org1.0.3/program/classes/db.jar
-OpenOffice.org1.0.3/program/classes/java_uno.jar
-OpenOffice.org1.0.3/program/classes/juh.jar
-OpenOffice.org1.0.3/program/classes/jurt.jar
-OpenOffice.org1.0.3/program/classes/jut.jar
-OpenOffice.org1.0.3/program/classes/ridl.jar
-OpenOffice.org1.0.3/program/classes/sandbox.jar
-OpenOffice.org1.0.3/program/classes/unoil.jar
-OpenOffice.org1.0.3/program/classes/xt.jar
-OpenOffice.org1.0.3/program/component.reg
-OpenOffice.org1.0.3/program/components/libabsyncsvc.so
-OpenOffice.org1.0.3/program/components/libaddrbook.so
-OpenOffice.org1.0.3/program/components/libmork.so
-OpenOffice.org1.0.3/program/components/libmozldap.so
-OpenOffice.org1.0.3/program/components/libnecko.so
-OpenOffice.org1.0.3/program/components/libpref.so
-OpenOffice.org1.0.3/program/components/libprofile.so
-OpenOffice.org1.0.3/program/components/librdf.so
-OpenOffice.org1.0.3/program/components/libstrres.so
-OpenOffice.org1.0.3/program/components/libuconv.so
-OpenOffice.org1.0.3/program/components/libucvcn.so
-OpenOffice.org1.0.3/program/components/libucvibm.so
-OpenOffice.org1.0.3/program/components/libucvja.so
-OpenOffice.org1.0.3/program/components/libucvko.so
-OpenOffice.org1.0.3/program/components/libucvlatin.so
-OpenOffice.org1.0.3/program/components/libucvtw.so
-OpenOffice.org1.0.3/program/components/libucvtw2.so
-OpenOffice.org1.0.3/program/components/libunicharutil.so
-OpenOffice.org1.0.3/program/components/liburiloader.so
-OpenOffice.org1.0.3/program/components/libvcard.so
-OpenOffice.org1.0.3/program/components/libxpconnect.so
-OpenOffice.org1.0.3/program/components/necko_dns.xpt
-OpenOffice.org1.0.3/program/components/xpcom_base.xpt
-OpenOffice.org1.0.3/program/components/xpcom_components.xpt
-OpenOffice.org1.0.3/program/components/xpcom_ds.xpt
-OpenOffice.org1.0.3/program/components/xpcom_io.xpt
-OpenOffice.org1.0.3/program/components/xpcom_threads.xpt
-OpenOffice.org1.0.3/program/components/xpcom_xpti.xpt
-OpenOffice.org1.0.3/program/components/xpti.dat
-OpenOffice.org1.0.3/program/components/xptitemp.dat
-OpenOffice.org1.0.3/program/configmgrrc
-OpenOffice.org1.0.3/program/defaults/pref/all.js
-OpenOffice.org1.0.3/program/defaults/pref/config.js
-OpenOffice.org1.0.3/program/defaults/pref/editor.js
-OpenOffice.org1.0.3/program/defaults/pref/initpref.js
-OpenOffice.org1.0.3/program/defaults/pref/inspector.js
-OpenOffice.org1.0.3/program/defaults/pref/mailnews.js
-OpenOffice.org1.0.3/program/defaults/pref/mdn.js
-OpenOffice.org1.0.3/program/defaults/pref/security-prefs.js
-OpenOffice.org1.0.3/program/defaults/pref/smime.js
-OpenOffice.org1.0.3/program/defaults/pref/unix.js
-OpenOffice.org1.0.3/program/defaults/pref/xpinstall.js
-OpenOffice.org1.0.3/program/draw_o.bmp
-OpenOffice.org1.0.3/program/ende_o.bmp
-OpenOffice.org1.0.3/program/filter/libegi641li.so
-OpenOffice.org1.0.3/program/filter/libeme641li.so
-OpenOffice.org1.0.3/program/filter/libemp641li.so
-OpenOffice.org1.0.3/program/filter/libepb641li.so
-OpenOffice.org1.0.3/program/filter/libepg641li.so
-OpenOffice.org1.0.3/program/filter/libepn641li.so
-OpenOffice.org1.0.3/program/filter/libepp641li.so
-OpenOffice.org1.0.3/program/filter/libeps641li.so
-OpenOffice.org1.0.3/program/filter/libept641li.so
-OpenOffice.org1.0.3/program/filter/libera641li.so
-OpenOffice.org1.0.3/program/filter/libeti641li.so
-OpenOffice.org1.0.3/program/filter/libexp641li.so
-OpenOffice.org1.0.3/program/filter/libicd641li.so
-OpenOffice.org1.0.3/program/filter/libicg641li.so
-OpenOffice.org1.0.3/program/filter/libidx641li.so



Home | Main Index | Thread Index | Old Index