Apply some fixes and improvements from misc/openoffice3.

  - Change installation directory.
  - Reduce usage of ${WRKDIR}.
  - Use language packs to install multiple languages.
  - Install desktop files as symbolic links.
  - Pass MAKE_JOBS to dmake.
  - Fix build with PKG_DEVELOPER=yes (add missing rpath flag).
  - Fix PLIST without gtk2 option.
  - Fix browser plugin.
  - Fix open-url with firefox3 and seamonkey.
  - Shut up tar warning (remove leading /).
  - Use system openssl.
  - Use system icu.
  - Add lang-all option.

17 files changed, 331 insertions, 156 deletions

diff --git a/misc/openoffice2/MESSAGE b/misc/openoffice2/MESSAGE
index eb916b82c30..41b7e8df982 100644
--- a/misc/openoffice2/MESSAGE
+++ b/misc/openoffice2/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2007/04/21 05:40:27 hira Exp $
+$NetBSD: MESSAGE,v 1.2 2008/10/31 11:02:55 hira Exp $
 
-  OpenOffice has now been installed in ${PREFIX}/${OO_RELEASE}.
+  OpenOffice has now been installed in ${OO_PREFIX}.
 
   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.
+  ${DESTDIR}${PREFIX}/bin/soffice command.
 ===========================================================================
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index f71c6c56f10..4fed956946e 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2008/10/31 11:00:50 hira Exp $
+# $NetBSD: Makefile,v 1.55 2008/10/31 11:02:55 hira Exp $
 #
 
 OO_VER=			2.4.2
@@ -64,17 +64,21 @@ REPLACE_PYTHON+=	scripting/source/pyprov/mailmerge.py
 SUBST_CLASSES+=		lib
 SUBST_STAGE.lib=	post-patch
 SUBST_MESSAGE.lib=	Adding library paths
-SUBST_FILES.lib=	solenv/inc/libs.mk
-.for pkg in db4 expat jpeg zlib
-SUBST_SED.lib+=		-e 's,@BLNK_PREFIX_${pkg}@,${BUILDLINK_PREFIX.${pkg}},g'
-LIBS+=			-L${BUILDLINK_PREFIX.${pkg}}/lib
-LIBS+=			${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+SUBST_FILES.lib=	solenv/inc/pkgsrc.mk
+SUBST_SED.lib+=		-e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_SED.lib+=		-e 's|@OO_LIBDIR@|${OO_PREFIX}/program|g'
+.for pkg in db4 expat icu jpeg zlib
+LIB.${pkg}=		-L${BUILDLINK_PREFIX.${pkg}}/lib
+LIB.${pkg}+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
+SUBST_SED.lib+=		-e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
+LIBS+=			${LIB.${pkg}}
 .endfor
 
 CONFIGURE_ENV+=		LIBS=${LIBS:O:u:Q}
 CONFIGURE_ENV+=		X_LIBS=${X11_LDFLAGS:M*:Q}
 CONFIGURE_ENV+=		BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ENV+=		BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
+CONFIGURE_ENV+=		USE_BUILTIN_openssl=${USE_BUILTIN.openssl}
 
 CONFIGURE_ARGS+=	--with-use-shell=bash
 CONFIGURE_ARGS+=	--enable-binfilter
@@ -85,10 +89,12 @@ CONFIGURE_ARGS+=	--with-system-curl
 CONFIGURE_ARGS+=	--with-system-db
 CONFIGURE_ARGS+=	--with-system-expat
 CONFIGURE_ARGS+=	--with-system-freetype
+CONFIGURE_ARGS+=	--with-system-icu
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-libxml2
 CONFIGURE_ARGS+=	--with-system-libxslt
 CONFIGURE_ARGS+=	--with-system-neon
+CONFIGURE_ARGS+=	--with-system-openssl
 CONFIGURE_ARGS+=	--with-system-python
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-dynamic-xinerama
@@ -113,13 +119,16 @@ UNLIMIT_RESOURCES+=	datasize
 OO_RELEASE=		OpenOffice.org${OO_VER}
 PLIST_SRC=		${PKGDIR}/PLIST
 PLIST_SRC+=		${WRKDIR}/PLIST
-MESSAGE_SUBST+=		OO_RELEASE=${OO_RELEASE}
-INSTALLATION_DIRS=	bin ${OO_RELEASE} share/applications
+PLIST_SUBST+=		OO_UNXNAME=${OO_UNXNAME}
+MESSAGE_SUBST+=		DESTDIR=${DESTDIR}
+MESSAGE_SUBST+=		OO_PREFIX=${OO_PREFIX}
+INSTALLATION_DIRS=	bin lib/${OO_RELEASE} share/applications
 
 OO_UNXNAME=	openoffice.org2.4
 OO_PKGPATH=	${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
-OO_PKGROOT=	/opt/${OO_UNXNAME}
+OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install
 OO_PROGRAMS=	scalc sdraw simpress soffice swriter unopkg
+OO_PREFIX=	${DESTDIR}${PREFIX}/lib/${OO_RELEASE}
 
 post-extract:
 	cd ${WRKSRC}/bridges/source/cpp_uno &&			\
@@ -128,48 +137,45 @@ post-extract:
 	cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
 
 do-build:
-	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all"
+	${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake openoffice_${OO_BASELANG} && dmake ooolanguagepack"
 
 post-build:
-	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
-	cd ${WRKDIR} &&						\
-	rm -fr xdg &&						\
-	mv opt/${OO_UNXNAME}/share/xdg .
-	cd ${WRKDIR}${OO_PKGROOT} &&				\
-	chmod ${SHAREMODE} program/hid.lst program/testtoolrc
 	${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}
-	${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/soffice \"\$$@\""	\
+	${ECHO} "exec ${OO_PREFIX}/program/soffice \"\$$@\""	\
 		>> ${WRKDIR}/${OO_UNXNAME}
 	${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin
-	${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/spadmin"	\
+	${ECHO} "exec ${OO_PREFIX}/program/spadmin"		\
 		>> ${WRKDIR}/${OO_UNXNAME}-printeradmin
 
 do-install:
-	cd ${WRKDIR}${OO_PKGROOT} &&				\
-	tar cf - . | tar Cxpf ${DESTDIR}${PREFIX}/${OO_RELEASE} -
+	cd ${OO_PREFIX} &&					\
+	for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do	\
+		tar xpf $$f;					\
+	done;
+	for lang in ${OO_LANGPACKS}; do				\
+		for f in ${OO_LANGPACKPATH:Q}/$$lang/*/*.sw; do	\
+			tar xpf $$f;				\
+		done;						\
+	done
+	for d in ${OO_PREFIX}/share/xdg/*; do			\
+		ln -s $$d ${DESTDIR}${PREFIX}/share/applications;	\
+	done
+	cd ${OO_PREFIX}/program &&				\
+	chmod ${SHAREMODE} hid.lst testtoolrc
 	for f in ${OO_PROGRAMS}; do				\
-		ln -sf ${DESTDIR}${PREFIX}/${OO_RELEASE}/program/$$f	\
-			${DESTDIR}${PREFIX}/bin/$$f;			\
+		ln -sf ${OO_PREFIX}/program/$$f			\
+			${DESTDIR}${PREFIX}/bin/$$f;		\
 	done
-	${INSTALL_DATA} ${WRKDIR}/xdg/* ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin	\
 		${DESTDIR}${PREFIX}/bin
 
 post-install:
 	cd ${DESTDIR}${PREFIX} &&				\
-	find ${OO_RELEASE} \! -type d -print |			\
+	find lib/${OO_RELEASE} \! -type d -print |		\
 	sort > ${WRKDIR}/PLIST &&				\
-	find ${OO_RELEASE} -type d -print | sort -r |		\
+	find lib/${OO_RELEASE} -type d -print | sort -r |	\
 	awk '{print("@dirrm "$$1)}' >> ${WRKDIR}/PLIST
-	${ECHO} bin/${OO_UNXNAME} >> ${WRKDIR}/PLIST
-	${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${WRKDIR}/PLIST
 
 # OS specific Makefile
 .if exists(Makefile.${OPSYS})
@@ -187,7 +193,9 @@ post-install:
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/misc/openoffice2/PLIST b/misc/openoffice2/PLIST
index 43397d2c754..4f9cc614a10 100644
--- a/misc/openoffice2/PLIST
+++ b/misc/openoffice2/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2008/09/20 19:01:55 hira Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/31 11:02:55 hira Exp $
 bin/scalc
 bin/sdraw
 bin/simpress
 bin/soffice
 bin/swriter
 bin/unopkg
+bin/${OO_UNXNAME}
+bin/${OO_UNXNAME}-printeradmin
 share/applications/base.desktop
 share/applications/calc.desktop
 share/applications/draw.desktop
@@ -12,5 +14,5 @@ share/applications/extension.desktop
 share/applications/impress.desktop
 share/applications/math.desktop
 share/applications/printeradmin.desktop
-share/applications/qstart.desktop
+${PLIST.gtk2}share/applications/qstart.desktop
 share/applications/writer.desktop
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 8a5ee11f7bd..ab0582105d6 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2008/10/31 11:00:50 hira Exp $
+$NetBSD: distinfo,v 1.48 2008/10/31 11:02:55 hira Exp $
 
 SHA1 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 1c7f652c71ad3364a98d79d4f6751db00c7daa99
 RMD160 (openoffice-2.4.2/OOo_2.4.2_src_binfilter.tar.bz2) = 09662444f359f86bb7eeec0c035ae29360e989e5
@@ -26,7 +26,7 @@ SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 9abaa68d6d48d69273c5f49c25e646de3abf7658
+SHA1 (patch-ba) = 1cc6fcc5ae1964bab7bf0be281ecc33297aba1c6
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
@@ -41,30 +41,32 @@ SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
 SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
 SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = b2402ee86620726d5628f4bd5ebaec2c2a29726b
-SHA1 (patch-br) = 5ffb7dd1e313ef0e6fc65da7c4380244840d80ca
+SHA1 (patch-bq) = 486c7e8198e2d8342e4472871bb31fc0b1321286
 SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
 SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = be68bf0e05b2d80102fb098f703bf80bb4fa6abc
+SHA1 (patch-ch) = 751f14379d9274690c3f6aa0fe30322af2822e1f
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 55f2296e74c80f32ea548d38c4bbd9114e403fd3
+SHA1 (patch-cs) = 01e2cb3ac9eab523540bd6d388081cccc425e204
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
 SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
 SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
 SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
-SHA1 (patch-cx) = 1c2efe192b0535ff6b2dc59e6a138c9931e6e946
+SHA1 (patch-cx) = b718aa55917eaf42d4d4868cab46503e6c8c538d
 SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-da) = c2c9332dcf22d2d201215813ac9fc7e7ac401c6d
 SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
 SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
 SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
-SHA1 (patch-dy) = 12d93711aa31d7deeb50022cc88cc7c243a098dd
+SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
+SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
+SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
+SHA1 (patch-ec) = 05f45563ab1f27984e81945a4ea2ddd9e40b16ac
+SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 0d9fe89b50b..54428e128d1 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2008/10/01 22:30:35 hira Exp $
+# $NetBSD: options.mk,v 1.21 2008/10/31 11:02:55 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd
@@ -12,7 +12,7 @@ OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
 				nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
 				rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
 				ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
-				zh-TW zu
+				zh-TW zu all
 .for l in ${OO_SUPPORTED_LANGUAGES}
 PKG_SUPPORTED_OPTIONS+=		lang-${l}
 .endfor
@@ -22,10 +22,19 @@ PKG_OPTIONS_LEGACY_OPTS+=	gnome-vfs:gnome
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.for l in ${PKG_OPTIONS:Mlang-*}
-OO_LANGS+=	${l:S/^lang-//1}
-.endfor
+.if !empty(PKG_OPTIONS:Mlang-all)
+OO_LANGS=	ALL
+OO_BASELANG=	en-US
+OO_LANGPACKS=	${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
+.else
+.  for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
+OO_LANGS+=	${lang}
+OO_BASELANG?=	${lang} # Get first one.
+.  endfor
+.endif
 OO_LANGS?=	en-US
+OO_BASELANG?=	en-US
+OO_LANGPACKS?=	${OO_LANGS:S/${OO_BASELANG}//1}
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 CONFIGURE_ARGS+=	--with-system-mozilla=firefox
@@ -47,6 +56,12 @@ CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
 
+SUBST_CLASSES+=		browser
+SUBST_STAGE.browser=	post-patch
+SUBST_MESSAGE.browser=	Adding MOZ_FLAVOUR
+SUBST_FILES.browser=	shell/source/unix/misc/open-url.sh
+SUBST_SED.browser+=	-e 's,@MOZ_FLAVOUR@,${MOZ_FLAVOUR},g'
+
 .if !empty(PKG_OPTIONS:Mooo-external-libwpd)
 CONFIGURE_ARGS+=	--with-system-libwpd
 .include "../../converters/libwpd/buildlink3.mk"
@@ -68,7 +83,9 @@ CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-evolution2
 CONFIGURE_ARGS+=	--disable-gnome-vfs --disable-evolution2
 .endif
 
+PLIST_VARS+=		gtk2
 .if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.gtk2=		yes
 CONFIGURE_ARGS+=	--enable-gtk
 .include "../../x11/gtk2/buildlink3.mk"
 .else
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index 1a3964fc2ae..5ed353e5594 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.13 2008/09/30 23:14:18 hira Exp $
+$NetBSD: patch-ba,v 1.14 2008/10/31 11:02:55 hira Exp $
 
 --- config_office/configure.orig	2008-05-21 01:28:55.000000000 +0900
-+++ config_office/configure	2008-09-30 22:33:09.000000000 +0900
++++ config_office/configure	2008-10-31 19:19:14.000000000 +0900
 @@ -3176,11 +3176,11 @@
  		test_cups=no
  		_os=OSF1
@@ -121,6 +121,24 @@ $NetBSD: patch-ba,v 1.13 2008/09/30 23:14:18 hira Exp $
  else
  
               CFLAGS=-I/usr/X11R6/include
+@@ -20526,7 +20529,7 @@
+     NEON_CFLAGS=
+     BUILD_TYPE="$BUILD_TYPE NEON"
+ fi
+-if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
++if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
+    with_system_openssl=yes
+ fi
+ echo "$as_me:$LINENO: checking which libssl to use" >&5
+@@ -20537,7 +20540,7 @@
+ echo "${ECHO_T}external" >&6
+     # Mac OS builds should get out without extra stuff is the Mac porters'
+     # wish. And pkg-config is although Xcode ships a .pc for openssl
+-    if test "$_os" = "Darwin"; then
++    if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+         OPENSSL_CFLAGS=
+         OPENSSL_LIBS="-lssl -lcrypto"
+     else
 @@ -23949,7 +23952,7 @@
    ENABLE_REPORTDESIGN=YES
    echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq
index c2d3af6baa3..18d5f39d05d 100644
--- a/misc/openoffice2/patches/patch-bq
+++ b/misc/openoffice2/patches/patch-bq
@@ -1,7 +1,7 @@
-$NetBSD: patch-bq,v 1.4 2007/10/06 20:02:23 hira Exp $
+$NetBSD: patch-bq,v 1.5 2008/10/31 11:02:55 hira Exp $
 
---- instsetoo_native/util/makefile.mk.orig	2007-08-03 20:23:21.000000000 +0900
-+++ instsetoo_native/util/makefile.mk	2007-09-26 17:40:48.000000000 +0900
+--- instsetoo_native/util/makefile.mk.orig	2008-10-31 19:34:16.000000000 +0900
++++ instsetoo_native/util/makefile.mk	2008-10-31 19:36:17.000000000 +0900
 @@ -61,6 +61,9 @@
  ENABLE_DOWNLOADSETS=TRUE
  .ENDIF			# "$(FORCE_DOWNLOADSETS)"!=""
@@ -12,7 +12,35 @@ $NetBSD: patch-bq,v 1.4 2007/10/06 20:02:23 hira Exp $
  .EXPORT: ENABLE_DOWNLOADSETS
  .EXPORT: LAST_MINOR
  .EXPORT: PRJ
-@@ -511,11 +514,11 @@
+@@ -131,7 +134,8 @@
+ 
+ .IF "$(alllangiso)"!=""
+ 
+-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
++openoffice:
++	@echo -n ""
+ 
+ openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
+ 
+@@ -236,7 +240,7 @@
+ .ELSE			# "$(PKGFORMAT)"!=""
+ openoffice_% :
+ .ENDIF			# "$(PKGFORMAT)"!=""
+-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
++	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
+ 	$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ .IF "$(PKGFORMAT)"!=""
+@@ -265,7 +269,7 @@
+ .ELSE			# "$(PKGFORMAT)"!=""
+ ooolanguagepack_% :
+ .ENDIF			# "$(PKGFORMAT)"!=""
+-	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
++	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
+ 
+ .IF "$(PKGFORMAT)"!=""
+ $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+@@ -403,11 +407,11 @@
  	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
  	-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
  	-$(MKDIRHIER) $(MSIURETEMPLATEDIR)
diff --git a/misc/openoffice2/patches/patch-br b/misc/openoffice2/patches/patch-br
deleted file mode 100644
index fe83f392e2e..00000000000
--- a/misc/openoffice2/patches/patch-br
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-br,v 1.2 2007/03/04 13:11:20 hira Exp $
-
---- scp2/source/ooo/file_library_ooo.scp.orig	2006-12-02 02:56:41.000000000 +0900
-+++ scp2/source/ooo/file_library_ooo.scp	2007-02-27 03:46:51.000000000 +0900
-@@ -503,6 +503,8 @@
-   #ifdef UNX
-     #ifdef MACOSX
-        Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
-+    #elif defined(NETBSD)
-+       Name = STRING(CONCAT6(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR));
-     #else
-        Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO));
-     #endif
-@@ -2421,6 +2423,8 @@
-     #ifdef UNX
-         #ifdef MACOSX
-             Name = STRING(CONCAT2(libxmlsec1.1.2.6,UNXSUFFIX));
-+        #elif defined(NETBSD)
-+            Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.3.6));
-         #else
-             Name = STRING(CONCAT3(libxmlsec1,UNXSUFFIX,.1.2.6));
-         #endif
-@@ -2445,6 +2449,8 @@
-     TXT_FILE_BODY;
-     #ifdef MACOSX
-         Name = STRING(CONCAT2(libxmlsec1-nss.1.2.6,UNXSUFFIX));
-+    #elif defined(NETBSD)
-+        Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.3.6));
-     #else
-         Name = STRING(CONCAT3(libxmlsec1-nss,UNXSUFFIX,.1.2.6));
-     #endif
diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch
index 92eb57070da..9839e2273d3 100644
--- a/misc/openoffice2/patches/patch-ch
+++ b/misc/openoffice2/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.4 2008/10/18 01:28:22 hira Exp $
+$NetBSD: patch-ch,v 1.5 2008/10/31 11:02:55 hira Exp $
 
 --- solenv/inc/unxbsdi3.mk.orig	2007-10-05 10:11:25.000000000 +0900
 +++ solenv/inc/unxbsdi3.mk	2007-10-05 10:14:03.000000000 +0900
@@ -147,10 +147,10 @@ $NetBSD: patch-ch,v 1.4 2008/10/18 01:28:22 hira Exp $
 +STDOBJVCL=$(L)$/salmain.o
 +
 +# libraries for linking applications
-+STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc -lgcc_s -lstdc++
++STDLIBGUIMT=-lX11 -lpthread -lm -lc -lgcc_s -lstdc++
 +STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
 +# libraries for linking shared libraries
-+STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
++STDSHLGUIMT=-lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
 +STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
 +
 +LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
diff --git a/misc/openoffice2/patches/patch-cs b/misc/openoffice2/patches/patch-cs
index 5f31273d16f..e45e8a73b8f 100644
--- a/misc/openoffice2/patches/patch-cs
+++ b/misc/openoffice2/patches/patch-cs
@@ -1,4 +1,4 @@
-$NetBSD: patch-cs,v 1.3 2008/10/18 01:28:22 hira Exp $
+$NetBSD: patch-cs,v 1.4 2008/10/31 11:02:55 hira Exp $
 
 --- solenv/inc/unxbsdx3.mk.orig	2007-10-13 00:24:19.000000000 +0900
 +++ solenv/inc/unxbsdx3.mk	2007-10-13 00:28:56.000000000 +0900
@@ -147,10 +147,10 @@ $NetBSD: patch-cs,v 1.3 2008/10/18 01:28:22 hira Exp $
 +STDOBJVCL=$(L)$/salmain.o
 +
 +# libraries for linking applications
-+STDLIBGUIMT=${X11_LDFLAGS} -lX11 -lpthread -lm -lc -lgcc_s -lstdc++
++STDLIBGUIMT=-lX11 -lpthread -lm -lc -lgcc_s -lstdc++
 +STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
 +# libraries for linking shared libraries
-+STDSHLGUIMT=${X11_LDFLAGS} -lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
++STDSHLGUIMT=-lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
 +STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
 +
 +LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
diff --git a/misc/openoffice2/patches/patch-cx b/misc/openoffice2/patches/patch-cx
index 4449c814609..cab6afef96f 100644
--- a/misc/openoffice2/patches/patch-cx
+++ b/misc/openoffice2/patches/patch-cx
@@ -1,43 +1,8 @@
-$NetBSD: patch-cx,v 1.3 2007/12/12 10:07:55 hira Exp $
+$NetBSD: patch-cx,v 1.4 2008/10/31 11:02:55 hira Exp $
 
---- solenv/inc/libs.mk.orig	2007-07-31 22:06:06.000000000 +0900
-+++ solenv/inc/libs.mk	2007-12-12 17:04:33.000000000 +0900
-@@ -187,14 +187,14 @@
- LINGULIB=$(HM2LIBST)
- LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX)
- .IF "$(SYSTEM_EXPAT)"=="YES"
--EXPAT3RDLIB=-lexpat
--EXPATASCII3RDLIB=-lexpat
-+EXPAT3RDLIB="-L@BLNK_PREFIX_expat@/lib -Wl,-R@BLNK_PREFIX_expat@/lib -lexpat"
-+EXPATASCII3RDLIB="-L@BLNK_PREFIX_expat@/lib -Wl,-R@BLNK_PREFIX_expat@/lib -lexpat"
- .ELSE
- EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok
- EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok
- .ENDIF
- .IF "$(SYSTEM_ZLIB)"=="YES"
--ZLIB3RDLIB=-lz
-+ZLIB3RDLIB="-L@BLNK_PREFIX_zlib@/lib -Wl,-R@BLNK_PREFIX_zlib@/lib -lz"
- .ELSE
- ZLIB3RDLIB=-lzlib
- .ENDIF
-@@ -209,7 +209,7 @@
- JPEG3RDLIB=/usr/lib/libjpeg.so
- .ENDIF
- .ELSE
--JPEG3RDLIB=-ljpeg
-+JPEG3RDLIB="-L@BLNK_PREFIX_jpeg@/lib -Wl,-R@BLNK_PREFIX_jpeg@/lib -ljpeg"
- .ENDIF
- .ELSE
- JPEG3RDLIB=-ljpeglib
-@@ -221,13 +221,17 @@
- CURLLIB=-lcurl-3
- .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
- .IF "$(SYSTEM_DB)" == "YES"
--BERKELEYLIB=-ldb
--BERKELEYCPPLIB=-ldb_cxx
-+BERKELEYLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4"
-+BERKELEYCPPLIB="-L@BLNK_PREFIX_db4@/lib -Wl,-R@BLNK_PREFIX_db4@/lib -ldb4_cxx"
- .ELSE
+--- solenv/inc/libs.mk.orig	2008-10-31 19:38:26.000000000 +0900
++++ solenv/inc/libs.mk	2008-10-31 19:39:20.000000000 +0900
+@@ -238,7 +238,11 @@
  BERKELEYLIB=-ldb-4.2
  BERKELEYCPPLIB=-ldb_cxx-4.2
  .ENDIF
diff --git a/misc/openoffice2/patches/patch-da b/misc/openoffice2/patches/patch-da
deleted file mode 100644
index 10061d58177..00000000000
--- a/misc/openoffice2/patches/patch-da
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-da,v 1.1 2008/02/05 19:17:25 hira Exp $
-
---- solenv/inc/unxfbsd.mk.orig	2008-02-05 20:42:15.000000000 +0000
-+++ solenv/inc/unxfbsd.mk	2008-02-05 20:43:58.000000000 +0000
-@@ -180,10 +180,10 @@
- STDSLOCUI=
- 
- # libraries for linking applications
--STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBGUIMT=$(X11_LDFLAGS) -lX11 $(PTHREAD_LIBS) -lm
- STDLIBCUIMT=$(PTHREAD_LIBS) -lm
- # libraries for linking shared libraries
--STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLGUIMT=$(X11_LDFLAGS) -lX11 -lXext $(PTHREAD_LIBS) -lm
- STDSHLCUIMT=$(PTHREAD_LIBS) -lm
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
diff --git a/misc/openoffice2/patches/patch-dt b/misc/openoffice2/patches/patch-dt
new file mode 100644
index 00000000000..ca3fb86ec9d
--- /dev/null
+++ b/misc/openoffice2/patches/patch-dt
@@ -0,0 +1,13 @@
+$NetBSD: patch-dt,v 1.1 2008/10/31 11:02:55 hira Exp $
+
+--- solenv/inc/settings.mk.orig	2008-10-31 19:44:01.000000000 +0900
++++ solenv/inc/settings.mk	2008-10-31 19:46:27.000000000 +0900
+@@ -977,6 +977,8 @@
+ .INCLUDE : unx.mk
+ .ENDIF
+ 
++.INCLUDE : pkgsrc.mk
++
+ # for multiprocess building in external modules
+ # allow seperate handling
+ EXTMAXPROCESS*=$(MAXPROCESS)
diff --git a/misc/openoffice2/patches/patch-du b/misc/openoffice2/patches/patch-du
new file mode 100644
index 00000000000..d1e231ad28f
--- /dev/null
+++ b/misc/openoffice2/patches/patch-du
@@ -0,0 +1,35 @@
+$NetBSD: patch-du,v 1.1 2008/10/31 11:02:55 hira Exp $
+
+--- solenv/inc/pkgsrc.mk.orig	2008-10-31 19:30:22.000000000 +0900
++++ solenv/inc/pkgsrc.mk	2008-10-31 19:33:23.000000000 +0900
+@@ -0,0 +1,30 @@
++#
++# Settings for pkgsrc.
++#
++
++BERKELEYLIB="@LIB_db4@ -ldb4"
++BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx"
++
++EXPAT3RDLIB="@LIB_expat@ -lexpat"
++EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
++
++ICUINLIB="@LIB_icu@ -licui18n"
++ICULELIB="@LIB_icu@ -licule"
++ICUUCLIB="@LIB_icu@ -licuuc"
++ICUDATALIB="@LIB_icu@ -licudata"
++
++JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
++
++ZLIB3RDLIB="@LIB_zlib@ -lz"
++
++STDLIBGUIMT+=${X11_LDFLAGS}
++STDSHLGUIMT+=${X11_LDFLAGS}
++
++LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@
++
++# Add runtime search path ($ORIGIN cannot be used in pkgsrc).
++LINKFLAGS+= ${LIB_base}
++EXTRA_LINKFLAGS+= ${LIB_base}
++
++# XXX: libxmlsec doesn't use LINKFLAGS.
++xmlsec_LDFLAGS+= ${LIB_base}
diff --git a/misc/openoffice2/patches/patch-dy b/misc/openoffice2/patches/patch-dy
index 300fd169e8d..efd684e9000 100644
--- a/misc/openoffice2/patches/patch-dy
+++ b/misc/openoffice2/patches/patch-dy
@@ -1,8 +1,104 @@
-$NetBSD: patch-dy,v 1.1 2008/10/03 09:09:17 hira Exp $
+$NetBSD: patch-dy,v 1.2 2008/10/31 11:02:55 hira Exp $
 
---- libxmlsec/xmlsec1-1.2.6.patch.orig	2008-10-03 17:41:07.000000000 +0900
-+++ libxmlsec/xmlsec1-1.2.6.patch	2008-10-03 17:45:02.000000000 +0900
-@@ -418,7 +418,7 @@
+--- libxmlsec/xmlsec1-1.2.6.patch.orig	2008-03-18 23:06:34.000000000 +0900
++++ libxmlsec/xmlsec1-1.2.6.patch	2008-10-20 03:29:32.000000000 +0900
+@@ -175,6 +175,23 @@
+     case $version_type in
+       freebsd-elf*)
+ ***************
++*** 7969,7975 ****
++    ;;
++  
++  netbsd*)
++!   version_type=sunos
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++--- 7970,7976 ----
++    ;;
++  
++  netbsd*)
++!   version_type=freebsd-elf
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++***************
+ *** 9046,9052 ****
+         ;;
+       esac
+@@ -249,6 +266,23 @@
+     case $version_type in
+       freebsd-elf*)
+ ***************
++*** 11688,11694 ****
++    ;;
++  
++  netbsd*)
++!   version_type=sunos
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++--- 11689,11695 ----
++    ;;
++  
++  netbsd*)
++!   version_type=freebsd-elf
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++***************
+ *** 13259,13269 ****
+         lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+         ;;
+@@ -308,6 +342,23 @@
+     case $version_type in
+       freebsd-elf*)
+ ***************
++*** 14858,14864 ****
++    ;;
++  
++  netbsd*)
++!   version_type=sunos
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++--- 14859,14865 ----
++    ;;
++  
++  netbsd*)
++!   version_type=freebsd-elf
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++***************
+ *** 15607,15617 ****
+         lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+         ;;
+@@ -384,6 +435,23 @@
+     case $version_type in
+       freebsd-elf*)
+ ***************
++*** 17226,17232 ****
++    ;;
++  
++  netbsd*)
++!   version_type=sunos
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++--- 17227,17233 ----
++    ;;
++  
++  netbsd*)
++!   version_type=freebsd-elf
++    need_lib_prefix=no
++    need_version=no
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++***************
+ *** 24598,24604 ****
+   fi
+   
+@@ -418,7 +486,7 @@
    
    XMLSEC_NO_NSS="1"
    MOZILLA_MIN_VERSION="1.4"
@@ -11,7 +107,7 @@ $NetBSD: patch-dy,v 1.1 2008/10/03 09:09:17 hira Exp $
  +     MOZILLA_MIN_VERSION="1.0"
  + fi
    NSS_MIN_VERSION="3.2"
-@@ -2579,7 +2579,7 @@
+@@ -2705,7 +2773,7 @@
        
    XMLSEC_NO_NSS="1"
    MOZILLA_MIN_VERSION="1.4"
diff --git a/misc/openoffice2/patches/patch-ec b/misc/openoffice2/patches/patch-ec
new file mode 100644
index 00000000000..8f68e4cff53
--- /dev/null
+++ b/misc/openoffice2/patches/patch-ec
@@ -0,0 +1,13 @@
+$NetBSD: patch-ec,v 1.1 2008/10/31 11:02:55 hira Exp $
+
+--- shell/source/unix/misc/open-url.sh.orig	2008-10-31 10:47:30.000000000 +0900
++++ shell/source/unix/misc/open-url.sh	2008-10-31 10:47:42.000000000 +0900
+@@ -118,7 +118,7 @@
+     exit 0
+   else
+     # mozilla derivates may need -remote semantics
+-    for i in firefox mozilla netscape; do
++    for i in @MOZ_FLAVOUR@ firefox mozilla netscape; do
+       browser=`which $i`
+       if [ ! -z "$browser" ]; then
+         run_mozilla "$browser" "$1"
diff --git a/misc/openoffice2/patches/patch-ed b/misc/openoffice2/patches/patch-ed
new file mode 100644
index 00000000000..2f552e3687d
--- /dev/null
+++ b/misc/openoffice2/patches/patch-ed
@@ -0,0 +1,26 @@
+$NetBSD: patch-ed,v 1.1 2008/10/31 11:02:55 hira Exp $
+
+--- extensions/source/nsplugin/source/so_main.cxx.orig	2008-10-31 10:48:20.000000000 +0900
++++ extensions/source/nsplugin/source/so_main.cxx	2008-10-31 10:48:52.000000000 +0900
+@@ -312,6 +312,10 @@
+     }
+     
+     NSP_Sleep(5);
++#ifdef NETBSD
++    NSP_CloseSocket(my_sock);
++    my_sock=socket(PF_INET, SOCK_STREAM, 0);
++#endif
+     // try to connect to background SO, thus judge if it is ready
+     while(0 > connect(my_sock, (struct sockaddr *)&dst_addr, sizeof(dst_addr)))
+     {
+@@ -323,6 +327,10 @@
+             return sal_False;
+         }
+         debug_fprintf(NSP_LOG_APPEND, "print by nsplugin,  Current count: %d\n", count);
++#ifdef NETBSD
++        NSP_CloseSocket(my_sock);
++        my_sock=socket(PF_INET, SOCK_STREAM, 0);
++#endif
+     }
+     NSP_CloseSocket(my_sock);
+     NSP_Sleep(5);