diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2004-07-05 13:26:42 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2004-07-05 13:26:42 +0000 |
| commit | db8bfc724900649cfbe148ad5559b9f47f2d2068 (patch) | |
| tree | c6f6ad258f1aafb87652c294153fec3137cecfd7 | |
| parent | c9fa380d51d7c9d0009fac53ab951a15121d63dc (diff) | |
| download | ports-db8bfc724900649cfbe148ad5559b9f47f2d2068.tar.gz ports-db8bfc724900649cfbe148ad5559b9f47f2d2068.zip | |
Notes
| -rw-r--r-- | editors/staroffice70/Makefile | 15 | ||||
| -rw-r--r-- | editors/staroffice70/distinfo | 2 | ||||
| -rw-r--r-- | german/staroffice70/Makefile | 15 | ||||
| -rw-r--r-- | german/staroffice70/distinfo | 2 |
4 files changed, 18 insertions, 16 deletions
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index a313c3eda76f..4fa2e58156eb 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 7.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= editors linux MASTER_SITES= ftp://ftp.sun.co.uk/pub/patches/:patch \ ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \ @@ -16,15 +16,16 @@ MASTER_SITES= ftp://ftp.sun.co.uk/pub/patches/:patch \ ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch DISTNAME= so-7-ga-bin-linux-en.bin .if !defined(USE_CDROM) -DISTFILES= so-7-ga-bin-linux-en.bin 116518-03.tar:patch +DISTFILES= so-7-ga-bin-linux-en.bin 116518-04.zip:patch .else -DISTFILES= 116518-03.tar:patch +DISTFILES= 116518-04.zip:patch .endif .if defined(WITH_ADABAS) DISTFILES+= soa-7-ga-bin-linux-en.bin .endif -EXTRACT_ONLY= 116518-03.tar +USE_ZIP= YES +EXTRACT_ONLY= 116518-04.zip MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart @@ -42,7 +43,7 @@ LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib INSTDB.INS= ${PREFIX}/${SOVERSION}/program/instdb.ins SUNSOLVE= ${WRKDIR}/112887-04 ADABAS_DIST= soa-7-ga-bin-linux-en.bin -PATCH_DIST= so-7-pp2-bin-linux.bin +PATCH_DIST= so-7-pp3-bin-linux.bin .include <bsd.port.pre.mk> @@ -119,7 +120,7 @@ pre-fetch: @${FALSE} .endif .if defined(USE_CDROM) -DLTEST=116518-03.tar +DLTEST=116518-04.zip .else .if exists(/cdrom/linux/office7/setup) @${ECHO} @@ -252,7 +253,7 @@ install-patch: ${WRKSRC}/patchsetup.resp @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c 'umask 022 && \ - ${WRKSRC}/../116518-03/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\ + ${WRKSRC}/../116518-04/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\ -r:${WRKSRC}/patchsetup.resp' install-update: diff --git a/editors/staroffice70/distinfo b/editors/staroffice70/distinfo index a618fc5883b9..f53d794756fd 100644 --- a/editors/staroffice70/distinfo +++ b/editors/staroffice70/distinfo @@ -4,4 +4,4 @@ MD5 (soa-7-ga-bin-linux-en.bin) = fb4cda40ff388f0db4de19403f2f32c7 MD5 (so-7-ga-en-BASIC_GUIDE.PDF) = 29eea1442a0061ceb349f556b2dba917 MD5 (so-7-ga-en-MANUAL.PDF) = 478cecf0c08ee7b89cb6ff129aa2af80 MD5 (so-7-ga-en-SETUP_GUIDE.PDF) = 5bc102fc44abf61226f046ae88d22f45 -MD5 (116518-03.tar) = b9b85832e413ad744761115105377da0 +MD5 (116518-04.zip) = 3126b701d10551ce7ec81aeed4c78cf8 diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile index 177f47e51dd8..40b17c0d3308 100644 --- a/german/staroffice70/Makefile +++ b/german/staroffice70/Makefile @@ -7,7 +7,7 @@ PORTNAME= staroffice PORTVERSION= 7.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= german editors linux MASTER_SITES= ftp://ftp.sun.co.uk/pub/patches/:patch \ ftp://ftp.sunsite.auc.dk/disk6/sun-patches/:patch \ @@ -16,15 +16,16 @@ MASTER_SITES= ftp://ftp.sun.co.uk/pub/patches/:patch \ ftp://ftp.cs.tu-berlin.de/pub/sun/sun-fixes/.../:patch DISTNAME= so-7-ga-bin-linux-de.bin .if !defined(USE_CDROM) -DISTFILES= so-7-ga-bin-linux-de.bin 116518-03.tar:patch +DISTFILES= so-7-ga-bin-linux-de.bin 116518-04.zip:patch .else -DISTFILES= 116518-03.tar:patch +DISTFILES= 116518-04.zip:patch .endif .if defined(WITH_ADABAS) DISTFILES+= soa-7-ga-bin-linux-de.bin .endif -EXTRACT_ONLY= 116518-03.tar +USE_ZIP= YES +EXTRACT_ONLY= 116518-04.zip MAINTAINER= mbr@FreeBSD.org COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart @@ -42,7 +43,7 @@ LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib INSTDB.INS= ${PREFIX}/${SOVERSION}/program/instdb.ins SUNSOLVE= ${WRKDIR}/112887-04 ADABAS_DIST= soa-7-ga-bin-linux-de.bin -PATCH_DIST= so-7-pp2-bin-linux.bin +PATCH_DIST= so-7-pp3-bin-linux.bin .include <bsd.port.pre.mk> @@ -119,7 +120,7 @@ pre-fetch: @${FALSE} .endif .if defined(USE_CDROM) -DLTEST=116518-03.tar +DLTEST=116518-04.zip .else .if exists(/cdrom/linux/office7/setup) @${ECHO} @@ -252,7 +253,7 @@ install-patch: ${WRKSRC}/patchsetup.resp @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c 'umask 022 && \ - ${WRKSRC}/../116518-03/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\ + ${WRKSRC}/../116518-04/${PATCH_DIST} -patch:${PREFIX}/${SOVERSION}\ -r:${WRKSRC}/patchsetup.resp' install-update: diff --git a/german/staroffice70/distinfo b/german/staroffice70/distinfo index 0c519b84c51a..a4ebf0b4b841 100644 --- a/german/staroffice70/distinfo +++ b/german/staroffice70/distinfo @@ -1,4 +1,4 @@ MD5 (so-7-addon-ga-bin-de.zip) = c75d6cd61b35297d8ce3c3697ad1b5ee MD5 (so-7-ga-bin-linux-de.bin) = 97a59a15993200c033ae25849bf88f6d MD5 (soa-7-ga-bin-linux-de.bin) = fb4cda40ff388f0db4de19403f2f32c7 -MD5 (116518-03.tar) = b9b85832e413ad744761115105377da0 +MD5 (116518-04.zip) = 3126b701d10551ce7ec81aeed4c78cf8 |