summaryrefslogtreecommitdiff
path: root/editors/openoffice-3-devel/files
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2009-06-11 20:09:31 +0000
committerMaho Nakata <maho@FreeBSD.org>2009-06-11 20:09:31 +0000
commitd2dd0e42fe1c29bbb88e390eb0e1b083e4dfc30f (patch)
tree2685d6386907355df9c9ab4b3a498d8ee445bf10 /editors/openoffice-3-devel/files
parentLibrary net/libnet10 defines structures for contents of network packets. (diff)
Updaaate to DEV300_m50.
Funded by OpenOffice.org community.
Notes
Notes: svn path=/head/; revision=235595
Diffstat (limited to 'editors/openoffice-3-devel/files')
-rw-r--r--editors/openoffice-3-devel/files/patch-i10218132
1 files changed, 22 insertions, 10 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i102181 b/editors/openoffice-3-devel/files/patch-i102181
index 2e89167f154c..a074079aa43b 100644
--- a/editors/openoffice-3-devel/files/patch-i102181
+++ b/editors/openoffice-3-devel/files/patch-i102181
@@ -1,11 +1,23 @@
---- openssl/makefile.mk~ 2009-04-11 18:07:56.000000000 +0900
-+++ openssl/makefile.mk 2009-05-16 15:41:13.000000000 +0900
-@@ -65,7 +65,7 @@
- OUT2LIB += libcrypto.*
- OUT2INC += include/openssl/*
+--- openssl/makefile.mk.orig 2009-06-11 09:05:38.000000000 +0900
++++ openssl/makefile.mk 2009-06-11 20:30:14.000000000 +0900
+@@ -105,6 +105,20 @@
+ .ENDIF
+ .ENDIF
--.IF "$(OS)" == "LINUX"
-+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- PATCH_FILES=openssllnx.patch
- ADDITIONAL_FILES:= \
- libcrypto_OOo_0_9_8k.map \
++.IF "$(OS)" == "FREEBSD"
++ PATCH_FILES=openssllnx.patch
++ ADDITIONAL_FILES:= \
++ libcrypto_OOo_0_9_8k.map \
++ libssl_OOo_0_9_8k.map
++ .IF "$(CPU)" == "X"
++ CONFIGURE_ACTION=Configure BSD-x86_64
++ .ELSE
++ CONFIGURE_ACTION=Configure BSD-x86-elf
++ .ENDIF
++ # if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
++ #BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
++.ENDIF
++
+ .IF "$(OS)" == "WNT"
+
+ .IF "$(COM)"=="GCC"