1. remove duplicated helpcontent_01.tgz in DISTFILES section

2. tr confuses when LC_ALL set to one of UTF8 locale [1]
3. No longer needs DISPLAYHACK
4. better generate.pl
PR:		84786 [1]
Submitted by:	achix mantzix [1]

4 files changed, 20 insertions, 20 deletions

diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 74710b11e132..9ac126d50772 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -64,7 +64,7 @@ L10NHELP?=     helpcontent_01_unix.tgz
 
 DISTFILES+=	${L10NHELP}:help
 .if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+=	helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help3 \
+DISTFILES+=	helpcontent_07_unix.tgz:help3 \
 		helpcontent_31_unix.tgz:help  helpcontent_33_unix.tgz:help \
 		helpcontent_34_unix.tgz:help  helpcontent_39_unix.tgz:help \
 		helpcontent_42_unix.tgz:help2 helpcontent_43_unix.tgz:help2 \
@@ -124,7 +124,6 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-DISPLAYHACK=localhost:1001
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
 
 .include <${FILESDIR}/Makefile.knobs>
@@ -176,10 +175,11 @@ do-build:
 .endif
 	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+# PR:84786
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice-1.1/files/generate.pl b/editors/openoffice-1.1/files/generate.pl
index 886d5b4594eb..08435dc8c868 100644
--- a/editors/openoffice-1.1/files/generate.pl
+++ b/editors/openoffice-1.1/files/generate.pl
@@ -1,12 +1,13 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/generate.pl,v 1.2 2005-07-29 03:06:51 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1/files/Attic/generate.pl,v 1.3 2005-08-28 08:27:50 maho Exp $
 
 print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "make deinstall clean\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
+print "rm work/.configure* work/.build* \n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
 while(<FILE>){
@@ -14,8 +15,7 @@ while(<FILE>){
 @tmp2=split ('"',$tmp[3]);
 if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; 
 	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time make LOCALIZED_LANG=$LANG  WITH_CCACHE=yes deinstall package package-rename deinstall >& log.$LANG\n";
+	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
 	}
 }
 close FILE;
-
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 74710b11e132..9ac126d50772 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -64,7 +64,7 @@ L10NHELP?=     helpcontent_01_unix.tgz
 
 DISTFILES+=	${L10NHELP}:help
 .if defined(ALL_LOCALIZED_LANGS)
-DISTFILES+=	helpcontent_01_unix.tgz:help helpcontent_07_unix.tgz:help3 \
+DISTFILES+=	helpcontent_07_unix.tgz:help3 \
 		helpcontent_31_unix.tgz:help  helpcontent_33_unix.tgz:help \
 		helpcontent_34_unix.tgz:help  helpcontent_39_unix.tgz:help \
 		helpcontent_42_unix.tgz:help2 helpcontent_43_unix.tgz:help2 \
@@ -124,7 +124,6 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-DISPLAYHACK=localhost:1001
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
 
 .include <${FILESDIR}/Makefile.knobs>
@@ -176,10 +175,11 @@ do-build:
 .endif
 	@${MKDIR} ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${CODELINE}/unxfbsd.pro/pck
+# PR:84786
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; DISPLAY=${DISPLAYHACK} ; ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .endif
 
 do-install:
diff --git a/editors/openoffice.org-1.1/files/generate.pl b/editors/openoffice.org-1.1/files/generate.pl
index b66b39ee2865..510bd36088af 100644
--- a/editors/openoffice.org-1.1/files/generate.pl
+++ b/editors/openoffice.org-1.1/files/generate.pl
@@ -1,12 +1,13 @@
 #!/usr/bin/perl
-
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/generate.pl,v 1.2 2005-07-29 03:06:51 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1/files/Attic/generate.pl,v 1.3 2005-08-28 08:27:50 maho Exp $
 
 print "#!/bin/csh\n";
-print "/usr/bin/time make WITH_CCACHE=yes package package-rename solver sdk deinstall clean >& log.en\n";
-print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n";
+print "make deinstall clean\n";
+print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n";
+print "rm work/.configure* work/.build* \n";
+print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
 
 open ( FILE,  "< Makefile.localized") ;
 while(<FILE>){
@@ -14,8 +15,7 @@ while(<FILE>){
 @tmp2=split ('"',$tmp[3]);
 if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; 
 	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time make LOCALIZED_LANG=$LANG  WITH_CCACHE=yes deinstall package package-rename deinstall >& log.$LANG\n";
+	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n";
 	}
 }
 close FILE;
-