From 411306e6d8eec507b800476ee122875538359ed0 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Tue, 30 Nov 2010 11:08:00 +0000
Subject: [PATCH] Some small modifications so that it meets Hamburg's
 requirement.

Discussed with: Marcus Lange <marcus.lange@oracle.com>
and "Jack L." <xxjack12xx@gmail.com>
---
 editors/openoffice-3-devel/Makefile              |  4 ++--
 editors/openoffice-3-devel/files/generate.pl     | 11 +++++++++--
 editors/openoffice-3/Makefile                    |  4 ++--
 editors/openoffice-3/files/generate.pl           | 13 ++++++++++---
 editors/openoffice.org-3-RC/Makefile             |  4 ++--
 editors/openoffice.org-3-RC/files/generate.pl    | 13 ++++++++++---
 editors/openoffice.org-3-devel/Makefile          |  4 ++--
 editors/openoffice.org-3-devel/files/generate.pl | 13 ++++++++++---
 editors/openoffice.org-3/Makefile                |  4 ++--
 editors/openoffice.org-3/files/generate.pl       | 13 ++++++++++---
 10 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c6881f0b5c15..f7a2c6b692d0 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -89,9 +89,9 @@ EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86-64
 .else
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86
 .endif
 
 LOCALIZED_LANG?=	en-US
diff --git a/editors/openoffice-3-devel/files/generate.pl b/editors/openoffice-3-devel/files/generate.pl
index 825da3c3efda..abe0b6e43265 100644
--- a/editors/openoffice-3-devel/files/generate.pl
+++ b/editors/openoffice-3-devel/files/generate.pl
@@ -26,5 +26,12 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+
+$arc= `uname -m`;
+if ($arc == "amd64" ) {
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+} else { 
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+}
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 8874b2e1878b..c26aa48534f5 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -84,9 +84,9 @@ EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}x86-64
 .else
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}x86
 .endif
 
 LOCALIZED_LANG?=	en-US
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index bb980eb5c901..7d1279a80b2d 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.11 2008-05-27 07:37:30 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.12 2010-11-30 11:08:00 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,12 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+
+$arc= `uname -m`;
+if ($arc == "amd64" ) {
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+} else { 
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+}
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 3c02f5e50861..4dbcaa71c400 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -82,9 +82,9 @@ EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86-64
 .else
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86
 .endif
 
 LOCALIZED_LANG?=	en-US
diff --git a/editors/openoffice.org-3-RC/files/generate.pl b/editors/openoffice.org-3-RC/files/generate.pl
index addee07d5d04..1911a081f29b 100644
--- a/editors/openoffice.org-3-RC/files/generate.pl
+++ b/editors/openoffice.org-3-RC/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.9 2008-04-04 10:05:22 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-RC/files/Attic/generate.pl,v 1.10 2010-11-30 11:08:00 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,12 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+
+$arc= `uname -m`;
+if ($arc == "amd64" ) {
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+} else { 
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+}
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index c6881f0b5c15..f7a2c6b692d0 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -89,9 +89,9 @@ EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86-64
 .else
-PACKAGE_BASENAME=	OOo_Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo-Dev_${OOOTAG}_${OPSYS}${SIMPLEOSVER}x86
 .endif
 
 LOCALIZED_LANG?=	en-US
diff --git a/editors/openoffice.org-3-devel/files/generate.pl b/editors/openoffice.org-3-devel/files/generate.pl
index f28655fc9288..8a8f2f2ebc80 100644
--- a/editors/openoffice.org-3-devel/files/generate.pl
+++ b/editors/openoffice.org-3-devel/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.12 2008-04-04 10:05:21 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.13 2010-11-30 11:08:00 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,12 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+
+$arc= `uname -m`;
+if ($arc == "amd64" ) {
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+} else { 
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+}
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 8874b2e1878b..c26aa48534f5 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -84,9 +84,9 @@ EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}x86-64
 .else
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}x86
 .endif
 
 LOCALIZED_LANG?=	en-US
diff --git a/editors/openoffice.org-3/files/generate.pl b/editors/openoffice.org-3/files/generate.pl
index b08d5632707b..e5901ea88c42 100644
--- a/editors/openoffice.org-3/files/generate.pl
+++ b/editors/openoffice.org-3/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.11 2008-05-27 07:37:30 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.12 2010-11-30 11:08:00 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,12 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+
+$arc= `uname -m`;
+if ($arc == "amd64" ) {
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/`\n";
+} else { 
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/`\n";
+}