1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

forgot to commit two patches...

This commit is contained in:
Maho Nakata 2006-03-15 06:18:59 +00:00
parent 69bf9cada9
commit 724a93196c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157127
12 changed files with 6708 additions and 0 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
--- config_office/configure~ Sat Mar 4 16:12:31 2006
+++ config_office/configure Sat Mar 4 16:12:45 2006
@@ -7544,7 +7544,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcjawt $LIBS"
+LIBS="-lgcjawt -pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
http://qa.openoffice.org/issues/show_bug.cgi?id=63095
Index: stoc/source/javaloader/makefile.mk
===================================================================
RCS file: /cvs/udk/stoc/source/javaloader/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- stoc/source/javaloader/makefile.mk 8 Sep 2005 07:57:58 -0000 1.16
+++ stoc/source/javaloader/makefile.mk 13 Mar 2006 00:53:41 -0000
@@ -59,7 +59,8 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(JVMACCESSLIB)
+ $(JVMACCESSLIB) \
+ -L/usr/local/lib -liconv
SHL1VERSIONMAP = javaloader.map
SHL1DEPN=