diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2010-11-30 11:08:00 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2010-11-30 11:08:00 +0000 |
| commit | 411306e6d8eec507b800476ee122875538359ed0 (patch) | |
| tree | d9f2c251519ef0e11a3f91832d45f7da09330792 /editors/openoffice-3 | |
| parent | 8746c8ffebbe7bce879b3df99a70e8be42415139 (diff) | |
Notes
Diffstat (limited to 'editors/openoffice-3')
| -rw-r--r-- | editors/openoffice-3/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-3/files/generate.pl | 13 |
2 files changed, 12 insertions, 5 deletions
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"; +} |