diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-07-02 21:00:12 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-07-02 21:00:12 +0000 |
| commit | 104f4e8e7106f0ac4c4e7218e4a847b76f10deb2 (patch) | |
| tree | e1da09804e29ca43bc696a8fb9d1de05d8591729 | |
| parent | 06c629c6de34eada5ed4a0a784d1b55894949233 (diff) | |
| download | ports-104f4e8e7106f0ac4c4e7218e4a847b76f10deb2.tar.gz ports-104f4e8e7106f0ac4c4e7218e4a847b76f10deb2.zip | |
Notes
40 files changed, 80 insertions, 203 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 3d3f99cf4351..d0cb66933ac8 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -18,7 +18,8 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= stable/${PORTVERSION} DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + mozilla-vendor-1.0.2.tgz:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -445,16 +446,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla - -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index db01cc4ea1de..4234ae553f70 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-1.1-devel/distinfo +++ b/editors/openoffice-1.1-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-1.1/distinfo +++ b/editors/openoffice-1.1/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-2.0-devel/distinfo +++ b/editors/openoffice-2.0-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 3d3f99cf4351..d0cb66933ac8 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -18,7 +18,8 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= stable/${PORTVERSION} DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + mozilla-vendor-1.0.2.tgz:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -445,16 +446,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla - -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo index db01cc4ea1de..4234ae553f70 100644 --- a/editors/openoffice.org-1.0/distinfo +++ b/editors/openoffice.org-1.0/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-1.1-devel/distinfo +++ b/editors/openoffice.org-1.1-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-1.1/distinfo +++ b/editors/openoffice.org-1.1/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-2-RC/distinfo +++ b/editors/openoffice.org-2-RC/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-2.0-devel/distinfo +++ b/editors/openoffice.org-2.0-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-2.0/distinfo +++ b/editors/openoffice.org-2.0/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-2/distinfo +++ b/editors/openoffice.org-2/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 94e1b50f80e6..b72edd8783d3 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -19,7 +19,8 @@ MASTER_SITES+= http://projects.imp.ch/openoffice/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES+= oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + http://people.freebsd.org/~mbr/ooo/:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -430,15 +431,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 45c5950d3083..481a38cc3f15 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/oo_644_src_20030601.tar.bz2) = df9c081ca85caef3d89e039295458c99 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 3d3f99cf4351..d0cb66933ac8 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -18,7 +18,8 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/%SUBDIR%/ \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= stable/${PORTVERSION} DISTFILES+= OOo_${PORTVERSION}_source.tar.bz2 \ - gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz + gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz \ + mozilla-vendor-1.0.2.tgz:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} .endif @@ -445,16 +446,7 @@ fix-gnomewrappers: extract-mozilla: .if ! exists(${WRKDIR}/mozilla/Makefile) @${ECHO_MSG} "===> Extracting mozilla sub project" - @${MKDIR} ${WRKDIR}/mozilla - @${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla - -.if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment) - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla -.endif - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla - @${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla + @cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2.tgz .endif @cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX="" diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo index db01cc4ea1de..4234ae553f70 100644 --- a/editors/openoffice/distinfo +++ b/editors/openoffice/distinfo @@ -1,5 +1,6 @@ MD5 (openoffice/OOo_1.0.3_source.tar.bz2) = 984146931906a7d53300b29f58f6a899 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +MD5 (openoffice/mozilla-vendor-1.0.2.tgz) = 30478b49e04df9528858080ab97ddf62 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 |