- Support multiple lang-* options.

 - Set X11_LDFLAGS via configure.
 - Add missing MESSAGE file (from misc/openoffice).
 - Remove extra $NetBSD$ and trailing white space from patch-ch.

NOTE: Currently, you need 400MB free disk space per one lang-* option.

7 files changed, 64 insertions, 51 deletions

diff --git a/misc/openoffice2/MESSAGE b/misc/openoffice2/MESSAGE
new file mode 100644
index 00000000000..eb916b82c30
--- /dev/null
+++ b/misc/openoffice2/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/04/21 05:40:27 hira Exp $
+
+  OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}.
+
+  Before using this package for the first time, each user has to run
+  a setup program, which is automatically invoked at the first start.
+  Thereafter, OpenOffice can be started using the
+  ${PREFIX}/bin/soffice command.
+===========================================================================
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 11337282885..8a8f8c5404d 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/04/05 23:24:01 hira Exp $
+# $NetBSD: Makefile,v 1.15 2007/04/21 05:40:27 hira Exp $
 #
 
 OO_VER=			2.2.0
@@ -48,6 +48,7 @@ CONFLICTS+=		openoffice-linux-[0-9]*
 ONLY_FOR_PLATFORM=	NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		X_LIBS=${X11_LDFLAGS:M*:Q}
 CONFIGURE_ARGS+=	--with-use-shell=bash
 CONFIGURE_ARGS+=	--enable-binfilter
 CONFIGURE_ARGS+=	--enable-cairo
@@ -66,24 +67,18 @@ CONFIGURE_ARGS+=	--without-java --disable-odk --disable-gcjaot
 
 # NOTE: In this version, this value should be separated by space (comma
 #       causes build error).
-CONFIGURE_ARGS+=	--with-lang=${OPENOFFICE_LANGUAGE}
+CONFIGURE_ARGS+=	--with-lang=${OO_LANGS:Q}
 
 .include "options.mk"
 
 UNLIMIT_RESOURCES+=	datasize
 
-OPENOFFICE_VERSION=	OpenOffice.org${OO_VER}
+OO_RELEASE=		OpenOffice.org${OO_VER}
 PLIST_SRC+=		${WRKDIR}/.PLIST_SRC
-MESSAGE_SUBST+=		OPENOFFICE_VERSION=${OPENOFFICE_VERSION}
+MESSAGE_SUBST+=		OO_RELEASE=${OO_RELEASE}
 INSTALLATION_DIRS=	bin
 
-SUBST_CLASSES+=			X11_LDFLAGS
-SUBST_MESSAGE.X11_LDFLAGS=	Adding X11_LDFLAGS.
-SUBST_STAGE.X11_LDFLAGS=	post-patch
-SUBST_FILES.X11_LDFLAGS=	solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk
-SUBST_SED.X11_LDFLAGS=		-e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g'
-
-OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE}
+OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
 OO_PKGROOT=	/opt/openoffice.org2.2
 OO_PROGRAMS=	scalc sdraw simpress soffice swriter
 
@@ -95,29 +90,31 @@ do-build:
 	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "export PTHREAD_DIAGASSERT=Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
 
 post-build:
-	cd ${WRKDIR} &&				\
-	${RM} -fr opt &&			\
-	for f in ${OO_PKGPATH:Q}/*/*.sw; do	\
-		${TAR} xpf $$f;			\
+	cd ${WRKDIR} &&						\
+	${RM} -fr opt &&					\
+	for l in ${OO_LANGS}; do				\
+		for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do	\
+			${TAR} xpfk $$f;			\
+		done;						\
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${OPENOFFICE_VERSION}
-	cd ${WRKDIR}${OO_PKGROOT} &&					\
-	${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OPENOFFICE_VERSION} -
-	for f in ${OO_PROGRAMS}; do					\
-		${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/$$f	\
-			${PREFIX}/bin/$$f;				\
+	${INSTALL_DATA_DIR} ${PREFIX}/${OO_RELEASE}
+	cd ${WRKDIR}${OO_PKGROOT} &&				\
+	${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OO_RELEASE} -
+	for f in ${OO_PROGRAMS}; do				\
+		${LN} -sf ${PREFIX}/${OO_RELEASE}/program/$$f	\
+			${PREFIX}/bin/$$f;			\
 	done
 
 post-install:
-	cd ${PREFIX} &&							\
-	${FIND} ${OPENOFFICE_VERSION} \! -type d -print |		\
-	${SORT} > ${PLIST_SRC} &&					\
-	${FIND} ${OPENOFFICE_VERSION} -type d -print | ${SORT} -r |	\
+	cd ${PREFIX} &&						\
+	${FIND} ${OO_RELEASE} \! -type d -print |		\
+	${SORT} > ${PLIST_SRC} &&				\
+	${FIND} ${OO_RELEASE} -type d -print | ${SORT} -r |	\
 	${AWK} '{print("@dirrm "$$1)}' >> ${PLIST_SRC}
-	for f in ${OO_PROGRAMS}; do					\
-		${ECHO} bin/$$f >> ${PLIST_SRC};			\
+	for f in ${OO_PROGRAMS}; do				\
+		${ECHO} bin/$$f >> ${PLIST_SRC};		\
 	done
 
 # everything specific to your OS/Arch goes into its own Makefile
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 5d4bd196acd..92c2a3f8755 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/04/20 14:44:11 hira Exp $
+$NetBSD: distinfo,v 1.15 2007/04/21 05:40:27 hira Exp $
 
 SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
 RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
@@ -22,8 +22,8 @@ SHA1 (patch-ae) = eec39a887ad19d3a8ff0a26fab7ea6981915eadd
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = 1d54fe3fd237ff053d14626f9a45ef393c90323f
 SHA1 (patch-ai) = eb985085a36647675e3f436e192847f67b5dec8c
-SHA1 (patch-aj) = 740b8829c4f480db0989302231b5c031e2c141e7
-SHA1 (patch-ak) = 2e356501dac8ace8932f4648ca4073cc41188dea
+SHA1 (patch-aj) = f18266821545da2d37e589a0a7137d14cd19d87e
+SHA1 (patch-ak) = 7775257ed056f608da3b43b0d9bb146f61e2a438
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -57,6 +57,6 @@ SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 9d01592c69f0ba734ff488980c475a1b768bc229
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 4a305872dc6f0e88ebd421232b566fc4c1fa0e3d
+SHA1 (patch-ch) = bcfeb99318a16e83f2e54fb94d275224c67182fb
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
 SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index fe7d54ecd4b..76813d3267e 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2007/04/20 14:44:11 hira Exp $
+# $NetBSD: options.mk,v 1.9 2007/04/21 05:40:27 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde
-PKG_OPTIONS_REQUIRED_GROUPS=	browser lang
+PKG_OPTIONS_REQUIRED_GROUPS=	browser
 PKG_OPTIONS_GROUP.browser=	firefox # seamonkey firefox-gtk1 seamonkey-gtk1
 OO_SUPPORTED_LANGUAGES=		en-US af as-IN be-BY bg br bs ca cs cy da de \
 				el en-GB en-ZA eo es et fa fi fr ga gu-IN he \
@@ -12,7 +12,7 @@ OO_SUPPORTED_LANGUAGES=		en-US af as-IN be-BY bg br bs ca cs cy da de \
 				ta-IN te-IN tg th ti-ER tn tr ts uk ur-IN ve \
 				vi xh zh-CN zh-TW zu
 .for l in ${OO_SUPPORTED_LANGUAGES}
-PKG_OPTIONS_GROUP.lang+=	lang-${l}
+PKG_SUPPORTED_OPTIONS+=		lang-${l}
 .endfor
 PKG_SUGGESTED_OPTIONS=		gtk2 lang-en-US firefox
 PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
@@ -20,7 +20,10 @@ PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-OPENOFFICE_LANGUAGE=		${PKG_OPTIONS:Mlang-*:S/^lang-//1}
+.for l in ${PKG_OPTIONS:Mlang-*}
+OO_LANGS+=	${l:S/^lang-//1}
+.endfor
+OO_LANGS?=	en-US
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 CONFIGURE_ARGS+=	--with-system-mozilla --with-firefox
diff --git a/misc/openoffice2/patches/patch-aj b/misc/openoffice2/patches/patch-aj
index d82581c28fe..920be58e79c 100644
--- a/misc/openoffice2/patches/patch-aj
+++ b/misc/openoffice2/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2007/03/04 13:11:19 hira Exp $
+$NetBSD: patch-aj,v 1.3 2007/04/21 05:40:27 hira Exp $
 
---- solenv/inc/unxbsdi2.mk.orig	2006-12-02 02:57:07.000000000 +0900
-+++ solenv/inc/unxbsdi2.mk	2007-02-23 20:49:52.000000000 +0900
+--- solenv/inc/unxbsdi2.mk.orig	2006-07-06 07:00:41.000000000 +0900
++++ solenv/inc/unxbsdi2.mk	2007-04-21 03:20:50.000000000 +0900
 @@ -37,7 +37,7 @@
  ASM=
  AFLAGS=
@@ -39,13 +39,11 @@ $NetBSD: patch-aj,v 1.2 2007/03/04 13:11:19 hira Exp $
  
  # linker flags for optimization (symbol hashtable)
  # for now, applied to symbol scoped libraries, only
-@@ -159,17 +160,20 @@
+@@ -159,17 +160,18 @@
  STDSLOGUI=
  STDOBJCUI=
  STDSLOCUI=
 +STDOBJVCL=$(L)$/salmain.o
-+
-+X11_LDFLAGS=@X11_LDFLAGS@
  
  # libraries for linking applications
 -STDLIBCUIST=-lm
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
index 4ecb985e3e7..8d75d713a41 100644
--- a/misc/openoffice2/patches/patch-ak
+++ b/misc/openoffice2/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2007/04/05 23:24:01 hira Exp $
+$NetBSD: patch-ak,v 1.4 2007/04/21 05:40:27 hira Exp $
 
 --- config_office/set_soenv.in.orig	2007-01-19 21:55:33.000000000 +0900
-+++ config_office/set_soenv.in	2007-04-06 08:14:02.000000000 +0900
++++ config_office/set_soenv.in	2007-04-21 03:17:35.000000000 +0900
 @@ -39,7 +39,7 @@
  #--------------------------------------------------------
  #
@@ -46,3 +46,12 @@ $NetBSD: patch-ak,v 1.3 2007/04/05 23:24:01 hira Exp $
  }
  elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
  {  $SOLARLIB          = $L.$par_dir.$LIB.
+@@ -1531,6 +1539,8 @@
+ ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
+ }
+ ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
++# Should be renamed?
++ToFile( "X11_LDFLAGS",       "@X_LIBS@",           "e" );
+ ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
+ ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
+ ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch
index 6eefecbbe86..e76dc1d80c1 100644
--- a/misc/openoffice2/patches/patch-ch
+++ b/misc/openoffice2/patches/patch-ch
@@ -1,9 +1,8 @@
-$NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
+$NetBSD: patch-ch,v 1.2 2007/04/21 05:40:27 hira Exp $
 
---- solenv/inc/unxbsdi3.mk.orig	2007-04-05 10:28:46.000000000 +0900
-+++ solenv/inc/unxbsdi3.mk	2007-04-05 10:28:43.000000000 +0900
-@@ -0,0 +1,183 @@
-+# $NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
+--- solenv/inc/unxbsdi3.mk.orig	2007-04-21 03:03:25.000000000 +0900
++++ solenv/inc/unxbsdi3.mk	2007-04-21 03:21:29.000000000 +0900
+@@ -0,0 +1,179 @@
 +#
 +# mk file for NetBSD/i386 with gcc 3.4.x and higher.
 +#
@@ -144,8 +143,6 @@ $NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
 +STDSLOCUI=
 +STDOBJVCL=$(L)$/salmain.o
 +
-+X11_LDFLAGS=@X11_LDFLAGS@
-+
 +# libraries for linking applications
 +STDLIBCUIST=-lm -lc -lgcc_s -lstdc++
 +STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc -lgcc_s -lstdc++
@@ -185,4 +182,3 @@ $NetBSD: patch-ch,v 1.1 2007/04/05 23:26:13 hira Exp $
 +DLLPOSTFIX=bi
 +DLLPRE=lib
 +DLLPOST=.so
-+