diff options
| author | maho <maho@FreeBSD.org> | 2007-02-13 12:09:33 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2007-02-13 12:09:33 +0800 |
| commit | e3ef515e31c7e52799b3e5a6174dfa4151c78442 (patch) | |
| tree | c77d6cabd37e68d1e0549a23dbdf8517ea2dfe69 | |
| parent | db42fe53b74ca9e9a8ef836367e886433a226e5f (diff) | |
| download | freebsd-ports-graphics-e3ef515e31c7e52799b3e5a6174dfa4151c78442.tar.gz freebsd-ports-graphics-e3ef515e31c7e52799b3e5a6174dfa4151c78442.tar.zst freebsd-ports-graphics-e3ef515e31c7e52799b3e5a6174dfa4151c78442.zip | |
Unbreak for amd64. A workaround is found for #i74401.
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i74401 | 16 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i74401 | 16 |
4 files changed, 34 insertions, 2 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 519612b8549..68e940cee1b 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 00000000000..c43b5e9e9bb --- /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 \ diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 519612b8549..68e940cee1b 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-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-3-RC/files/patch-i74401 b/editors/openoffice.org-3-RC/files/patch-i74401 new file mode 100644 index 00000000000..c43b5e9e9bb --- /dev/null +++ b/editors/openoffice.org-3-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 \ |