kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to DEV300_m82

Browse source 
Funded by: OpenOffice.org community.
Feature safe:	yes
This commit is contained in:
Maho Nakata 2010-06-20 05:23:51 +00:00
parent bf0f11d505
commit 466c89c5be
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=256753
6 changed files with 136 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editors/openoffice-3-devel/Makefile
View file

@ -85,11 +85,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
.endif .endif
MILESTONE?= 81 MILESTONE?= 82
OOOTAG?= DEV300_m${MILESTONE} OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3 OOODIR= openoffice.org3
SNAPDATE= 20100613 SNAPDATE= 20100619
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3 DIST_SUBDIR= openoffice.org3

6
editors/openoffice-3-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = dd9d8804f3b60d1d40448db2e96195dd MD5 (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 94ad5f2dbf59575b423f6f6b5fda4dfe
SHA256 (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = b28a10b84bd86f676936c091ece326ff677ca50b06efdef274cd619ceaa29484 SHA256 (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 8d753b44df9a173d59778090106124499f8334896cacfb6154816c7d0a65075d
SIZE (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = 309332623 SIZE (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 309929157
MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41
SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef
SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823

162
editors/openoffice-3-devel/files/patch-i73217
View file

@ -1,99 +1,63 @@
It won't fix in the master as it breaks the POSIX. --- epm/epm-3.7.patch.org 2010-06-19 19:51:40.000000000 +0900
+++ epm/epm-3.7.patch 2010-06-20 08:09:43.000000000 +0900
Index: epm/epm-3.7.patch @@ -303,6 +303,15 @@
=================================================================== diff -urN epm-3.7-old//dist.c epm-3.7/dist.c
RCS file: /cvs/external/epm/epm-3.7.patch,v --- misc/epm-3.7/dist.c 2003-08-07 14:14:40.000000000 +0000
retrieving revision 1.11 +++ misc/build/epm-3.7/dist.c 2010-04-19 22:52:32.000000000 +0000
diff -u -r1.11 epm-3.7.patch +@@ -339,7 +339,7 @@
--- epm/epm-3.7.patch 1 Aug 2006 12:20:23 -0000 1.11 + const char *defval) /* I - Default value of option */
+++ epm/epm-3.7.patch 6 Jan 2007 10:10:38 -0000 + {
@@ -247,6 +247,23 @@ + char *ptr; /* Pointer to option */
*** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003 +- static char option[256]; /* Copy of file option */
--- misc/build/epm-3.7/dist.c Wed Jul 26 21:01:11 2006 ++ static char option[1024]; /* Copy of file option */
*************** +
+*** 339,345 **** +
+ const char *defval) /* I - Default value of option */ + /*
+ { @@ -394,8 +394,13 @@
+ char *ptr; /* Pointer to option */ strcpy(platform->machine, "mips");
+! static char option[256]; /* Copy of file option */ #elif defined(__hpux)
+ @@ -332,6 +341,24 @@
+ else if (strncmp(platform->machine, "sun", 3) == 0)
+ /* strcpy(platform->machine, "sparc");
+--- 339,345 ---- #endif /* __sgi */
+ const char *defval) /* I - Default value of option */ +@@ -560,13 +560,13 @@
+ { + char line[2048], /* Expanded line from list file */
+ char *ptr; /* Pointer to option */ + buf[1024], /* Original line from list file */
+! static char option[1024]; /* Copy of file option */ + type, /* File type */
+ +- dst[256], /* Destination path */
+ +- src[256], /* Source path */
+ /* +- pattern[256], /* Pattern for source files */
+*************** ++ dst[1024], /* Destination path */
*** 394,401 **** ++ src[1024], /* Source path */
strcpy(platform->machine, "mips"); ++ pattern[1024], /* Pattern for source files */
#elif defined(__hpux) + user[32], /* User */
@@ -292,6 +309,35 @@ + group[32], /* Group */
else if (strncmp(platform->machine, "sun", 3) == 0) + *temp, /* Temporary pointer */
strcpy(platform->machine, "sparc"); +- options[256]; /* File options */
#endif /* __sgi */ ++ options[1024]; /* File options */
+*************** + int mode, /* File permissions */
+*** 550,562 **** + skip; /* 1 = skip files, 0 = archive files */
+ char line[2048], /* Expanded line from list file */ + dist_t *dist; /* Distribution data */
+ buf[1024], /* Original line from list file */ diff -urN epm-3.7-old//epm.c epm-3.7/epm.c
+ type, /* File type */ --- misc/epm-3.7/epm.c 2003-10-28 14:48:30.000000000 +0000
+! dst[256], /* Destination path */ +++ misc/build/epm-3.7/epm.c 2010-04-19 22:52:32.000000000 +0000
+! src[256], /* Source path */ @@ -655,3 +682,19 @@
+! pattern[256], /* Pattern for source files */ return (0);
+ user[32], /* User */ }
+ group[32], /* Group */
+ *temp, /* Temporary pointer */ +diff -urN epm-3.7-old//rpm.c epm-3.7/epm.h
+! options[256]; /* File options */ +--- misc/epm-3.7/epm.h 2003-10-01 19:27:15.000000000 +0000
+ int mode, /* File permissions */ ++++ misc/build/epm-3.7/epm.h 2010-04-19 22:52:32.000000000 +0000
+ skip; /* 1 = skip files, 0 = archive files */ +@@ -167,9 +167,9 @@
+ dist_t *dist; /* Distribution data */ + int mode; /* Permissions of file */
+--- 560,572 ---- + char user[32], /* Owner of file */
+ char line[2048], /* Expanded line from list file */ + group[32], /* Group of file */
+ buf[1024], /* Original line from list file */ +- src[512], /* Source path */
+ type, /* File type */ +- dst[512], /* Destination path */
+! dst[1024], /* Destination path */ +- options[256]; /* File options (nostrip, etc.) */
+! src[1024], /* Source path */ ++ src[1024], /* Source path */
+! pattern[1024], /* Pattern for source files */ ++ dst[1024], /* Destination path */
+ user[32], /* User */ ++ options[1024]; /* File options (nostrip, etc.) */
+ group[32], /* Group */ + } file_t;
+ *temp, /* Temporary pointer */ +
+! options[1024]; /* File options */ + typedef struct /**** Install/Patch/Remove Commands ****/
+ int mode, /* File permissions */
+ skip; /* 1 = skip files, 0 = archive files */
+ dist_t *dist; /* Distribution data */
*** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003
--- misc/build/epm-3.7/epm.c Wed Jul 26 20:59:48 2006
***************
@@ -304,6 +350,29 @@
puts("");
puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
puts("see the GNU General Public License in the file COPYING or at");
+*** misc/epm-3.7/epm.h Thu Jul 24 10:20:54 2003
+--- misc/build/epm-3.7/epm.h Sat Jan 6 19:08:44 2007
+***************
+*** 167,175 ****
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[512], /* Source path */
+! dst[512], /* Destination path */
+! options[256]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
+--- 167,175 ----
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[1024], /* Source path */
+! dst[1024], /* Destination path */
+! options[1024]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
*** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003
--- misc/build/epm-3.7/file.c Wed Jul 26 20:59:48 2006
***************

4
editors/openoffice.org-3-devel/Makefile
View file

@ -85,11 +85,11 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh
FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
.endif .endif
MILESTONE?= 81 MILESTONE?= 82
OOOTAG?= DEV300_m${MILESTONE} OOOTAG?= DEV300_m${MILESTONE}
OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX}
OOODIR= openoffice.org3 OOODIR= openoffice.org3
SNAPDATE= 20100613 SNAPDATE= 20100619
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
EXECBASE?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG}
DIST_SUBDIR= openoffice.org3 DIST_SUBDIR= openoffice.org3

6
editors/openoffice.org-3-devel/distinfo
View file

@ -1,6 +1,6 @@
MD5 (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = dd9d8804f3b60d1d40448db2e96195dd MD5 (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 94ad5f2dbf59575b423f6f6b5fda4dfe
SHA256 (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = b28a10b84bd86f676936c091ece326ff677ca50b06efdef274cd619ceaa29484 SHA256 (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 8d753b44df9a173d59778090106124499f8334896cacfb6154816c7d0a65075d
SIZE (openoffice.org3/OOo_DEV300_m81_source.tar.bz2) = 309332623 SIZE (openoffice.org3/OOo_DEV300_m82_source.tar.bz2) = 309929157
MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41
SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef
SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823

162
editors/openoffice.org-3-devel/files/patch-i73217
View file

@ -1,99 +1,63 @@
It won't fix in the master as it breaks the POSIX. --- epm/epm-3.7.patch.org 2010-06-19 19:51:40.000000000 +0900
+++ epm/epm-3.7.patch 2010-06-20 08:09:43.000000000 +0900
Index: epm/epm-3.7.patch @@ -303,6 +303,15 @@
=================================================================== diff -urN epm-3.7-old//dist.c epm-3.7/dist.c
RCS file: /cvs/external/epm/epm-3.7.patch,v --- misc/epm-3.7/dist.c 2003-08-07 14:14:40.000000000 +0000
retrieving revision 1.11 +++ misc/build/epm-3.7/dist.c 2010-04-19 22:52:32.000000000 +0000
diff -u -r1.11 epm-3.7.patch +@@ -339,7 +339,7 @@
--- epm/epm-3.7.patch 1 Aug 2006 12:20:23 -0000 1.11 + const char *defval) /* I - Default value of option */
+++ epm/epm-3.7.patch 6 Jan 2007 10:10:38 -0000 + {
@@ -247,6 +247,23 @@ + char *ptr; /* Pointer to option */
*** misc/epm-3.7/dist.c Thu Aug 7 16:14:40 2003 +- static char option[256]; /* Copy of file option */
--- misc/build/epm-3.7/dist.c Wed Jul 26 21:01:11 2006 ++ static char option[1024]; /* Copy of file option */
*************** +
+*** 339,345 **** +
+ const char *defval) /* I - Default value of option */ + /*
+ { @@ -394,8 +394,13 @@
+ char *ptr; /* Pointer to option */ strcpy(platform->machine, "mips");
+! static char option[256]; /* Copy of file option */ #elif defined(__hpux)
+ @@ -332,6 +341,24 @@
+ else if (strncmp(platform->machine, "sun", 3) == 0)
+ /* strcpy(platform->machine, "sparc");
+--- 339,345 ---- #endif /* __sgi */
+ const char *defval) /* I - Default value of option */ +@@ -560,13 +560,13 @@
+ { + char line[2048], /* Expanded line from list file */
+ char *ptr; /* Pointer to option */ + buf[1024], /* Original line from list file */
+! static char option[1024]; /* Copy of file option */ + type, /* File type */
+ +- dst[256], /* Destination path */
+ +- src[256], /* Source path */
+ /* +- pattern[256], /* Pattern for source files */
+*************** ++ dst[1024], /* Destination path */
*** 394,401 **** ++ src[1024], /* Source path */
strcpy(platform->machine, "mips"); ++ pattern[1024], /* Pattern for source files */
#elif defined(__hpux) + user[32], /* User */
@@ -292,6 +309,35 @@ + group[32], /* Group */
else if (strncmp(platform->machine, "sun", 3) == 0) + *temp, /* Temporary pointer */
strcpy(platform->machine, "sparc"); +- options[256]; /* File options */
#endif /* __sgi */ ++ options[1024]; /* File options */
+*************** + int mode, /* File permissions */
+*** 550,562 **** + skip; /* 1 = skip files, 0 = archive files */
+ char line[2048], /* Expanded line from list file */ + dist_t *dist; /* Distribution data */
+ buf[1024], /* Original line from list file */ diff -urN epm-3.7-old//epm.c epm-3.7/epm.c
+ type, /* File type */ --- misc/epm-3.7/epm.c 2003-10-28 14:48:30.000000000 +0000
+! dst[256], /* Destination path */ +++ misc/build/epm-3.7/epm.c 2010-04-19 22:52:32.000000000 +0000
+! src[256], /* Source path */ @@ -655,3 +682,19 @@
+! pattern[256], /* Pattern for source files */ return (0);
+ user[32], /* User */ }
+ group[32], /* Group */
+ *temp, /* Temporary pointer */ +diff -urN epm-3.7-old//rpm.c epm-3.7/epm.h
+! options[256]; /* File options */ +--- misc/epm-3.7/epm.h 2003-10-01 19:27:15.000000000 +0000
+ int mode, /* File permissions */ ++++ misc/build/epm-3.7/epm.h 2010-04-19 22:52:32.000000000 +0000
+ skip; /* 1 = skip files, 0 = archive files */ +@@ -167,9 +167,9 @@
+ dist_t *dist; /* Distribution data */ + int mode; /* Permissions of file */
+--- 560,572 ---- + char user[32], /* Owner of file */
+ char line[2048], /* Expanded line from list file */ + group[32], /* Group of file */
+ buf[1024], /* Original line from list file */ +- src[512], /* Source path */
+ type, /* File type */ +- dst[512], /* Destination path */
+! dst[1024], /* Destination path */ +- options[256]; /* File options (nostrip, etc.) */
+! src[1024], /* Source path */ ++ src[1024], /* Source path */
+! pattern[1024], /* Pattern for source files */ ++ dst[1024], /* Destination path */
+ user[32], /* User */ ++ options[1024]; /* File options (nostrip, etc.) */
+ group[32], /* Group */ + } file_t;
+ *temp, /* Temporary pointer */ +
+! options[1024]; /* File options */ + typedef struct /**** Install/Patch/Remove Commands ****/
+ int mode, /* File permissions */
+ skip; /* 1 = skip files, 0 = archive files */
+ dist_t *dist; /* Distribution data */
*** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003
--- misc/build/epm-3.7/epm.c Wed Jul 26 20:59:48 2006
***************
@@ -304,6 +350,29 @@
puts("");
puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
puts("see the GNU General Public License in the file COPYING or at");
+*** misc/epm-3.7/epm.h Thu Jul 24 10:20:54 2003
+--- misc/build/epm-3.7/epm.h Sat Jan 6 19:08:44 2007
+***************
+*** 167,175 ****
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[512], /* Source path */
+! dst[512], /* Destination path */
+! options[256]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
+--- 167,175 ----
+ int mode; /* Permissions of file */
+ char user[32], /* Owner of file */
+ group[32], /* Group of file */
+! src[1024], /* Source path */
+! dst[1024], /* Destination path */
+! options[1024]; /* File options (nostrip, etc.) */
+ } file_t;
+
+ typedef struct /**** Install/Patch/Remove Commands ****/
*** misc/epm-3.7/file.c Wed Jul 23 23:41:08 2003
--- misc/build/epm-3.7/file.c Wed Jul 26 20:59:48 2006
***************