diff options
24 files changed, 42 insertions, 876 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice-3/files/patch-epm b/editors/openoffice-3/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice-3/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice-3/files/patch-np_sdk b/editors/openoffice-3/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice-3/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice.org-2-RC/distinfo +++ b/editors/openoffice.org-2-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-2-RC/files/patch-epm b/editors/openoffice.org-2-RC/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-2-RC/files/patch-np_sdk b/editors/openoffice.org-2-RC/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice.org-2.0/distinfo +++ b/editors/openoffice.org-2.0/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-2.0/files/patch-epm b/editors/openoffice.org-2.0/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-2.0/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-2.0/files/patch-np_sdk b/editors/openoffice.org-2.0/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice.org-2.0/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice.org-2/distinfo +++ b/editors/openoffice.org-2/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-2/files/patch-epm b/editors/openoffice.org-2/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-2/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-2/files/patch-np_sdk b/editors/openoffice.org-2/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice.org-2/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-3-RC/files/patch-epm b/editors/openoffice.org-3-RC/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-3-RC/files/patch-np_sdk b/editors/openoffice.org-3-RC/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 810035a0d54a..8beeb3dce2c3 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.2.rc1 +PORTVERSION?= 2.0.2.rc2 CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -15,14 +15,14 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \ ${MASTER_SITE_MOZILLA:S/$/:mozsrc/} MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc -DISTFILES+= OOo_2.0.2rc1_src.tar.gz +DISTFILES+= OOo_2.0.2rc2_src.tar.gz .if defined(WITH_GPC) DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) DISTFILES+= ${ANT_DISTFILE}:antbin .endif -EXTRACT_ONLY= OOo_2.0.2rc1_src.tar.gz +EXTRACT_ONLY= OOo_2.0.2rc2_src.tar.gz MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser @@ -63,7 +63,7 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -OOOTAG?= OOB680_m1 +OOOTAG?= OOB680_m2 INSTALLATION_BASEDIR?= openoffice.org-${PORTVERSION} EXECBASE?= openoffice.org-${PORTVERSION} DIST_SUBDIR= openoffice.org2.0 diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 0cfb9c7816c6..8aaea135a840 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53 -SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6 -SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983 +MD5 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 24867a8b1fe2036012e0a3d446009fd1 +SHA256 (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 3e6be71f2309508a8aeafb27ebeec58f5b9f2fde67e5bcdd6b4062f3d117fdda +SIZE (openoffice.org2.0/OOo_2.0.2rc2_src.tar.gz) = 293166842 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 diff --git a/editors/openoffice.org-3/files/patch-epm b/editors/openoffice.org-3/files/patch-epm deleted file mode 100644 index 8808325b529d..000000000000 --- a/editors/openoffice.org-3/files/patch-epm +++ /dev/null @@ -1,124 +0,0 @@ -Index: epm/epm-3.7.patch -=================================================================== -RCS file: /cvs/external/epm/epm-3.7.patch,v -retrieving revision 1.8 -diff -u -r1.8 epm-3.7.patch ---- epm/epm-3.7.patch 3 Feb 2006 17:32:08 -0000 1.8 -+++ epm/epm-3.7.patch 11 Feb 2006 09:28:33 -0000 -@@ -546,3 +546,116 @@ - } - - --- 457,462 ---- -+*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 -+--- misc/build/epm-3.7/bsd.c Thu Jan 19 17:05:43 2006 -+*************** -+*** 26,31 **** -+--- 26,38 ---- -+ -+ #include "epm.h" -+ -++ void cr2semicolon(char *command) -++ { -++ int len, i; -++ len=strlen(command); -++ for (i=0;i<len;i++) -++ if(*(command+i)=='\n') *(command+i)=';'; -++ } -+ -+ /* -+ * 'make_bsd()' - Make a FreeBSD software distribution package. -+*************** -+*** 149,156 **** -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+ else -+ #ifdef __FreeBSD__ -+ /* -+--- 156,172 ---- -+ -+ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) -+ { -+! #ifdef __FreeBSD__ -+! if (d->type == DEPEND_REQUIRES) { -+! if (dist->relnumber) -+! fprintf(fp, "@pkgdep %s-%s-%d-%s", d->product, dist->version, dist->relnumber, platname); -+! else -+! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); -+! } -+! #else -+! if (d->type == DEPEND_REQUIRES) -+! fprintf(fp, "@pkgdep %s", d->product); -+! #endif -+ else -+ #ifdef __FreeBSD__ -+ /* -+*************** -+*** 179,187 **** -+--- 196,206 ---- -+ " by the BSD packager.\n", stderr); -+ break; -+ case COMMAND_POST_INSTALL : -++ cr2semicolon(c->command); -+ fprintf(fp, "@exec %s\n", c->command); -+ break; -+ case COMMAND_PRE_REMOVE : -++ cr2semicolon(c->command); -+ fprintf(fp, "@unexec %s\n", c->command); -+ break; -+ case COMMAND_POST_REMOVE : -+*************** -+*** 199,205 **** -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /bin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+--- 218,224 ---- -+ */ -+ -+ fprintf(fp, "@exec /bin/mkdir -p %s\n", file->dst); -+! fprintf(fp, "@exec /usr/sbin/chown %s:%s %s\n", file->user, file->group, -+ file->dst); -+ fprintf(fp, "@exec /bin/chmod %04o %s\n", file->mode, file->dst); -+ } -+*** misc/epm-3.7/qprintf.c Tue Jan 28 06:48:03 2003 -+--- misc/build/epm-3.7/qprintf.c Thu Jan 19 17:04:22 2006 -+*************** -+*** 181,192 **** -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! -+ putc(*s, fp); -+ } -+ -+--- 181,199 ---- -+ -+ for (i = slen; i > 0; i --, s ++, bytes ++) -+ { -++ #if defined(__FreeBSD__) -++ if (strchr("`~!#%^&*()[{]}\\|;\'\"<>? ", *s)) -++ { -++ putc('\\', fp); -++ bytes ++; -++ } -++ #else -+ if (strchr("`~!#$%^&*()[{]}\\|;\'\"<>? ", *s)) -+ { -+ putc('\\', fp); -+ bytes ++; -+ } -+! #endif -+ putc(*s, fp); -+ } -+ diff --git a/editors/openoffice.org-3/files/patch-np_sdk b/editors/openoffice.org-3/files/patch-np_sdk deleted file mode 100644 index 0860582dc100..000000000000 --- a/editors/openoffice.org-3/files/patch-np_sdk +++ /dev/null @@ -1,15 +0,0 @@ -Index: np_sdk/mozsrc/makefile.mk -=================================================================== -RCS file: /cvs/external/np_sdk/mozsrc/makefile.mk,v -retrieving revision 1.2.2.1 -diff -u -r1.2.2.1 makefile.mk ---- np_sdk/mozsrc/makefile.mk 10 Feb 2006 14:06:33 -0000 1.2.2.1 -+++ np_sdk/mozsrc/makefile.mk 15 Feb 2006 13:47:31 -0000 -@@ -41,7 +41,6 @@ - # --- Settings ----------------------------------------------------- - - .INCLUDE : settings.mk --SOLARINC= - JDKINCS= - - # --- Files -------------------------------------------------------- |