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.org-3-devel | |
parent | - Update x264 to 0.110.1804 (diff) |
Some small modifications so that it meets Hamburg's requirement.
Discussed with: Marcus Lange <marcus.lange@oracle.com>
and "Jack L." <xxjack12xx@gmail.com>
Notes
Notes:
svn path=/head/; revision=265442
Diffstat (limited to 'editors/openoffice.org-3-devel')
-rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 4 | ||||
-rw-r--r-- | editors/openoffice.org-3-devel/files/generate.pl | 13 |
2 files changed, 12 insertions, 5 deletions
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"; +} |