diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-02-13 04:09:33 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-02-13 04:09:33 +0000 |
| commit | 0acc196888ad9b649f3187a64262d728f1a86eda (patch) | |
| tree | 836fddf8e12894afa17ca65d5fab2bec606c7a3a /editors/openoffice.org-2-RC | |
| parent | - Update to 1.06 (diff) | |
Unbreak for amd64. A workaround is found for #i74401.
Notes
Notes:
svn path=/head/; revision=185065
Diffstat (limited to 'editors/openoffice.org-2-RC')
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i74401 | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 519612b85493..68e940cee1b0 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -63,7 +63,7 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -ONLY_FOR_ARCHS= i386 # amd64 +ONLY_FOR_ARCHS= i386 amd64 .if ${ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} diff --git a/editors/openoffice.org-2-RC/files/patch-i74401 b/editors/openoffice.org-2-RC/files/patch-i74401 new file mode 100644 index 000000000000..c43b5e9e9bb9 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-i74401 @@ -0,0 +1,16 @@ +? basctl/unxfbsdx.pro +Index: basctl/source/dlged/makefile.mk +=================================================================== +RCS file: /cvs/script/basctl/source/dlged/makefile.mk,v +retrieving revision 1.7 +diff -u -r1.7 makefile.mk +--- basctl/source/dlged/makefile.mk 2 Jan 2007 15:51:33 -0000 1.7 ++++ basctl/source/dlged/makefile.mk 13 Feb 2007 00:06:27 -0000 +@@ -59,6 +59,7 @@ + $(SLO)$/managelang.obj + + EXCEPTIONSFILES=$(SLO)$/dlged.obj \ ++ $(SLO)$/dlgedobj.obj \ + $(SLO)$/dlgedfac.obj \ + $(SLO)$/dlgedlist.obj \ + $(SLO)$/dlgedclip.obj \ |