pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/misc/openoffice-bin add support for Solaris/sparc. Al...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/10e732f6e428
branches:  trunk
changeset: 489749:10e732f6e428
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sat Feb 26 01:22:16 2005 +0000

description:
add support for Solaris/sparc.  Also add the framework to allow the Solaris/sparc
binary to install under NetBSD/sparc{,64} but don't actually enable it yet
due to compat_svr4 issues.  In addition, add support for Solaris/Intel which
is marked as broken until someone with such a system can fix PLIST.SolarisIntel
to be correct for the SolarisIntel binary distribution of openoffice.

diffstat:

 misc/openoffice-bin/MESSAGE              |     2 +-
 misc/openoffice-bin/Makefile             |    53 +-
 misc/openoffice-bin/Makefile.NetBSD.i386 |     2 +-
 misc/openoffice-bin/PLIST                |  5063 ----------------------------
 misc/openoffice-bin/PLIST.LinuxIntel     |  5063 ++++++++++++++++++++++++++++
 misc/openoffice-bin/PLIST.SolarisIntel   |  5264 ++++++++++++++++++++++++++++++
 misc/openoffice-bin/PLIST.SolarisSparc   |  5264 ++++++++++++++++++++++++++++++
 misc/openoffice-bin/distinfo             |     8 +-
 misc/openoffice-bin/files/install        |   150 +
 misc/openoffice-bin/files/soffice        |    15 +-
 10 files changed, 15807 insertions(+), 5077 deletions(-)

diffs (truncated from 21012 to 300 lines):

diff -r e783c97eddda -r 10e732f6e428 misc/openoffice-bin/MESSAGE
--- a/misc/openoffice-bin/MESSAGE       Sat Feb 26 01:07:56 2005 +0000
+++ b/misc/openoffice-bin/MESSAGE       Sat Feb 26 01:22:16 2005 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/02/24 13:50:18 mrauch Exp $
+$NetBSD: MESSAGE,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $
 
   OpenOffice has now been installed in ${PREFIX}/OpenOffice.org${VER}.
 
diff -r e783c97eddda -r 10e732f6e428 misc/openoffice-bin/Makefile
--- a/misc/openoffice-bin/Makefile      Sat Feb 26 01:07:56 2005 +0000
+++ b/misc/openoffice-bin/Makefile      Sat Feb 26 01:22:16 2005 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/24 13:50:18 mrauch Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $
 
-DISTNAME=              OOo_${OO_VER}_LinuxIntel_install
 PKGNAME=               openoffice-bin-${OO_VER}
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
@@ -13,17 +12,21 @@
 HOMEPAGE=              http://www.openoffice.org/
 COMMENT=               Integrated office productivity suite (binary pkg)
 
-OO_VER=                        1.1.4
-PLIST_SUBST+=          VER=${OO_VER}
-MESSAGE_SUBST+=                VER=${OO_VER}
+OO_VER=                1.1.4
+PLIST_SUBST+=  VER=${OO_VER}
+MESSAGE_SUBST+=        VER=${OO_VER}
 
 NO_CONFIGURE=           yes
 
 CONFLICTS+=            staroffice-[0-9]*
 CONFLICTS+=            openoffice-[0-9]*
+CONFLICTS+=            openoffice-linux-[0-9]*
 
 ONLY_FOR_PLATFORM=     NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
+# Install fails with "_sys_thread_create() failed, errno = 14" 
+#ONLY_FOR_PLATFORM+=   NetBSD-1.6*-sparc* NetBSD-[2-9]*-sparc*
 ONLY_FOR_PLATFORM+=    Linux-*-i[3-6]86
+ONLY_FOR_PLATFORM+=    SunOS-*-*
 
 TEMP?=                 ${WRKSRC}
 CHECK_SHLIBS=          no
@@ -34,7 +37,30 @@
 
 .if ${OPSYS} == "NetBSD"
 USE_PKGINSTALL=         yes
+
+.  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+.    if !exists(/emul/svr4/usr/lib/ld.so)
+PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
+.    endif
+DISTNAME=      OOo_${OO_VER}_SolarisSparc_install
+WRKSRC=                ${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install
+.  elseif ${MACHINE_ARCH} == "i386"
+DISTNAME=      OOo_${OO_VER}_LinuxIntel_install
 SUPPORT_FILES=          /dev/null /emul/linux/etc/mtab
+.  endif
+
+.endif
+
+.if ${OPSYS} == "SunOS"
+.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+DISTNAME=      OOo_${OO_VER}_SolarisSparc_install
+WRKSRC=                ${WRKDIR}/OOo_${OO_VER}_Solaris_Sparc_install
+.elseif ${MACHINE_ARCH} == "i386"
+DISTNAME=      OOo_${OO_VER}_SolarisIntel_install
+WRKSRC=                ${WRKDIR}/OOo_${OO_VER}_Solaris_Intel_install
+# I don't have a Solaris/Intel box to test the PLIST out
+PKG_FAIL_REASON= '${PKGNAME} needs to have the PLIST fixed up still'
+.endif
 .endif
 
 pre-install:
@@ -42,6 +68,10 @@
        ${SED}  -e "s|/usr/bin/soffice|${PREFIX}/bin/soffice.orig|g"    \
                -e "s|not(existsFile(searchdir, searchfile))|true|g"    \
                <${WRKSRC}/setup.ins.orig >${WRKSRC}/setup.ins
+.if !exists(${WRKSRC}/install)
+       ${CP} ${FILESDIR}/install ${WRKSRC}/install
+       ${CHMOD} +x ${WRKSRC}/install
+.endif
 #.     if ${OPSYS}=="NetBSD" && !exists(/emul/linux/etc/mtab)
 #      ${CP} /dev/null /emul/linux/etc/mtab
 #.     endif
@@ -52,7 +82,7 @@
                ${PREFIX}/OpenOffice.org${OO_VER}/program/services.rdb
        ${SH} -c "cd ${WRKSRC}; ./install --prefix=${PREFIX}"
        ${RM} -f ${PREFIX}/bin/soffice.orig
-       ${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g"             \
+       ${SED}  -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
                < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
        ${CHMOD} +x ${PREFIX}/bin/soffice
 .for i in scalc sdraw simpress swriter
@@ -68,4 +98,15 @@
 .  include "Makefile.${OPSYS}.${ARCH}"
 .endif
 
+.if ${DISTNAME} == "OOo_${OO_VER}_SolarisSparc_install"
+PLIST_SRC=     ${PKGDIR}/PLIST.SolarisSparc
+.elseif ${DISTNAME} == "OOo_${OO_VER}_SolarisIntel_install"
+PLIST_SRC=     ${PKGDIR}/PLIST.SolarisIntel
+.elseif ${DISTNAME} == "OOo_${OO_VER}_LinuxIntel_install"
+PLIST_SRC=     ${PKGDIR}/PLIST.LinuxIntel
+.else
+PKG_FAIL_REASON= '${PKGNAME}:  cannot figure out which PLIST to use'
+.endif
+
+
 .include "../../mk/bsd.pkg.mk"
diff -r e783c97eddda -r 10e732f6e428 misc/openoffice-bin/Makefile.NetBSD.i386
--- a/misc/openoffice-bin/Makefile.NetBSD.i386  Sat Feb 26 01:07:56 2005 +0000
+++ b/misc/openoffice-bin/Makefile.NetBSD.i386  Sat Feb 26 01:22:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1.1.1 2005/02/24 13:50:19 mrauch Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $
 
 DEPENDS+=               suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=               suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
diff -r e783c97eddda -r 10e732f6e428 misc/openoffice-bin/PLIST
--- a/misc/openoffice-bin/PLIST Sat Feb 26 01:07:56 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5063 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/24 13:50:20 mrauch Exp $
-OpenOffice.org${VER}/LICENSE
-OpenOffice.org${VER}/LICENSE.html
-OpenOffice.org${VER}/README
-OpenOffice.org${VER}/README.html
-OpenOffice.org${VER}/THIRDPARTYLICENSEREADME.html
-OpenOffice.org${VER}/help/en/common.jar
-OpenOffice.org${VER}/help/en/common.tree
-OpenOffice.org${VER}/help/en/custom.css
-OpenOffice.org${VER}/help/en/default.css
-OpenOffice.org${VER}/help/en/err.html
-OpenOffice.org${VER}/help/en/highcontrast1.css
-OpenOffice.org${VER}/help/en/highcontrast2.css
-OpenOffice.org${VER}/help/en/highcontrastblack.css
-OpenOffice.org${VER}/help/en/highcontrastwhite.css
-OpenOffice.org${VER}/help/en/picture.db
-OpenOffice.org${VER}/help/en/picture.jar
-OpenOffice.org${VER}/help/en/sbasic.cfg
-OpenOffice.org${VER}/help/en/sbasic.db
-OpenOffice.org${VER}/help/en/sbasic.ht
-OpenOffice.org${VER}/help/en/sbasic.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/sbasic.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/sbasic.idx/DOCS
-OpenOffice.org${VER}/help/en/sbasic.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/sbasic.idx/EDGE
-OpenOffice.org${VER}/help/en/sbasic.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/sbasic.idx/OFFSETS
-OpenOffice.org${VER}/help/en/sbasic.idx/POSITIONS
-OpenOffice.org${VER}/help/en/sbasic.idx/SCHEMA
-OpenOffice.org${VER}/help/en/sbasic.jar
-OpenOffice.org${VER}/help/en/sbasic.key
-OpenOffice.org${VER}/help/en/sbasic.tree
-OpenOffice.org${VER}/help/en/scalc.cfg
-OpenOffice.org${VER}/help/en/scalc.db
-OpenOffice.org${VER}/help/en/scalc.ht
-OpenOffice.org${VER}/help/en/scalc.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/scalc.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/scalc.idx/DOCS
-OpenOffice.org${VER}/help/en/scalc.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/scalc.idx/EDGE
-OpenOffice.org${VER}/help/en/scalc.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/scalc.idx/OFFSETS
-OpenOffice.org${VER}/help/en/scalc.idx/POSITIONS
-OpenOffice.org${VER}/help/en/scalc.idx/SCHEMA
-OpenOffice.org${VER}/help/en/scalc.jar
-OpenOffice.org${VER}/help/en/scalc.key
-OpenOffice.org${VER}/help/en/scalc.tree
-OpenOffice.org${VER}/help/en/schart.jar
-OpenOffice.org${VER}/help/en/schart.tree
-OpenOffice.org${VER}/help/en/sdraw.cfg
-OpenOffice.org${VER}/help/en/sdraw.db
-OpenOffice.org${VER}/help/en/sdraw.ht
-OpenOffice.org${VER}/help/en/sdraw.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/sdraw.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/sdraw.idx/DOCS
-OpenOffice.org${VER}/help/en/sdraw.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/sdraw.idx/EDGE
-OpenOffice.org${VER}/help/en/sdraw.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/sdraw.idx/OFFSETS
-OpenOffice.org${VER}/help/en/sdraw.idx/POSITIONS
-OpenOffice.org${VER}/help/en/sdraw.idx/SCHEMA
-OpenOffice.org${VER}/help/en/sdraw.jar
-OpenOffice.org${VER}/help/en/sdraw.key
-OpenOffice.org${VER}/help/en/simpress.cfg
-OpenOffice.org${VER}/help/en/simpress.db
-OpenOffice.org${VER}/help/en/simpress.ht
-OpenOffice.org${VER}/help/en/simpress.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/simpress.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/simpress.idx/DOCS
-OpenOffice.org${VER}/help/en/simpress.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/simpress.idx/EDGE
-OpenOffice.org${VER}/help/en/simpress.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/simpress.idx/OFFSETS
-OpenOffice.org${VER}/help/en/simpress.idx/POSITIONS
-OpenOffice.org${VER}/help/en/simpress.idx/SCHEMA
-OpenOffice.org${VER}/help/en/simpress.jar
-OpenOffice.org${VER}/help/en/simpress.key
-OpenOffice.org${VER}/help/en/simpress.tree
-OpenOffice.org${VER}/help/en/smath.cfg
-OpenOffice.org${VER}/help/en/smath.db
-OpenOffice.org${VER}/help/en/smath.ht
-OpenOffice.org${VER}/help/en/smath.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/smath.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/smath.idx/DOCS
-OpenOffice.org${VER}/help/en/smath.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/smath.idx/EDGE
-OpenOffice.org${VER}/help/en/smath.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/smath.idx/OFFSETS
-OpenOffice.org${VER}/help/en/smath.idx/POSITIONS
-OpenOffice.org${VER}/help/en/smath.idx/SCHEMA
-OpenOffice.org${VER}/help/en/smath.jar
-OpenOffice.org${VER}/help/en/smath.key
-OpenOffice.org${VER}/help/en/smath.tree
-OpenOffice.org${VER}/help/en/swriter.cfg
-OpenOffice.org${VER}/help/en/swriter.db
-OpenOffice.org${VER}/help/en/swriter.ht
-OpenOffice.org${VER}/help/en/swriter.idx/CONTEXTS
-OpenOffice.org${VER}/help/en/swriter.idx/DICTIONARY
-OpenOffice.org${VER}/help/en/swriter.idx/DOCS
-OpenOffice.org${VER}/help/en/swriter.idx/DOCS.TAB
-OpenOffice.org${VER}/help/en/swriter.idx/EDGE
-OpenOffice.org${VER}/help/en/swriter.idx/LINKNAMES
-OpenOffice.org${VER}/help/en/swriter.idx/OFFSETS
-OpenOffice.org${VER}/help/en/swriter.idx/POSITIONS
-OpenOffice.org${VER}/help/en/swriter.idx/SCHEMA
-OpenOffice.org${VER}/help/en/swriter.jar
-OpenOffice.org${VER}/help/en/swriter.key
-OpenOffice.org${VER}/help/en/swriter.tree
-OpenOffice.org${VER}/help/main_transform.xsl
-OpenOffice.org${VER}/program/acceptor.uno.so
-OpenOffice.org${VER}/program/bootstraprc
-OpenOffice.org${VER}/program/bridgefac.uno.so
-OpenOffice.org${VER}/program/classes/XFlatXml.jar
-OpenOffice.org${VER}/program/classes/XMergeBridge.jar
-OpenOffice.org${VER}/program/classes/XSLTFilter.jar
-OpenOffice.org${VER}/program/classes/XSLTValidate.jar
-OpenOffice.org${VER}/program/classes/classes.jar
-OpenOffice.org${VER}/program/classes/common.jar
-OpenOffice.org${VER}/program/classes/docbook.jar
-OpenOffice.org${VER}/program/classes/htmlsoff.jar
-OpenOffice.org${VER}/program/classes/java_uno.jar
-OpenOffice.org${VER}/program/classes/java_uno_accessbridge.jar
-OpenOffice.org${VER}/program/classes/juh.jar
-OpenOffice.org${VER}/program/classes/jurt.jar
-OpenOffice.org${VER}/program/classes/jut.jar
-OpenOffice.org${VER}/program/classes/officebean.jar
-OpenOffice.org${VER}/program/classes/report.jar
-OpenOffice.org${VER}/program/classes/ridl.jar
-OpenOffice.org${VER}/program/classes/sandbox.jar
-OpenOffice.org${VER}/program/classes/unoil.jar
-OpenOffice.org${VER}/program/classes/xmerge.jar
-OpenOffice.org${VER}/program/classes/xt.jar
-OpenOffice.org${VER}/program/component.reg
-OpenOffice.org${VER}/program/components/libaddrbook.so
-OpenOffice.org${VER}/program/components/libmork.so
-OpenOffice.org${VER}/program/components/libmozldap.so
-OpenOffice.org${VER}/program/components/libnecko.so
-OpenOffice.org${VER}/program/components/libpref.so
-OpenOffice.org${VER}/program/components/libprofile.so
-OpenOffice.org${VER}/program/components/librdf.so
-OpenOffice.org${VER}/program/components/libstrres.so
-OpenOffice.org${VER}/program/components/libuconv.so
-OpenOffice.org${VER}/program/components/libucvcn.so
-OpenOffice.org${VER}/program/components/libucvibm.so
-OpenOffice.org${VER}/program/components/libucvja.so
-OpenOffice.org${VER}/program/components/libucvko.so
-OpenOffice.org${VER}/program/components/libucvlatin.so
-OpenOffice.org${VER}/program/components/libucvtw.so
-OpenOffice.org${VER}/program/components/libucvtw2.so
-OpenOffice.org${VER}/program/components/libunicharutil.so
-OpenOffice.org${VER}/program/components/liburiloader.so
-OpenOffice.org${VER}/program/components/libvcard.so
-OpenOffice.org${VER}/program/components/libxpconnect.so
-OpenOffice.org${VER}/program/components/necko_dns.xpt
-OpenOffice.org${VER}/program/components/xpcom_base.xpt
-OpenOffice.org${VER}/program/components/xpcom_components.xpt
-OpenOffice.org${VER}/program/components/xpcom_ds.xpt
-OpenOffice.org${VER}/program/components/xpcom_io.xpt
-OpenOffice.org${VER}/program/components/xpcom_threads.xpt
-OpenOffice.org${VER}/program/components/xpcom_xpti.xpt
-OpenOffice.org${VER}/program/components/xpti.dat
-OpenOffice.org${VER}/program/components/xptitemp.dat
-OpenOffice.org${VER}/program/configmgrrc
-OpenOffice.org${VER}/program/connector.uno.so
-OpenOffice.org${VER}/program/corereflection.uno.so
-OpenOffice.org${VER}/program/crash_report
-OpenOffice.org${VER}/program/crash_report.bin
-OpenOffice.org${VER}/program/crash_report_with_gtk.bin
-OpenOffice.org${VER}/program/defaults/pref/all.js
-OpenOffice.org${VER}/program/defaults/pref/config.js
-OpenOffice.org${VER}/program/defaults/pref/editor.js
-OpenOffice.org${VER}/program/defaults/pref/initpref.js
-OpenOffice.org${VER}/program/defaults/pref/inspector.js
-OpenOffice.org${VER}/program/defaults/pref/mailnews.js



Home | Main Index | Thread Index | Old Index