Mon Oct 20 14:26:23 2008 UTC ()
Fix build with java option.


(hira)
diff -r1.6 -r1.7 pkgsrc/misc/openoffice3/distinfo
diff -r1.5 -r1.6 pkgsrc/misc/openoffice3/options.mk
diff -r1.4 -r1.5 pkgsrc/misc/openoffice3/patches/patch-du
cvs diff -r1.6 -r1.7 pkgsrc/misc/openoffice3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/20 12:30:16 1.6
+++ pkgsrc/misc/openoffice3/Attic/distinfo 2008/10/20 14:26:22 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.6 2008/10/20 12:30:16 hira Exp $ 1$NetBSD: distinfo,v 1.7 2008/10/20 14:26:22 hira Exp $
2 2
3SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a 3SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a
4RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d 4RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d
5Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes 5Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes
6SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542 6SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542
7RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d 7RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d
8Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes 8Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes
9SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97 9SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97
10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13 10RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13
11Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes 11Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes
12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = b8af1787bd4651c808d298e81ee797bf2b7ebdcd 12SHA1 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = b8af1787bd4651c808d298e81ee797bf2b7ebdcd
13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 10c8b58ade00cf22fdb699f38d60abee8e150436 13RMD160 (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 10c8b58ade00cf22fdb699f38d60abee8e150436
14Size (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 44882699 bytes 14Size (openoffice-3.0.0/OOo_3.0.0_src_system.tar.bz2) = 44882699 bytes
@@ -60,18 +60,18 @@ SHA1 (patch-cv) = 2e14a54d369a255ee39fce @@ -60,18 +60,18 @@ SHA1 (patch-cv) = 2e14a54d369a255ee39fce
60SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9 60SHA1 (patch-cw) = ba0a8da07bf6a25bb3e937f96e2827a70d70e9b9
61SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47 61SHA1 (patch-cx) = db69e17d908e82cedd8cc28208fc7afec0cb3e47
62SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee 62SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
63SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67 63SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
64SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176 64SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
65SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d 65SHA1 (patch-de) = e594e9a7a4bb442adc33757c71d9d875abafd24d
66SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0 66SHA1 (patch-dh) = 25d1c64a9531daf4a4f1d4fa616607b3eacfd4e0
67SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf 67SHA1 (patch-di) = 571b3fb1c65ab76e8bdace418654fff2d45406cf
68SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7 68SHA1 (patch-dj) = ca003c7964ad239fdd2406b0a3a76ae5e855d8d7
69SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74 69SHA1 (patch-dk) = 1f022fe11b4b1c6cb960f416724054954442ee74
70SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e 70SHA1 (patch-do) = c505e2e03912a068aa4666c8460b129447ec5a4e
71SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b 71SHA1 (patch-dp) = ce90ba6c2cce3af1ade0257fd42106ea8345661b
72SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75 72SHA1 (patch-dt) = 59964a31a8abbb324029653609b0decadbe03a75
73SHA1 (patch-du) = 57434c4c30bf1335aef089a9c267328a2ba6959a 73SHA1 (patch-du) = b14cb8c58eb9780dc76910495294f7bd9cd9ed4b
74SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405 74SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
75SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172 75SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
76SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292 76SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
77SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834 77SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
cvs diff -r1.5 -r1.6 pkgsrc/misc/openoffice3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/20 12:30:16 1.5
+++ pkgsrc/misc/openoffice3/Attic/options.mk 2008/10/20 14:26:22 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2008/10/20 12:30:16 hira Exp $ 1# $NetBSD: options.mk,v 1.6 2008/10/20 14:26:22 hira Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd 4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 java kde ooo-external-libwpd
5PKG_OPTIONS_OPTIONAL_GROUPS= browser 5PKG_OPTIONS_OPTIONAL_GROUPS= browser
6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey 6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey
7# The list from completelangiso in solenv/inc/postset.mk. 7# The list from completelangiso in solenv/inc/postset.mk.
8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \ 8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
9 cs cy da de dz el en-GB en-US en-ZA eo es et \ 9 cs cy da de dz el en-GB en-US en-ZA eo es et \
10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \ 10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \ 11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \ 12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \ 13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
14 ta-IN th tn tr ts tg ur-IN uk uz ve vi xh \ 14 ta-IN th tn tr ts tg ur-IN uk uz ve vi xh \
@@ -73,30 +73,31 @@ PLIST_VARS+= gtk2 @@ -73,30 +73,31 @@ PLIST_VARS+= gtk2
73PLIST.gtk2= yes 73PLIST.gtk2= yes
74CONFIGURE_ARGS+= --enable-gtk 74CONFIGURE_ARGS+= --enable-gtk
75.include "../../x11/gtk2/buildlink3.mk" 75.include "../../x11/gtk2/buildlink3.mk"
76.else 76.else
77CONFIGURE_ARGS+= --disable-gtk 77CONFIGURE_ARGS+= --disable-gtk
78.endif 78.endif
79 79
80.if !empty(PKG_OPTIONS:Mjava) 80.if !empty(PKG_OPTIONS:Mjava)
81USE_JAVA2= yes 81USE_JAVA2= yes
82DEPENDS+= apache-ant>=1.7.0:../../devel/apache-ant 82DEPENDS+= apache-ant>=1.7.0:../../devel/apache-ant
83CONFIGURE_ARGS+= --with-java --disable-mediawiki 83CONFIGURE_ARGS+= --with-java --disable-mediawiki
84 84
85# -rpath are missing from wip/jdk15. 85# -rpath are missing from wip/jdk15.
86JAVA_LIB_ROOT= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} 86JAVA_LIB_ROOT= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH}
87LIB.jawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT} 87LIB.jawt= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
88LIB.mawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt 88LIB.mawt= ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}/xawt
89CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt" 89
 90CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_LIB_ROOT}:${JAVA_LIB_ROOT}/xawt"
90 91
91# XXX: devel/apache-ant doesn't setup ${PREFIX}/bin/java. 92# XXX: devel/apache-ant doesn't setup ${PREFIX}/bin/java.
92CONFIGURE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java" 93CONFIGURE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java"
93MAKE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java" 94MAKE_ENV+= JAVACMD="${PKG_JAVA_HOME}/bin/java"
94 95
95# XXX 96# XXX
96LIB.awtlib= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT} 97LIB.awtlib= -L${JAVA_LIB_ROOT} ${COMPILER_RPATH_FLAG}${JAVA_LIB_ROOT}
97 98
98.include "../../mk/java-env.mk" 99.include "../../mk/java-env.mk"
99.include "../../mk/java-vm.mk" 100.include "../../mk/java-vm.mk"
100.else 101.else
101CONFIGURE_ARGS+= --without-java 102CONFIGURE_ARGS+= --without-java
102PKG_JAVA_HOME= 103PKG_JAVA_HOME=
cvs diff -r1.4 -r1.5 pkgsrc/misc/openoffice3/patches/Attic/patch-du (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/20 12:30:16 1.4
+++ pkgsrc/misc/openoffice3/patches/Attic/patch-du 2008/10/20 14:26:23 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-du,v 1.4 2008/10/20 12:30:16 hira Exp $ 1$NetBSD: patch-du,v 1.5 2008/10/20 14:26:23 hira Exp $
2 2
3--- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900 3--- solenv/inc/pkgsrc.mk.orig 2008-10-16 18:30:22.000000000 +0900
4+++ solenv/inc/pkgsrc.mk 2008-10-17 16:32:40.000000000 +0900 4+++ solenv/inc/pkgsrc.mk 2008-10-17 16:32:40.000000000 +0900
5@@ -0,0 +1,36 @@ 5@@ -0,0 +1,36 @@
6+# 6+#
7+# Settings for pkgsrc. 7+# Settings for pkgsrc.
8+# 8+#
9+ 9+
10+BERKELEYLIB="@LIB_db4@ -ldb4" 10+BERKELEYLIB="@LIB_db4@ -ldb4"
11+BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx" 11+BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx"
12+ 12+
13+EXPAT3RDLIB="@LIB_expat@ -lexpat" 13+EXPAT3RDLIB="@LIB_expat@ -lexpat"
14+EXPATASCII3RDLIB="@LIB_expat@ -lexpat" 14+EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
@@ -23,19 +23,19 @@ $NetBSD: patch-du,v 1.4 2008/10/20 12:30 @@ -23,19 +23,19 @@ $NetBSD: patch-du,v 1.4 2008/10/20 12:30
23+ZLIB3RDLIB="@LIB_zlib@ -lz" 23+ZLIB3RDLIB="@LIB_zlib@ -lz"
24+ 24+
25+STDLIBGUIMT+=${X11_LDFLAGS} 25+STDLIBGUIMT+=${X11_LDFLAGS}
26+STDSHLGUIMT+=${X11_LDFLAGS} 26+STDSHLGUIMT+=${X11_LDFLAGS}
27+ 27+
28+LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@ 28+LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@
29+LIB_ure=@COMPILER_RPATH_FLAG@@OO_LIBDIR@/../ure-link/lib 29+LIB_ure=@COMPILER_RPATH_FLAG@@OO_LIBDIR@/../ure-link/lib
30+LIB_jawt=@LIB_jawt@ 30+LIB_jawt=@LIB_jawt@
31+LIB_mawt=@LIB_mawt@ 31+LIB_mawt=@LIB_mawt@
32+ 32+
33+AWTLIB=${LIB_jawt} ${LIB_mawt} -ljawt 33+AWTLIB=${LIB_jawt} ${LIB_mawt} -ljawt
34+ 34+
35+# Add runtime search path ($ORIGIN cannot be used in pkgsrc). 35+# Add runtime search path ($ORIGIN cannot be used in pkgsrc).
36+LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt} 36+LINKFLAGS+= ${LIB_base} ${LIB_ure}
37+EXTRA_LINKFLAGS+= ${LIB_base} ${LIB_ure} ${LIB_jawt} ${LIB_mawt} 37+EXTRA_LINKFLAGS+= ${LIB_base} ${LIB_ure}
38+ 38+
39+# XXX: unoxml/source/rdf and libxmlsec don't use LINKFLAGS. 39+# XXX: unoxml/source/rdf and libxmlsec don't use LINKFLAGS.
40+REDLANDLIB+= ${LIB_base} ${LIB_ure} 40+REDLANDLIB+= ${LIB_base} ${LIB_ure}
41+xmlsec_LDFLAGS+= ${LIB_base} ${LIB_ure} 41+xmlsec_LDFLAGS+= ${LIB_base} ${LIB_ure}