mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

* Add evolution2 support [1]

Browse Source 
* Fix typo [2]
* Fix installation [3]

PR:              105400 [2]
Suggested by:   Vizo Allman <vizoster@gmail.com> [1], Jack L. <xxjack12xx@gmail.
com> [3]
Submitted by:           Alexey Shuvaev [2]
This commit is contained in:
Maho Nakata 2006-11-12 22:11:35 +00:00
parent 9b9dd5d849
commit 3633c37e95
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=177141
23 changed files with 91 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/openoffice-3-devel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
PORTVERSION?= 2.2.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
http://openoffice.lunarshells.com/sources/ \
@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 191
RELEASE_NR= 2.2
MILESTONE?= 193
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20061101
SNAPDATE= 20061110
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.if defined(WITH_GNUGCJ)
GCCVER=41
BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
.else
.if ${ARCH} == amd64
GCCVER=41
@ -257,7 +257,7 @@ post-install:
-e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applications/${EXECBASE}
@${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \

6
editors/openoffice-3-devel/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13
SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753
SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653
MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3
SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947
SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144

11
editors/openoffice-3-devel/files/Makefile.knobs
View File

@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs
USE_GNOME+= gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
USE_GNOME+= glib20
.endif
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
.else
@ -120,6 +126,11 @@ pre-fetch:
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
@${ECHO}
@${ECHO} "NOTICE:"

2
editors/openoffice-3-devel/files/openoffice.org-wrapper
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`

34
editors/openoffice-3-devel/files/patch-i71039
View File

@ -1,34 +0,0 @@
--- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006
+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006
@@ -265,7 +265,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
virtual void WriteData(SvStream& rOut);
--- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006
+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006
@@ -323,7 +323,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
//BFS01virtual void WriteData(SvStream& rOut);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

14
editors/openoffice.org-2-devel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
PORTVERSION?= 2.2.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
http://openoffice.lunarshells.com/sources/ \
@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 191
RELEASE_NR= 2.2
MILESTONE?= 193
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20061101
SNAPDATE= 20061110
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.if defined(WITH_GNUGCJ)
GCCVER=41
BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
.else
.if ${ARCH} == amd64
GCCVER=41
@ -257,7 +257,7 @@ post-install:
-e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applications/${EXECBASE}
@${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \

6
editors/openoffice.org-2-devel/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13
SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753
SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653
MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3
SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947
SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144

11
editors/openoffice.org-2-devel/files/Makefile.knobs
View File

@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs
USE_GNOME+= gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
USE_GNOME+= glib20
.endif
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
.else
@ -120,6 +126,11 @@ pre-fetch:
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
@${ECHO}
@${ECHO} "NOTICE:"

2
editors/openoffice.org-2-devel/files/generate.pl
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $
print "#!/bin/csh\n";
print "make deinstall clean\n";

2
editors/openoffice.org-2-devel/files/openoffice.org-wrapper
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`

34
editors/openoffice.org-2-devel/files/patch-i71039
View File

@ -1,34 +0,0 @@
--- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006
+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006
@@ -265,7 +265,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
virtual void WriteData(SvStream& rOut);
--- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006
+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006
@@ -323,7 +323,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
//BFS01virtual void WriteData(SvStream& rOut);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

14
editors/openoffice.org-3-devel/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
PORTVERSION?= 2.2.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
http://openoffice.lunarshells.com/sources/ \
@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 191
RELEASE_NR= 2.2
MILESTONE?= 193
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20061101
SNAPDATE= 20061110
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.if defined(WITH_GNUGCJ)
GCCVER=41
BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
.else
.if ${ARCH} == amd64
GCCVER=41
@ -257,7 +257,7 @@ post-install:
-e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applications/${EXECBASE}
@${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \

6
editors/openoffice.org-3-devel/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13
SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753
SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653
MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3
SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947
SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144

11
editors/openoffice.org-3-devel/files/Makefile.knobs
View File

@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs
USE_GNOME+= gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
USE_GNOME+= glib20
.endif
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
.else
@ -120,6 +126,11 @@ pre-fetch:
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
@${ECHO}
@${ECHO} "NOTICE:"

2
editors/openoffice.org-3-devel/files/generate.pl
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $
print "#!/bin/csh\n";
print "make deinstall clean\n";

2
editors/openoffice.org-3-devel/files/openoffice.org-wrapper
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`

34
editors/openoffice.org-3-devel/files/patch-i71039
View File

@ -1,34 +0,0 @@
--- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006
+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006
@@ -265,7 +265,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
virtual void WriteData(SvStream& rOut);
--- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006
+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006
@@ -323,7 +323,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
//BFS01virtual void WriteData(SvStream& rOut);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};

14
editors/openoffice.org-vcltesttool/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME?= openoffice.org
PORTVERSION?= 2.0.${SNAPDATE}
PORTVERSION?= 2.2.${SNAPDATE}
CATEGORIES+= editors java
MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \
http://openoffice.lunarshells.com/sources/ \
@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again
.endif
CODELINE= 680
RELEASE_NR= 2.0
MILESTONE?= 191
RELEASE_NR= 2.2
MILESTONE?= 193
OOOTAG?= SRC680_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
SNAPDATE= 20061101
SNAPDATE= 20061110
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org2.0
@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX}
.if defined(WITH_GNUGCJ)
GCCVER=41
BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat
.else
.if ${ARCH} == amd64
GCCVER=41
@ -257,7 +257,7 @@ post-install:
-e '/^Exec/s/printeradmin/spadmin/' \
${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
@{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
${PREFIX}/share/applications/${EXECBASE}
@${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST}
@for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \

6
editors/openoffice.org-vcltesttool/distinfo
View File

@ -1,6 +1,6 @@
MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13
SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753
SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653
MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3
SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947
SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471
MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice.org2.0/unowinreg.dll) = 6144

11
editors/openoffice.org-vcltesttool/files/Makefile.knobs
View File

@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs
USE_GNOME+= gnomevfs2
.endif
.if defined(WITH_EVOLUTION2)
CONFIGURE_ARGS+= --enable-evolution2=yes
.else
USE_GNOME+= glib20
.endif
.if defined(ALL_LOCALIZED_LANGS)
CONFIGURE_ARGS+= --with-lang=ALL
.else
@ -120,6 +126,11 @@ pre-fetch:
@${ECHO}
@${ECHO} "You can compile OOo with gpc instead of libart by"
@${ECHO} "make -DWITH_GPC"
.endif
.if !defined(WITH_EVOLUTION2)
@${ECHO}
@${ECHO} "You can compile OOo with evolution2 support by"
@${ECHO} "make -DWITH_EVOLUTION2"
.endif
@${ECHO}
@${ECHO} "NOTICE:"

2
editors/openoffice.org-vcltesttool/files/generate.pl
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl
# generate full build shell script for OpenOffice.org
# Whom: Maho Nakata <maho@FreeBSD.org>
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $
print "#!/bin/csh\n";
print "make deinstall clean\n";

2
editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $
# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $
oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/
program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'`

34
editors/openoffice.org-vcltesttool/files/patch-i71039
View File

@ -1,34 +0,0 @@
--- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006
+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006
@@ -265,7 +265,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
virtual void WriteData(SvStream& rOut);
--- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006
+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006
@@ -323,7 +323,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
//BFS01virtual void WriteData(SvStream& rOut);
--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005
+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};