diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-02-15 23:23:39 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-02-15 23:23:39 +0000 |
| commit | 948f97b3ca1c0069cce941f5185136829c428b7e (patch) | |
| tree | 785b606c32cf092d1cc210f490e665aa3296a29e /editors/openoffice.org-2.0/files | |
| parent | o Improve rcng script by adding mlnet_flags option (diff) | |
Update to 2.0.2rc1
Notes
Notes:
svn path=/head/; revision=156138
Diffstat (limited to 'editors/openoffice.org-2.0/files')
14 files changed, 79 insertions, 1448 deletions
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs index 8fc898b33521..1d119fc69a6a 100644 --- a/editors/openoffice.org-2.0/files/Makefile.knobs +++ b/editors/openoffice.org-2.0/files/Makefile.knobs @@ -6,7 +6,7 @@ CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant .endif .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ) -CONFIGURE_ARGS+= --with-java=gij --with-ant-home=${LOCALBASE}/ant +CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/gcc41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" --disable-qadevooo .endif .if defined(WITHOUT_JAVA) CONFIGURE_ARGS+= --without-java diff --git a/editors/openoffice.org-2.0/files/patch-Python-2.3.4.patch b/editors/openoffice.org-2.0/files/patch-Python-2.3.4.patch deleted file mode 100644 index 41b3577a44c6..000000000000 --- a/editors/openoffice.org-2.0/files/patch-Python-2.3.4.patch +++ /dev/null @@ -1,752 +0,0 @@ -Issuetracker : #i53287# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : Support for FreeBSD 6 and 7 - -Index: python/Python-2.3.4.patch -=================================================================== -RCS file: /cvs/external/python/Python-2.3.4.patch,v -retrieving revision 1.6 -diff -u -r1.6 Python-2.3.4.patch ---- python/Python-2.3.4.patch 3 Mar 2005 17:33:54 -0000 1.6 -+++ python/Python-2.3.4.patch 8 Aug 2005 21:50:08 -0000 -@@ -13776,3 +13776,739 @@ - atheos*) DYNLOADFILE="dynload_atheos.o";; - *) - # use dynload_shlib.c and dlopen() if we have it; otherwise stub -+*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:26:23 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py Tue Aug 9 06:20:25 2005 -+*************** -+*** 0 **** -+--- 1,355 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ IPPROTO_IP = 0 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_TCP = 6 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_UDP = 17 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_PGM = 113 -++ IPPROTO_DIVERT = 254 -++ IPPROTO_RAW = 255 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPORT_RESERVED = 1024 -++ IPPORT_USERRESERVED = 5000 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -++ -++ IN_CLASSA_NET = 0xff000000 -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -++ -++ IN_CLASSB_NET = 0xffff0000 -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -++ -++ IN_CLASSC_NET = 0xffffff00 -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -++ -++ IN_CLASSD_NET = 0xf0000000 -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ INADDR_NONE = 0xffffffff -++ IN_LOOPBACKNET = 127 -++ INET_ADDRSTRLEN = 16 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ -++ # Included from netinet6/in6.h -++ -++ # Included from sys/queue.h -++ def SLIST_HEAD_INITIALIZER(head): return \ -++ -++ def SLIST_ENTRY(type): return \ -++ -++ def STAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def STAILQ_ENTRY(type): return \ -++ -++ def LIST_HEAD_INITIALIZER(head): return \ -++ -++ def LIST_ENTRY(type): return \ -++ -++ def TAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def TAILQ_ENTRY(type): return \ -++ -++ def CIRCLEQ_ENTRY(type): return \ -++ -++ __KAME_VERSION = "20000701/FreeBSD-current" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = 0xff010000 -++ IPV6_ADDR_INT32_MLL = 0xff020000 -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = 0xffff0000 -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_PKTINFO = 19 -++ IPV6_HOPLIMIT = 20 -++ IPV6_NEXTHOP = 21 -++ IPV6_HOPOPTS = 22 -++ IPV6_DSTOPTS = 23 -++ IPV6_RTHDR = 24 -++ IPV6_PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_BINDV6ONLY = 27 -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_BINDV6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_MAXID = 28 -+*** misc/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:26:27 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen Tue Aug 9 06:19:02 2005 -+*************** -+*** 0 **** -+--- 1,3 ---- -++ #! /bin/sh -++ set -v -++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h -+*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:26:23 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py Tue Aug 9 06:20:25 2005 -+*************** -+*** 0 **** -+--- 1,355 ---- -++ # Generated by h2py from /usr/include/netinet/in.h -++ IPPROTO_IP = 0 -++ IPPROTO_HOPOPTS = 0 -++ IPPROTO_ICMP = 1 -++ IPPROTO_IGMP = 2 -++ IPPROTO_GGP = 3 -++ IPPROTO_IPV4 = 4 -++ IPPROTO_IPIP = IPPROTO_IPV4 -++ IPPROTO_TCP = 6 -++ IPPROTO_ST = 7 -++ IPPROTO_EGP = 8 -++ IPPROTO_PIGP = 9 -++ IPPROTO_RCCMON = 10 -++ IPPROTO_NVPII = 11 -++ IPPROTO_PUP = 12 -++ IPPROTO_ARGUS = 13 -++ IPPROTO_EMCON = 14 -++ IPPROTO_XNET = 15 -++ IPPROTO_CHAOS = 16 -++ IPPROTO_UDP = 17 -++ IPPROTO_MUX = 18 -++ IPPROTO_MEAS = 19 -++ IPPROTO_HMP = 20 -++ IPPROTO_PRM = 21 -++ IPPROTO_IDP = 22 -++ IPPROTO_TRUNK1 = 23 -++ IPPROTO_TRUNK2 = 24 -++ IPPROTO_LEAF1 = 25 -++ IPPROTO_LEAF2 = 26 -++ IPPROTO_RDP = 27 -++ IPPROTO_IRTP = 28 -++ IPPROTO_TP = 29 -++ IPPROTO_BLT = 30 -++ IPPROTO_NSP = 31 -++ IPPROTO_INP = 32 -++ IPPROTO_SEP = 33 -++ IPPROTO_3PC = 34 -++ IPPROTO_IDPR = 35 -++ IPPROTO_XTP = 36 -++ IPPROTO_DDP = 37 -++ IPPROTO_CMTP = 38 -++ IPPROTO_TPXX = 39 -++ IPPROTO_IL = 40 -++ IPPROTO_IPV6 = 41 -++ IPPROTO_SDRP = 42 -++ IPPROTO_ROUTING = 43 -++ IPPROTO_FRAGMENT = 44 -++ IPPROTO_IDRP = 45 -++ IPPROTO_RSVP = 46 -++ IPPROTO_GRE = 47 -++ IPPROTO_MHRP = 48 -++ IPPROTO_BHA = 49 -++ IPPROTO_ESP = 50 -++ IPPROTO_AH = 51 -++ IPPROTO_INLSP = 52 -++ IPPROTO_SWIPE = 53 -++ IPPROTO_NHRP = 54 -++ IPPROTO_ICMPV6 = 58 -++ IPPROTO_NONE = 59 -++ IPPROTO_DSTOPTS = 60 -++ IPPROTO_AHIP = 61 -++ IPPROTO_CFTP = 62 -++ IPPROTO_HELLO = 63 -++ IPPROTO_SATEXPAK = 64 -++ IPPROTO_KRYPTOLAN = 65 -++ IPPROTO_RVD = 66 -++ IPPROTO_IPPC = 67 -++ IPPROTO_ADFS = 68 -++ IPPROTO_SATMON = 69 -++ IPPROTO_VISA = 70 -++ IPPROTO_IPCV = 71 -++ IPPROTO_CPNX = 72 -++ IPPROTO_CPHB = 73 -++ IPPROTO_WSN = 74 -++ IPPROTO_PVP = 75 -++ IPPROTO_BRSATMON = 76 -++ IPPROTO_ND = 77 -++ IPPROTO_WBMON = 78 -++ IPPROTO_WBEXPAK = 79 -++ IPPROTO_EON = 80 -++ IPPROTO_VMTP = 81 -++ IPPROTO_SVMTP = 82 -++ IPPROTO_VINES = 83 -++ IPPROTO_TTP = 84 -++ IPPROTO_IGP = 85 -++ IPPROTO_DGP = 86 -++ IPPROTO_TCF = 87 -++ IPPROTO_IGRP = 88 -++ IPPROTO_OSPFIGP = 89 -++ IPPROTO_SRPC = 90 -++ IPPROTO_LARP = 91 -++ IPPROTO_MTP = 92 -++ IPPROTO_AX25 = 93 -++ IPPROTO_IPEIP = 94 -++ IPPROTO_MICP = 95 -++ IPPROTO_SCCSP = 96 -++ IPPROTO_ETHERIP = 97 -++ IPPROTO_ENCAP = 98 -++ IPPROTO_APES = 99 -++ IPPROTO_GMTP = 100 -++ IPPROTO_IPCOMP = 108 -++ IPPROTO_PIM = 103 -++ IPPROTO_PGM = 113 -++ IPPROTO_DIVERT = 254 -++ IPPROTO_RAW = 255 -++ IPPROTO_MAX = 256 -++ IPPROTO_DONE = 257 -++ IPPORT_RESERVED = 1024 -++ IPPORT_USERRESERVED = 5000 -++ IPPORT_HIFIRSTAUTO = 49152 -++ IPPORT_HILASTAUTO = 65535 -++ IPPORT_RESERVEDSTART = 600 -++ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0) -++ -++ IN_CLASSA_NET = 0xff000000 -++ IN_CLASSA_NSHIFT = 24 -++ IN_CLASSA_HOST = 0x00ffffff -++ IN_CLASSA_MAX = 128 -++ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000) -++ -++ IN_CLASSB_NET = 0xffff0000 -++ IN_CLASSB_NSHIFT = 16 -++ IN_CLASSB_HOST = 0x0000ffff -++ IN_CLASSB_MAX = 65536 -++ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) -++ -++ IN_CLASSC_NET = 0xffffff00 -++ IN_CLASSC_NSHIFT = 8 -++ IN_CLASSC_HOST = 0x000000ff -++ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) -++ -++ IN_CLASSD_NET = 0xf0000000 -++ IN_CLASSD_NSHIFT = 28 -++ IN_CLASSD_HOST = 0x0fffffff -++ def IN_MULTICAST(i): return IN_CLASSD(i) -++ -++ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -++ -++ INADDR_NONE = 0xffffffff -++ IN_LOOPBACKNET = 127 -++ INET_ADDRSTRLEN = 16 -++ IP_OPTIONS = 1 -++ IP_HDRINCL = 2 -++ IP_TOS = 3 -++ IP_TTL = 4 -++ IP_RECVOPTS = 5 -++ IP_RECVRETOPTS = 6 -++ IP_RECVDSTADDR = 7 -++ IP_RETOPTS = 8 -++ IP_MULTICAST_IF = 9 -++ IP_MULTICAST_TTL = 10 -++ IP_MULTICAST_LOOP = 11 -++ IP_ADD_MEMBERSHIP = 12 -++ IP_DROP_MEMBERSHIP = 13 -++ IP_MULTICAST_VIF = 14 -++ IP_RSVP_ON = 15 -++ IP_RSVP_OFF = 16 -++ IP_RSVP_VIF_ON = 17 -++ IP_RSVP_VIF_OFF = 18 -++ IP_PORTRANGE = 19 -++ IP_RECVIF = 20 -++ IP_IPSEC_POLICY = 21 -++ IP_FAITH = 22 -++ IP_FW_ADD = 50 -++ IP_FW_DEL = 51 -++ IP_FW_FLUSH = 52 -++ IP_FW_ZERO = 53 -++ IP_FW_GET = 54 -++ IP_FW_RESETLOG = 55 -++ IP_DUMMYNET_CONFIGURE = 60 -++ IP_DUMMYNET_DEL = 61 -++ IP_DUMMYNET_FLUSH = 62 -++ IP_DUMMYNET_GET = 64 -++ IP_DEFAULT_MULTICAST_TTL = 1 -++ IP_DEFAULT_MULTICAST_LOOP = 1 -++ IP_MAX_MEMBERSHIPS = 20 -++ IP_PORTRANGE_DEFAULT = 0 -++ IP_PORTRANGE_HIGH = 1 -++ IP_PORTRANGE_LOW = 2 -++ IPPROTO_MAXID = (IPPROTO_AH + 1) -++ IPCTL_FORWARDING = 1 -++ IPCTL_SENDREDIRECTS = 2 -++ IPCTL_DEFTTL = 3 -++ IPCTL_DEFMTU = 4 -++ IPCTL_RTEXPIRE = 5 -++ IPCTL_RTMINEXPIRE = 6 -++ IPCTL_RTMAXCACHE = 7 -++ IPCTL_SOURCEROUTE = 8 -++ IPCTL_DIRECTEDBROADCAST = 9 -++ IPCTL_INTRQMAXLEN = 10 -++ IPCTL_INTRQDROPS = 11 -++ IPCTL_STATS = 12 -++ IPCTL_ACCEPTSOURCEROUTE = 13 -++ IPCTL_FASTFORWARDING = 14 -++ IPCTL_KEEPFAITH = 15 -++ IPCTL_GIF_TTL = 16 -++ IPCTL_MAXID = 17 -++ -++ # Included from netinet6/in6.h -++ -++ # Included from sys/queue.h -++ def SLIST_HEAD_INITIALIZER(head): return \ -++ -++ def SLIST_ENTRY(type): return \ -++ -++ def STAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def STAILQ_ENTRY(type): return \ -++ -++ def LIST_HEAD_INITIALIZER(head): return \ -++ -++ def LIST_ENTRY(type): return \ -++ -++ def TAILQ_HEAD_INITIALIZER(head): return \ -++ -++ def TAILQ_ENTRY(type): return \ -++ -++ def CIRCLEQ_ENTRY(type): return \ -++ -++ __KAME_VERSION = "20000701/FreeBSD-current" -++ IPV6PORT_RESERVED = 1024 -++ IPV6PORT_ANONMIN = 49152 -++ IPV6PORT_ANONMAX = 65535 -++ IPV6PORT_RESERVEDMIN = 600 -++ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1) -++ INET6_ADDRSTRLEN = 46 -++ IPV6_ADDR_INT32_ONE = 1 -++ IPV6_ADDR_INT32_TWO = 2 -++ IPV6_ADDR_INT32_MNL = 0xff010000 -++ IPV6_ADDR_INT32_MLL = 0xff020000 -++ IPV6_ADDR_INT32_SMP = 0x0000ffff -++ IPV6_ADDR_INT16_ULL = 0xfe80 -++ IPV6_ADDR_INT16_USL = 0xfec0 -++ IPV6_ADDR_INT16_MLL = 0xff02 -++ IPV6_ADDR_INT32_ONE = 0x01000000 -++ IPV6_ADDR_INT32_TWO = 0x02000000 -++ IPV6_ADDR_INT32_MNL = 0x000001ff -++ IPV6_ADDR_INT32_MLL = 0x000002ff -++ IPV6_ADDR_INT32_SMP = 0xffff0000 -++ IPV6_ADDR_INT16_ULL = 0x80fe -++ IPV6_ADDR_INT16_USL = 0xc0fe -++ IPV6_ADDR_INT16_MLL = 0x02ff -++ def IN6_IS_ADDR_UNSPECIFIED(a): return \ -++ -++ def IN6_IS_ADDR_LOOPBACK(a): return \ -++ -++ def IN6_IS_ADDR_V4COMPAT(a): return \ -++ -++ def IN6_IS_ADDR_V4MAPPED(a): return \ -++ -++ IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01 -++ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02 -++ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05 -++ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08 -++ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e -++ def IN6_IS_ADDR_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_NODELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_SITELOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \ -++ -++ def IN6_IS_ADDR_MC_GLOBAL(a): return \ -++ -++ def IN6_IS_SCOPE_LINKLOCAL(a): return \ -++ -++ IPV6_OPTIONS = 1 -++ IPV6_RECVOPTS = 5 -++ IPV6_RECVRETOPTS = 6 -++ IPV6_RECVDSTADDR = 7 -++ IPV6_RETOPTS = 8 -++ IPV6_SOCKOPT_RESERVED1 = 3 -++ IPV6_UNICAST_HOPS = 4 -++ IPV6_MULTICAST_IF = 9 -++ IPV6_MULTICAST_HOPS = 10 -++ IPV6_MULTICAST_LOOP = 11 -++ IPV6_JOIN_GROUP = 12 -++ IPV6_LEAVE_GROUP = 13 -++ IPV6_PORTRANGE = 14 -++ ICMP6_FILTER = 18 -++ IPV6_PKTINFO = 19 -++ IPV6_HOPLIMIT = 20 -++ IPV6_NEXTHOP = 21 -++ IPV6_HOPOPTS = 22 -++ IPV6_DSTOPTS = 23 -++ IPV6_RTHDR = 24 -++ IPV6_PKTOPTIONS = 25 -++ IPV6_CHECKSUM = 26 -++ IPV6_BINDV6ONLY = 27 -++ IPV6_IPSEC_POLICY = 28 -++ IPV6_FAITH = 29 -++ IPV6_FW_ADD = 30 -++ IPV6_FW_DEL = 31 -++ IPV6_FW_FLUSH = 32 -++ IPV6_FW_ZERO = 33 -++ IPV6_FW_GET = 34 -++ IPV6_RTHDR_LOOSE = 0 -++ IPV6_RTHDR_STRICT = 1 -++ IPV6_RTHDR_TYPE_0 = 0 -++ IPV6_DEFAULT_MULTICAST_HOPS = 1 -++ IPV6_DEFAULT_MULTICAST_LOOP = 1 -++ IPV6_PORTRANGE_DEFAULT = 0 -++ IPV6_PORTRANGE_HIGH = 1 -++ IPV6_PORTRANGE_LOW = 2 -++ IPV6PROTO_MAXID = (IPPROTO_PIM + 1) -++ IPV6CTL_FORWARDING = 1 -++ IPV6CTL_SENDREDIRECTS = 2 -++ IPV6CTL_DEFHLIM = 3 -++ IPV6CTL_DEFMTU = 4 -++ IPV6CTL_FORWSRCRT = 5 -++ IPV6CTL_STATS = 6 -++ IPV6CTL_MRTSTATS = 7 -++ IPV6CTL_MRTPROTO = 8 -++ IPV6CTL_MAXFRAGPACKETS = 9 -++ IPV6CTL_SOURCECHECK = 10 -++ IPV6CTL_SOURCECHECK_LOGINT = 11 -++ IPV6CTL_ACCEPT_RTADV = 12 -++ IPV6CTL_KEEPFAITH = 13 -++ IPV6CTL_LOG_INTERVAL = 14 -++ IPV6CTL_HDRNESTLIMIT = 15 -++ IPV6CTL_DAD_COUNT = 16 -++ IPV6CTL_AUTO_FLOWLABEL = 17 -++ IPV6CTL_DEFMCASTHLIM = 18 -++ IPV6CTL_GIF_HLIM = 19 -++ IPV6CTL_KAME_VERSION = 20 -++ IPV6CTL_USE_DEPRECATED = 21 -++ IPV6CTL_RR_PRUNE = 22 -++ IPV6CTL_MAPPED_ADDR = 23 -++ IPV6CTL_BINDV6ONLY = 24 -++ IPV6CTL_RTEXPIRE = 25 -++ IPV6CTL_RTMINEXPIRE = 26 -++ IPV6CTL_RTMAXCACHE = 27 -++ IPV6CTL_MAXID = 28 -+*** misc/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:26:27 2005 -+--- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen Tue Aug 9 06:19:02 2005 -+*************** -+*** 0 **** -+--- 1,3 ---- -++ #! /bin/sh -++ set -v -++ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h diff --git a/editors/openoffice.org-2.0/files/patch-backtrace b/editors/openoffice.org-2.0/files/patch-backtrace deleted file mode 100644 index 523bba02d5e4..000000000000 --- a/editors/openoffice.org-2.0/files/patch-backtrace +++ /dev/null @@ -1,95 +0,0 @@ -Issuetracker : #i56946# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : An implementation of backtrace at sal/osl/unx -To pass the compilation, we had been preparing dummy function at sal. -We implemented this. - ---- sal/osl/unx/backtrace.c Thu Sep 8 23:52:44 2005 -+++ sal/osl/unx/backtrace.c Sun Oct 23 09:19:04 2005 -@@ -129,6 +129,7 @@ - #include <pthread.h> - #include <setjmp.h> - #include <stdio.h> -+#include <stddef.h> - #include "backtrace.h" - - #define FRAME_PTR_OFFSET 1 -@@ -136,11 +137,55 @@ - - int backtrace( void **buffer, int max_frames ) - { -- return 1; -+ struct frame *fp; -+ jmp_buf ctx; -+ int i; -+ /* get stack- and framepointer */ -+ setjmp(ctx); -+ fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]); -+ for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++) -+ fp = fp->fr_savfp; -+ /* iterate through backtrace */ -+ for (i=0; fp && fp->fr_savpc && i<max_frames; i++) -+ { -+ /* store frame */ -+ *(buffer++) = (void *)fp->fr_savpc; -+ /* next frame */ -+ fp=fp->fr_savfp; -+ } -+ return i; - } - - void backtrace_symbols_fd( void **buffer, int size, int fd ) - { -+ FILE *fp = fdopen( fd, "w" ); -+ -+ if ( fp ) -+ { -+ void **pFramePtr; -+ for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- ) -+ { -+ Dl_info dli; -+ ptrdiff_t offset; -+ -+ if ( 0 != dladdr( *pFramePtr, &dli ) ) -+ { -+ if ( dli.dli_fname && dli.dli_fbase ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase; -+ fprintf( fp, "%s+0x%x", dli.dli_fname, offset ); -+ } -+ if ( dli.dli_sname && dli.dli_saddr ) -+ { -+ offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr; -+ fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); -+ } -+ } -+ fprintf( fp, "[0x%x]\n", *pFramePtr ); -+ } -+ fflush( fp ); -+ fclose( fp ); -+ } - - } - #endif /* defined FREEBSD */ - ---- sal/osl/unx/backtrace.h Thu Sep 8 23:52:59 2005 -+++ sal/osl/unx/backtrace.h Sun Oct 23 09:19:40 2005 -@@ -46,6 +46,16 @@ - - void backtrace_symbols_fd( void **buffer, int size, int fd ); - -+/* no frame.h on FreeBSD */ -+#if defined FREEBSD -+struct frame { -+ long arg0[8]; -+ long arg1[6]; -+ struct frame *fr_savfp; -+ long fr_savpc; -+}; -+#endif -+ - #ifdef __cplusplus - } /* extern "C" */ - #endif - diff --git a/editors/openoffice.org-2.0/files/patch-bridges b/editors/openoffice.org-2.0/files/patch-bridges deleted file mode 100644 index 8375332a3e20..000000000000 --- a/editors/openoffice.org-2.0/files/patch-bridges +++ /dev/null @@ -1,173 +0,0 @@ -Issuetracker : #i56947# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : update files at bridges project -catch up version up of bridge project of GNU/Linux - ---- bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Thu Sep 8 07:20:08 2005 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Wed Oct 26 15:10:05 2005 -@@ -57,7 +57,7 @@ - typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return - sal_Int32 nParams, typelib_MethodParameter * pParams, - void ** pCallStack, -- sal_Int64 * pRegisterReturn /* space for register return */ ) -+ void * pReturnValue ) - { - // pCallStack: ret, [return ptr], this, params - char * pCppStack = (char *)(pCallStack +1); -@@ -74,7 +74,7 @@ - { - if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) - { -- pUnoReturn = pRegisterReturn; // direct way for simple types -+ pUnoReturn = pReturnValue; // direct way for simple types - } - else // complex return via ptr (pCppReturn) - { -@@ -215,7 +215,7 @@ - uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); - } - // complex return ptr is set to eax -- *(void **)pRegisterReturn = pCppReturn; -+ *static_cast< void ** >(pReturnValue) = pCppReturn; - } - if (pReturnTypeDescr) - { -@@ -228,7 +228,7 @@ - //================================================================================================== - extern "C" void cpp_vtable_call( - int nFunctionIndex, int nVtableOffset, void** pCallStack, -- sal_Int64 nRegReturn ) -+ void * pReturnValue ) - { - OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); - -@@ -275,7 +275,7 @@ - pCppI, aMemberDescr.get(), - ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, - 0, 0, // no params -- pCallStack, &nRegReturn ); -+ pCallStack, pReturnValue ); - } - else - { -@@ -290,7 +290,7 @@ - pCppI, aMemberDescr.get(), - 0, // indicates void return - 1, &aParam, -- pCallStack, &nRegReturn ); -+ pCallStack, pReturnValue ); - } - break; - } -@@ -324,7 +324,7 @@ - &pInterface, pTD, cpp_acquire ); - pInterface->release(); - TYPELIB_DANGER_RELEASE( pTD ); -- *(void **)&nRegReturn = pCallStack[1]; -+ *static_cast< void ** >(pReturnValue) = pCallStack[1]; - break; - } - TYPELIB_DANGER_RELEASE( pTD ); -@@ -336,7 +336,7 @@ - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, - ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -- pCallStack, &nRegReturn ); -+ pCallStack, pReturnValue ); - } - break; - } ---- bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Jun 1 01:32:41 2005 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/call.s Wed Oct 26 15:10:04 2005 -@@ -9,12 +9,13 @@ - .LCFIg0: - movl %esp,%ebp - .LCFIg1: -- subl $0x8,%esp # 64bit nRegReturn -+ subl $0x4,%esp # 32bit returnValue -+ pushl %esp # 32bit &returnValue - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex - call cpp_vtable_call -- movl 12(%esp),%eax # 64 bit nRegReturn, lower half -+ movl 16(%esp),%eax # 32bit returnValue - leave - ret - .LFEg: -@@ -29,7 +30,7 @@ - .LCFIv0: - movl %esp,%ebp - .LCFIv1: -- subl $0x8,%esp # 64bit nRegReturn -+ pushl $0 # 32bit null pointer (returnValue not used) - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex -@@ -48,13 +49,14 @@ - .LCFIh0: - movl %esp,%ebp - .LCFIh1: -- subl $0x8,%esp # 64bit nRegReturn -+ subl $0x8,%esp # 64bit returnValue -+ pushl %esp # 32bit &returnValue - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex - call cpp_vtable_call -- movl 12(%esp),%eax # 64 bit nRegReturn, lower half -- movl 16(%esp),%edx # 64 bit nRegReturn, upper half -+ movl 16(%esp),%eax # 64bit returnValue, lower half -+ movl 20(%esp),%edx # 64bit returnValue, upper half - leave - ret - .LFEh: -@@ -69,12 +71,13 @@ - .LCFIf0: - movl %esp,%ebp - .LCFIf1: -- subl $0x8,%esp # 64bit nRegReturn -+ subl $0x4,%esp # 32bit returnValue -+ pushl %esp # 32bit &returnValue - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex - call cpp_vtable_call -- flds 12(%esp) # 64 bit nRegReturn, lower half -+ flds 16(%esp) # 32bit returnValue - leave - ret - .LFEf: -@@ -89,12 +92,13 @@ - .LCFId0: - movl %esp,%ebp - .LCFId1: -- subl $0x8,%esp # 64bit nRegReturn -+ subl $0x8,%esp # 64bit returnValue -+ pushl %esp # 32bit &returnValue - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex - call cpp_vtable_call -- fldl 12(%esp) # 64 bit nRegReturn -+ fldl 16(%esp) # 64bit returnValue - leave - ret - .LFEd: -@@ -109,12 +113,13 @@ - .LCFIc0: - movl %esp,%ebp - .LCFIc1: -- subl $0x8,%esp # 64bit nRegReturn -+ subl $0x4,%esp # 32bit returnValue -+ pushl %esp # 32bit &returnValue - pushl %ecx # 32bit pCallStack - pushl %edx # 32bit nVtableOffset - pushl %eax # 32bit nFunctionIndex - call cpp_vtable_call -- movl 12(%esp),%eax # 64 bit nRegReturn, lower half -+ movl 16(%esp),%eax # 32bit returnValue - leave - ret $4 - .LFEc: diff --git a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in deleted file mode 100644 index a06f28849d7a..000000000000 --- a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in +++ /dev/null @@ -1,18 +0,0 @@ -Issuetracker : #i56949# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : Add conditional the case of @GCCVER@ >= 30401. -Like GNU/Linux's case, we also need the case for $CVER if @GCCVER@ is equal to or larger than 3.4.1 - ---- config_office/set_soenv.in Thu Sep 22 23:30:56 2005 -+++ config_office/set_soenv.in Sat Oct 1 12:59:30 2005 -@@ -347,6 +347,9 @@ - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; -+ if( @GCCVER@ >= 30401 ) { -+ $CVER = "C341"; -+ } - } - elsif ( $platform =~ m/linux-gnu/ ) - { diff --git a/editors/openoffice.org-2.0/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2.0/files/patch-epm index 2182489d5445..8808325b529d 100644 --- a/editors/openoffice.org-2.0/files/patch-epm+epm-3.7.patch +++ b/editors/openoffice.org-2.0/files/patch-epm @@ -1,22 +1,16 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : epm porting for FreeBSD -o FreeBSD's package manager doesn't allow multiple lines for - @exec and @unexec -o chown is at /usr/sbin/ -o the way to recording package dependency is incorrect - Index: epm/epm-3.7.patch =================================================================== RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.2 -diff -u -r1.2 epm-3.7.patch ---- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 -+++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 -@@ -1,3 +1,69 @@ +retrieving revision 1.8 +diff -u -r1.8 epm-3.7.patch +--- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 ++++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 +@@ -546,3 +546,116 @@ + } + + --- 457,462 ---- +*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 +*************** +*** 26,31 **** +--- 26,38 ---- @@ -34,25 +28,36 @@ diff -u -r1.2 epm-3.7.patch + /* + * 'make_bsd()' - Make a FreeBSD software distribution package. +*************** -+*** 150,156 **** ++*** 149,156 **** ++ + for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) + { -+ if (d->type == DEPEND_REQUIRES) ++! if (d->type == DEPEND_REQUIRES) +! fprintf(fp, "@pkgdep %s", d->product); + else + #ifdef __FreeBSD__ + /* -+--- 157,163 ---- ++--- 156,172 ---- ++ + for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) + { -+ if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++! #ifdef __FreeBSD__ ++! if (d->type == DEPEND_REQUIRES) { ++! if (dist->relnumber) ++! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); ++! else ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++! } ++! #else ++! if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s", d->product); ++! #endif + else + #ifdef __FreeBSD__ + /* +*************** +*** 179,187 **** -+--- 186,196 ---- ++--- 196,206 ---- + " by the BSD packager.\n", stderr); + break; + case COMMAND_POST_INSTALL : @@ -73,7 +78,7 @@ diff -u -r1.2 epm-3.7.patch + file->dst); + fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); + } -+--- 208,214 ---- ++--- 218,224 ---- + */ + + fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); @@ -81,7 +86,39 @@ diff -u -r1.2 epm-3.7.patch + file->dst); + fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); + } - *** misc/epm-3.7/epm.c 2003-10-28 15:48:30.000000000 +0100 - --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 - *************** - ++*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 ++--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 ++*************** ++*** 181,192 **** ++ ++ for (i = slen; i > 0; i --, s ++, bytes ++) ++ { ++ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) ++ { ++ putc('\\', fp); ++ bytes ++; ++ } ++! ++ putc(*s, fp); ++ } ++ ++--- 181,199 ---- ++ ++ for (i = slen; i > 0; i --, s ++, bytes ++) ++ { +++ #if defined(__FreeBSD__) +++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) +++ { +++ putc('\\', fp); +++ bytes ++; +++ } +++ #else ++ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) ++ { ++ putc('\\', fp); ++ bytes ++; ++ } ++! #endif ++ putc(*s, fp); ++ } ++ diff --git a/editors/openoffice.org-2.0/files/patch-icu+icu-2.6.patch b/editors/openoffice.org-2.0/files/patch-icu+icu-2.6.patch deleted file mode 100644 index eb643e9e4a97..000000000000 --- a/editors/openoffice.org-2.0/files/patch-icu+icu-2.6.patch +++ /dev/null @@ -1,38 +0,0 @@ -Issuetracker : #i56952# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : Passing $ORIGIN to linker at icu project -We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case. - ---- icu/icu-2.6.patch Fri Aug 26 20:43:35 2005 -+++ icu-2.6.patch Mon Oct 24 18:18:45 2005 -@@ -2747,3 +2747,29 @@ - commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza)); - - sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset); -+*** misc/icu/source/config/mh-bsd-gcc Thu May 2 08:48:10 2002 -+--- misc/build/icu/source/config/mh-bsd-gcc Mon Oct 24 18:16:57 2005 -+*************** -+*** 10,21 **** -+--- 10,30 ---- -+ GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+ -+ ## Flags for position independent code -++ STATICCFLAGS = -fPIC -++ STATICCXXFLAGS = -fPIC -++ STATICCPPFLAGS = -DPIC -+ SHAREDLIBCFLAGS = -fPIC -+ SHAREDLIBCXXFLAGS = -fPIC -+ SHAREDLIBCPPFLAGS = -DPIC -+ -+ ## Compiler switch to embed a runtime search path -+ LD_RPATH= -++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH -++ ENABLE_RPATH=YES -++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN' -++ -++ #SH# ENABLE_RPATH=YES -++ #SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'" -+ LD_RPATH_PRE= -Wl,-rpath, -+ -+ ## Compiler switch to embed a library name diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo b/editors/openoffice.org-2.0/files/patch-instsetoo deleted file mode 100644 index 77fcd635acfa..000000000000 --- a/editors/openoffice.org-2.0/files/patch-instsetoo +++ /dev/null @@ -1,154 +0,0 @@ -Issuetracker : #i53288# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : remove circular dependency - -in this case, -core01 is depend on core02-core08, and core0[2-9] and core10 -depends on core01. for FreeBSD this is regarded as circular dependency -and pkg_add command is forked infinite times and eats up systems' resource. -namely when core01 tries to install core02, core02 also tries to -install core01. -Index: instsetoo_native/inc_openoffice/unix/packagelist.txt -=================================================================== -RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v -retrieving revision 1.21 -diff -u -r1.21 packagelist.txt ---- instsetoo_native/inc_openoffice/unix/packagelist.txt 30 Nov 2005 13:21:44 -0000 1.21 -+++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Dec 2005 22:26:12 -0000 -@@ -37,6 +37,7 @@ - packagename = "%UNIXPRODUCTNAME-core01" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-mailcap,%WITHOUTDOTUNIXPRODUCTNAME-core,%WITHOUTDOTUNIXPRODUCTNAME-core01" - requires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08" -+freebsdrequires = "%UNIXPRODUCTNAME-core02,%UNIXPRODUCTNAME-core03,%UNIXPRODUCTNAME-core04,%UNIXPRODUCTNAME-core05,%UNIXPRODUCTNAME-core06,%UNIXPRODUCTNAME-core07,%UNIXPRODUCTNAME-core08,%UNIXPRODUCTNAME-core09,%UNIXPRODUCTNAME-core10" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -278,6 +279,7 @@ - packagename = "%UNIXPRODUCTNAME-core02" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core02" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -291,6 +293,7 @@ - packagename = "%UNIXPRODUCTNAME-core03" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core03" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -304,6 +307,7 @@ - packagename = "%UNIXPRODUCTNAME-core04" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core04" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -317,6 +321,7 @@ - packagename = "%UNIXPRODUCTNAME-core05" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core05" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -330,6 +335,7 @@ - packagename = "%UNIXPRODUCTNAME-core06" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core06" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -343,6 +349,7 @@ - packagename = "%UNIXPRODUCTNAME-core07" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core07" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -356,6 +363,7 @@ - packagename = "%UNIXPRODUCTNAME-core08" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core08" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -369,6 +377,7 @@ - packagename = "%UNIXPRODUCTNAME-core09" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core09" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -@@ -383,6 +392,7 @@ - packagename = "%UNIXPRODUCTNAME-core10" - linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-core10" - requires = "%UNIXPRODUCTNAME-core01" -+freebsdrequires = "" - copyright = "1999-2005 by OpenOffice.org" - vendor = "OpenOffice.org" - description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" -Index: solenv/bin/modules/installer/epmfile.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/epmfile.pm,v -retrieving revision 1.42 -diff -u -r1.42 epmfile.pm ---- solenv/bin/modules/installer/epmfile.pm 9 Nov 2005 09:09:49 -0000 1.42 -+++ solenv/bin/modules/installer/epmfile.pm 3 Dec 2005 22:26:52 -0000 -@@ -395,6 +395,11 @@ - $provides = "solarisprovides"; # the name in the packagelist - $requires = "solarisrequires"; # the name in the packagelist - } -+ elsif ( $installer::globals::isfreebsdpkgbuild ) -+ { -+ $provides = "freebsdprovides"; # the name in the packagelist -+ $requires = "freebsdrequires"; # the name in the packagelist -+ } - else - { - $provides = "provides"; # the name in the packagelist -Index: solenv/bin/modules/installer/globals.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v -retrieving revision 1.47 -diff -u -r1.47 globals.pm ---- solenv/bin/modules/installer/globals.pm 9 Nov 2005 09:10:01 -0000 1.47 -+++ solenv/bin/modules/installer/globals.pm 3 Dec 2005 22:26:52 -0000 -@@ -80,6 +80,7 @@ - $issolarispkgbuild = 0; - $issolarissparcbuild = 0; - $issolarisx86build = 0; -+ $isfreebsdpkgbuild = 0; - $unpackpath = ""; - $idttemplatepath = ""; - $idtlanguagepath = ""; - -Index: solenv/bin/modules/installer/parameter.pm -=================================================================== -RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v -retrieving revision 1.29 -diff -u -r1.29 parameter.pm ---- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 -@@ -304,6 +304,13 @@ - $installer::globals::epmoutpath = "packages"; - } - } -+ if ( $installer::globals::compiler =~ /unxfbsdi/ ) -+ { -+ if ( $installer::globals::packageformat eq "bsd" ) -+ { -+ $installer::globals::isfreebsdpkgbuild = 1; -+ } -+ } - - if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } - diff --git a/editors/openoffice.org-2.0/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk b/editors/openoffice.org-2.0/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk deleted file mode 100644 index 2c89e95a8cdb..000000000000 --- a/editors/openoffice.org-2.0/files/patch-jvmfwk+distributions+OpenOfficeorg+makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -Issuetracker : #i56951# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : javavendors_linux.xml can be used for FreeBSD as well. -javavendors_linux.xml can be used for FreeBSD as well. - ---- jvmfwk/distributions/OpenOfficeorg/makefile.mk Thu Sep 8 04:26:17 2005 -+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk Sat Oct 22 18:31:16 2005 -@@ -49,7 +49,7 @@ - .IF "$(GUI)"=="UNX" - .IF "$(OS)"=="MACOSX" - +-$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml --.ELIF "$(OS)"=="LINUX" -+.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - +-$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml - .ELSE - +-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml diff --git a/editors/openoffice.org-2.0/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx b/editors/openoffice.org-2.0/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx deleted file mode 100644 index c963d013cc07..000000000000 --- a/editors/openoffice.org-2.0/files/patch-jvmfwk+plugins+sunmajor+pluginlib+sunversion.cxx +++ /dev/null @@ -1,61 +0,0 @@ -Issuetracker : #i56953# -CWS : N/A -Author : <maho@openoffice.org> -Description : FreeBSD porting : do not hardcode pXX of Java version and FreeBSD native Java is always superior to Linux's one. - -1. we had been hard coding Java's version by p1, p2 ... etc. but apparently -it is not a good habit. in this patch we eleminate this. - -2. we'd better to use FreeBSD's native Java, and not GNU/Linux's ones if both are exist -in the system. We add 100 as micro version number, so that we treat FreeBSD's version of -java 1.4.1-p10 for example to 1.4.1_110. - ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Thu Sep 8 04:31:40 2005 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx Sat Oct 22 18:25:49 2005 -@@ -208,7 +208,16 @@ - return false; - #if defined(FREEBSD) - if (m_preRelease == Rel_FreeBSD) { -- m_nUpdateSpecial = *pCur; -+ pCur++; //elemnate `p' -+ if (pCur < pEnd && isdigit(*pCur)) -+ if (pCur < pEnd) -+ pCur ++; -+ int len = pCur - pLast -1; //elemenate `p' -+ if (len >= 127) -+ return false; -+ strncpy(buf, (pLast+1), len); //elemenate `p' -+ buf[len] = 0; -+ m_nUpdateSpecial = atoi(buf)+100; //hack for FBSD - return true; - } - #endif -@@ -249,27 +258,7 @@ - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; - #if defined (FREEBSD) -- else if (! strcmp(szRelease, "p1")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p2")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p3")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p4")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p5")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p6")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p7")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p8")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p9")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p10")) -- return Rel_FreeBSD; -- else if (! strcmp(szRelease, "p11")) -+ else if (! strncmp(szRelease, "p", 1)) - return Rel_FreeBSD; - #endif - else diff --git a/editors/openoffice.org-2.0/files/patch-libxmlsec+makefile.mk b/editors/openoffice.org-2.0/files/patch-libxmlsec+makefile.mk deleted file mode 100644 index 5735c62a3298..000000000000 --- a/editors/openoffice.org-2.0/files/patch-libxmlsec+makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ -Issuetracker : #i56954# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : Passing $ORIGIN to linker at libxmlsec project -We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case. - ---- libxmlsec/makefile.mk.org Tue Oct 25 15:00:10 2005 -+++ libxmlsec/makefile.mk Tue Oct 25 15:00:28 2005 -@@ -89,6 +89,9 @@ - .IF "$(OS)$(COM)"=="SOLARISC52" - LDFLAGS:=-Wl,-R'$$$$ORIGIN' - .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -+.IF "$(OS)$(COM)"=="FREEBSDGCC" -+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -+.ENDIF # "$(OS)$(COM)"=="FREEBSDGCC" - .EXPORT: LDFLAGS - .ENDIF - CONFIGURE_DIR= diff --git a/editors/openoffice.org-2.0/files/patch-np_sdk b/editors/openoffice.org-2.0/files/patch-np_sdk new file mode 100644 index 000000000000..0860582dc100 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-np_sdk @@ -0,0 +1,15 @@ +Index: np_sdk/mozsrc/makefile.mk +=================================================================== +RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v +retrieving revision 1.2.2.1 +diff -u -r1.2.2.1 makefile.mk +--- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 ++++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 +@@ -41,7 +41,6 @@ + # --- Settings ----------------------------------------------------- + + .INCLUDE : settings.mk +-SOLARINC= + JDKINCS= + + # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-2.0/files/patch-sdkoo b/editors/openoffice.org-2.0/files/patch-sdkoo deleted file mode 100644 index 6dfc9a5fb029..000000000000 --- a/editors/openoffice.org-2.0/files/patch-sdkoo +++ /dev/null @@ -1,64 +0,0 @@ -Issuetracker : #iXXXXX# -CWS : N/A -Author : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : building sdk fails for FreeBSD - -1. Build error -dmake sdkoo fails like: - -############################################################################## -... starting unpatched epm ... -... epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 | ... - -************************************************** -ERROR: ERROR: "epm -f bsd openoffice.org-sdk /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/listfile/en-US/epm_OpenOffice_SDK_gid_Module_Root_unxfbsd_SRC680__en-US.lst -v 2>&1 |"! -in function: call_epm -************************************************** - -************************************************** -ERROR: Saved logfile: /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/logging/en-US/log_SRC680__en-US.log -************************************************** -... cleaning the output tree ... -... removing directory /work/ports/editors/openoffice.org-2.0-devel/work/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/zip/en-US ... -Fri Nov 18 22:49:33 2005 (08:05 min.) -dmake: Error code 255, while making 'sdkoo_en-US.bsd' -'---* tg_merge.mk *---' -############################################################################## - -2. Reason why it fails: -since quoting for filename containing `$' produces an error - -tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/InstallationFinder\$StreamGobbler.class: Could not stat: No such file or directory -tar: opt/openoffice.org2.0_sdk/classes/com/sun/star/lib/loader/Loader\$CustomURLClassLoader.class: Could not stat: No such file or directory - -3. Solution - -For FreeBSD, we don't need quoting. We use printf for files names -instead of using qprintf, a function that treats quoting string. - ---- epm/epm-3.7.patch Sat Nov 19 10:21:34 2005 -+++ epm/epm-3.7.patch Sat Nov 19 10:22:23 2005 -@@ -586,3 +586,23 @@ - } - - --- 457,462 ---- -+ -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 -+*************** -+*** 234,240 **** -+ case 'c' : -+ case 'f' : -+ case 'l' : -+! qprintf(fp, "%s\n", file->dst + 1); -+ break; -+ } -+ } -+--- 243,249 ---- -+ case 'c' : -+ case 'f' : -+ case 'l' : -+! fprintf(fp, "%s\n", file->dst + 1); -+ break; -+ } -+ } diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index 02b0c8ad1400..000000000000 --- a/editors/openoffice.org-2.0/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,31 +0,0 @@ -Issuetracker : #i56956# -CWS : N/A -Author: : <maho@openoffice.org> (JCA) -Description : FreeBSD porting : catch up recent version of solenv/inc/unxlngi6.mk -catch up recent version of solenv/inc/unxlngi6.mk and STLPORT_VERSION is 450 in FreeBSD - ---- solenv/inc/unxfbsdi.mk Wed Oct 5 20:33:12 2005 -+++ solenv/inc/unxfbsdi.mk Mon Oct 24 11:13:39 2005 -@@ -45,7 +45,7 @@ - #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" - - # _PTHREADS is needed for the stl --CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -+CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 - - # enable visibility define in "sal/types.h" - .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -190,8 +190,13 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -+.IF "$(USE_STLP_DEBUG)" != "" -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -+.ELSE # "$(USE_STLP_DEBUG)" != "" - LIBSTLPORT=$(DYNAMIC) -lstlport_gcc - LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+.ENDIF # "$(USE_STLP_DEBUG)" != "" - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - |