Set $LANG to a useful value if it is not already set. This is a issue

many users have problems with. If US-ASCII is set, OpenOffice.Org cannot
read any filenames with special chars and Umlauts !

6 files changed, 117 insertions, 9 deletions

diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index a3df30b81742..b18e237095a2 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -32,6 +32,7 @@ MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 TCSH?=	/bin/tcsh
+PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
@@ -71,6 +72,15 @@ CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
+.if !defined (LANG) && !defined(USE_LANG)
+USE_LANG=	en_US.ISO8859-15
+LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
+.else
+USE_LANG=	${LANG}
+.endif
+
+LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
+
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
@@ -164,11 +174,29 @@ CONFIGURE_ARGS+=	--enable-gcc3
 
 pre-fetch:
 	@${ECHO}
+.if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
-.if !defined(USE_GCC) || !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "OPTIONS:"
+	@${ECHO} "OO requires that the ENV variable LANG"
+	@${ECHO} "is set to a proper value. Dependent on"
+	@${ECHO} "which language port you use, OO does"
+	@${ECHO} "automatically set LANG to a suitable"
+	@${ECHO} "value. You can change this with:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=\"prefered language\""
+	@${ECHO}
+	@${ECHO} "and set a different language"
+	@${ECHO} "like:"
+	@${ECHO}
+	@${ECHO} "${LANG_SORTED}"
+	@${ECHO}
+	@${ECHO} "Your current setting is:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=${USE_LANG}"
+	@${ECHO}
+	@${ECHO}
 .endif
+	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
@@ -232,8 +260,10 @@ pre-fetch:
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
+.if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
+.endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
@@ -480,6 +510,8 @@ post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/openoffice-wrapper \
 	   > ${WRKDIR}/openoffice
+	@${SED} -e 's#%%LANG%%#${USE_LANG}#g' < ${FILESDIR}/openoffice-wrapper \
+	   > ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
diff --git a/editors/openoffice-1.0/files/openoffice-wrapper b/editors/openoffice-1.0/files/openoffice-wrapper
index 28a571a83200..d5707b7ad633 100644
--- a/editors/openoffice-1.0/files/openoffice-wrapper
+++ b/editors/openoffice-1.0/files/openoffice-wrapper
@@ -1,10 +1,14 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice-wrapper,v 1.2 2002-08-04 00:18:09 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
 
 oopath=%%PREFIX%%/OpenOffice.org1.0/program/
 program=`echo $0 | sed -e 's|.*-||'`
 
+if [ ! $LANG ]; then
+	export LANG=%%LANG%%
+fi
+
 case $program in
 $0)
 	exec $oopath/soffice "$@"
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index a3df30b81742..b18e237095a2 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -32,6 +32,7 @@ MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 TCSH?=	/bin/tcsh
+PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
@@ -71,6 +72,15 @@ CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
+.if !defined (LANG) && !defined(USE_LANG)
+USE_LANG=	en_US.ISO8859-15
+LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
+.else
+USE_LANG=	${LANG}
+.endif
+
+LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
+
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
@@ -164,11 +174,29 @@ CONFIGURE_ARGS+=	--enable-gcc3
 
 pre-fetch:
 	@${ECHO}
+.if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
-.if !defined(USE_GCC) || !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "OPTIONS:"
+	@${ECHO} "OO requires that the ENV variable LANG"
+	@${ECHO} "is set to a proper value. Dependent on"
+	@${ECHO} "which language port you use, OO does"
+	@${ECHO} "automatically set LANG to a suitable"
+	@${ECHO} "value. You can change this with:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=\"prefered language\""
+	@${ECHO}
+	@${ECHO} "and set a different language"
+	@${ECHO} "like:"
+	@${ECHO}
+	@${ECHO} "${LANG_SORTED}"
+	@${ECHO}
+	@${ECHO} "Your current setting is:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=${USE_LANG}"
+	@${ECHO}
+	@${ECHO}
 .endif
+	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
@@ -232,8 +260,10 @@ pre-fetch:
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
+.if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
+.endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
@@ -480,6 +510,8 @@ post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/openoffice-wrapper \
 	   > ${WRKDIR}/openoffice
+	@${SED} -e 's#%%LANG%%#${USE_LANG}#g' < ${FILESDIR}/openoffice-wrapper \
+	   > ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
diff --git a/editors/openoffice.org-1.0/files/openoffice-wrapper b/editors/openoffice.org-1.0/files/openoffice-wrapper
index dd71e4dbb064..4c34abc864cc 100644
--- a/editors/openoffice.org-1.0/files/openoffice-wrapper
+++ b/editors/openoffice.org-1.0/files/openoffice-wrapper
@@ -1,10 +1,14 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.0/files/Attic/openoffice-wrapper,v 1.2 2002-08-04 00:18:09 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.0/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
 
 oopath=%%PREFIX%%/OpenOffice.org1.0/program/
 program=`echo $0 | sed -e 's|.*-||'`
 
+if [ ! $LANG ]; then
+	export LANG=%%LANG%%
+fi
+
 case $program in
 $0)
 	exec $oopath/soffice "$@"
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index a3df30b81742..b18e237095a2 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -32,6 +32,7 @@ MOUNT?=	/sbin/mount
 ZIP?=	${PREFIX}/bin/zip
 UNZIP?=	${PREFIX}/bin/unzip
 TCSH?=	/bin/tcsh
+PASTE?= /usr/bin/paste
 
 .include <bsd.port.pre.mk>
 
@@ -71,6 +72,15 @@ CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG},ENUS
 .endif
 .endif
 
+.if !defined (LANG) && !defined(USE_LANG)
+USE_LANG=	en_US.ISO8859-15
+LANG_LIST=	en_US.ISO8859-15 en_US.ISO8859-1 US-ASCII
+.else
+USE_LANG=	${LANG}
+.endif
+
+LANG_SORTED=	`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
+
 .if ${OSVERSION} < 500000
 #
 # OO build is broken with the system gcc on STABLE.
@@ -164,11 +174,29 @@ CONFIGURE_ARGS+=	--enable-gcc3
 
 pre-fetch:
 	@${ECHO}
+.if !defined(LANG)
 	@${ECHO} "REQUIREMENTS:"
-.if !defined(USE_GCC) || !defined(WITH_DEBUG)
 	@${ECHO}
-	@${ECHO} "OPTIONS:"
+	@${ECHO} "OO requires that the ENV variable LANG"
+	@${ECHO} "is set to a proper value. Dependent on"
+	@${ECHO} "which language port you use, OO does"
+	@${ECHO} "automatically set LANG to a suitable"
+	@${ECHO} "value. You can change this with:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=\"prefered language\""
+	@${ECHO}
+	@${ECHO} "and set a different language"
+	@${ECHO} "like:"
+	@${ECHO}
+	@${ECHO} "${LANG_SORTED}"
+	@${ECHO}
+	@${ECHO} "Your current setting is:"
+	@${ECHO}
+	@${ECHO} "USE_LANG=${USE_LANG}"
+	@${ECHO}
+	@${ECHO}
 .endif
+	@${ECHO} "OPTIONS:"
 .if !defined(USE_GCC)
 	@${ECHO}
 	@${ECHO} "You can compile OO with different"
@@ -232,8 +260,10 @@ pre-fetch:
 	@${ECHO} "kern.maxssiz=\"268435456\""
 .endif
 	@${ECHO}
+.if ${OSVERSION} < 460002
 	@${ECHO} "REQUIRED SYSTEM PATCHES:"
 	@${ECHO}
+.endif
 .if ${OSVERSION} < 500000
 	@${ECHO} "OO.org can crash if you enter a non existing path"
 	@${ECHO} "or URL in the location bar. To fix these crashes"
@@ -480,6 +510,8 @@ post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/openoffice-wrapper \
 	   > ${WRKDIR}/openoffice
+	@${SED} -e 's#%%LANG%%#${USE_LANG}#g' < ${FILESDIR}/openoffice-wrapper \
+	   > ${WRKDIR}/openoffice
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice ${PREFIX}/bin/openoffice
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-sagenda
 	@${LN} -fs ${PREFIX}/bin/openoffice ${PREFIX}/bin/openoffice-scalc
diff --git a/editors/openoffice/files/openoffice-wrapper b/editors/openoffice/files/openoffice-wrapper
index 83ff16649a22..234b46a8077e 100644
--- a/editors/openoffice/files/openoffice-wrapper
+++ b/editors/openoffice/files/openoffice-wrapper
@@ -1,10 +1,14 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice/files/Attic/openoffice-wrapper,v 1.2 2002-08-04 00:18:09 mbr Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice/files/Attic/openoffice-wrapper,v 1.3 2003-01-21 17:09:39 mbr Exp $
 
 oopath=%%PREFIX%%/OpenOffice.org1.0/program/
 program=`echo $0 | sed -e 's|.*-||'`
 
+if [ ! $LANG ]; then
+	export LANG=%%LANG%%
+fi
+
 case $program in
 $0)
 	exec $oopath/soffice "$@"