Save a chunk of time and disk space by preventing the OOo build from

building a complete epm package for each lang. We only need a full
package for en-US and langpacks for the rest. Also add a US based
mirror to the list of master sites. okay robi@
This commit is contained in:
kurt 2007-05-14 17:13:01 +00:00
parent 133a1b014c
commit 47b3c759fd
3 changed files with 60 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2007/03/29 10:53:42 robert Exp $
# $OpenBSD: Makefile,v 1.52 2007/05/14 17:13:01 kurt Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -26,6 +26,7 @@ MAINTAINER= Robert Nagy <robert@openbsd.org>
HOMEPAGE= http://www.openoffice.org/
MASTER_SITES= http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/Sources/ \
http://humppa.hu/ooo/ \
ftp://ftp.ussg.iu.edu/pub/openoffice/stable/${VERSION}/ \
ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/stable/${VERSION}/ \
ftp://ftp.tu-chemnitz.de/pub/openoffice/stable/${VERSION}/ \
ftp://ftp.nluug.nl/pub/office/openoffice/stable/${VERSION}/ \
@ -168,9 +169,10 @@ MAKE_ENV+= envcflags="${CFLAGS}"
TCSH= ${LOCALBASE}/bin/tcsh
.if ${FLAVOR:L:Mcleanobj}
BUILD_CMD= cd instsetoo_native && build.pl --all --dlv_switch -deloutput
BUILD_CMD= cd instsetoo_native && build.pl --all --dlv_switch -deloutput && \
cd util && dmake ooolanguagepack
.else
BUILD_CMD= dmake
BUILD_CMD= dmake && cd instsetoo_native/util && dmake ooolanguagepack
.endif
pre-patch:
@ -198,8 +200,13 @@ do-install:
${INSTALL_DATA} $$ICONS ${PREFIX}/share/icons/openoffice; \
done
.for l in en-US ${LANGS}
cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice/portable/install/$l/openbsd-* && \
cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice/portable/install/en-US/openbsd-* && \
for SW in `ls -1 *.sw`; do \
${TAR} xf $$SW -C ${PREFIX}; \
done
.for l in ${LANGS}
cd ${WRKSRC}/instsetoo_native/unxobsd.pro/OpenOffice_languagepack/portable/install/$l/openbsd-* && \
for SW in `ls -1 *.sw`; do \
${TAR} xf $$SW -C ${PREFIX}; \
done

View File

@ -0,0 +1,37 @@
$OpenBSD: patch-instsetoo_native_inc_openoffice_unix_packagelist_language_txt,v 1.1 2007/05/14 17:13:01 kurt Exp $
--- instsetoo_native/inc_openoffice/unix/packagelist_language.txt.orig.port Tue May 8 10:05:04 2007
+++ instsetoo_native/inc_openoffice/unix/packagelist_language.txt Tue May 8 10:05:51 2007
@@ -28,7 +28,7 @@ copyright = "1999-2006 by OpenOffice.org"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
description = "Language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -43,7 +43,7 @@ copyright = "1999-2006 by OpenOffice.org"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
description = "Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -58,7 +58,7 @@ copyright = "1999-2006 by OpenOffice.org"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
description = "Language resource module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+destpath = "openoffice"
End
Start
@@ -73,5 +73,5 @@ copyright = "1999-2006 by OpenOffice.org"
solariscopyright = "solariscopyrightfile"
vendor = "OpenOffice.org"
description = "Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING"
-destpath = "/opt/openoffice.org%PRODUCTVERSION"
+destpath = "openoffice"
End

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.7 2007/04/18 13:20:48 kurt Exp $
$OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.8 2007/05/14 17:13:01 kurt Exp $
--- instsetoo_native/util/makefile.mk.orig.port Thu Mar 1 06:46:53 2007
+++ instsetoo_native/util/makefile.mk Wed Apr 18 03:46:25 2007
+++ instsetoo_native/util/makefile.mk Tue May 8 08:42:19 2007
@@ -54,12 +54,14 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDI
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
@ -16,6 +16,15 @@ $OpenBSD: patch-instsetoo_native_util_makefile_mk,v 1.7 2007/04/18 13:20:48 kurt
.EXPORT: ENABLE_DOWNLOADSETS
.EXPORT: LAST_MINOR
@@ -131,7 +133,7 @@ updatepack:
.IF "$(alllangiso)"!=""
-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
+openoffice: openoffice_en-US
openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
@@ -199,7 +201,7 @@ openoffice_%{$(PKGFORMAT:^".")} :
openoffice_% :
.ENDIF # "$(PKGFORMAT)"!=""