diff options
author | maho <maho@FreeBSD.org> | 2005-06-04 07:18:49 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2005-06-04 07:18:49 +0800 |
commit | a3c9ec1e6c8e0a778f7c480de83ac75ba63d1421 (patch) | |
tree | e4f96d349973f4d365682c5d0acc28da297f8cc6 | |
parent | f75e988222a02881159969cafb13193e0acac827 (diff) | |
download | freebsd-ports-gnome-a3c9ec1e6c8e0a778f7c480de83ac75ba63d1421.tar.gz freebsd-ports-gnome-a3c9ec1e6c8e0a778f7c480de83ac75ba63d1421.tar.zst freebsd-ports-gnome-a3c9ec1e6c8e0a778f7c480de83ac75ba63d1421.zip |
o For QA purpose, add optional target package-canonical.
Using this packaging method, packages must build
without errors. Nevertheless we'll go our own way.
o Change packaging method from generic one to FreeBSD's
native one. This works well for both packaging method
and slightly saves disk space as well.
o Fix some problems arose by using FreeBSD's native
packaging method.
Result of: CodeFest Japan 2005
https://members.fsij.org/trac/codefest2005/
36 files changed, 2352 insertions, 36 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice-2.0-devel/files/patch-epm+epm-3.7.patch b/editors/openoffice-2.0-devel/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice-2.0-devel/files/patch-instsetoo b/editors/openoffice-2.0-devel/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice-3-devel/files/patch-epm+epm-3.7.patch b/editors/openoffice-3-devel/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice-3-devel/files/patch-instsetoo b/editors/openoffice-3-devel/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice-3/files/patch-epm+epm-3.7.patch b/editors/openoffice-3/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice-3/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice-3/files/patch-instsetoo b/editors/openoffice-3/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice-3/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2-RC/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2-RC/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-2-RC/files/patch-instsetoo b/editors/openoffice.org-2-RC/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2-devel/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2-devel/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo b/editors/openoffice.org-2-devel/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2.0-devel/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2.0-devel/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-2.0-devel/files/patch-instsetoo b/editors/openoffice.org-2.0-devel/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2.0/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2.0/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo b/editors/openoffice.org-2.0/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-2/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-2/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-2/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-2/files/patch-instsetoo b/editors/openoffice.org-2/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-2/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-3-RC/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-3-RC/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-3-RC/files/patch-instsetoo b/editors/openoffice.org-3-RC/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-3-devel/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-3-devel/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-3-devel/files/patch-instsetoo b/editors/openoffice.org-3-devel/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-3/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-3/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-3/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-3/files/patch-instsetoo b/editors/openoffice.org-3/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-3/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 94a4282f01d2..800c6c97b989 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -103,7 +103,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch .include <${FILESDIR}/Makefile.knobs> @@ -144,7 +144,7 @@ do-build: .endif do-install: - @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES @${RM} -Rf ${WRKDIR}/tmp @${MKDIR} ${WRKDIR}/tmp @for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \ @@ -198,6 +198,12 @@ package-rename: @${MV} ${PKGFILE} \ ${WRKDIR}/../${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX} +package-canonical: + @${ECHO_MSG} "===> Canonical packaging for OpenOffice.org"; + @cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ;\ + ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz . + sdk: @${ECHO_MSG} "===> Make SDK of OpenOffice.org" @cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd sdk_oo ; build.pl ; deliver.pl' @@ -220,7 +226,7 @@ languagepack: @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) @cd ${WRKDIR}/langpack_tmp ; \ - ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.sw + ${TAR} xf ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/install/${LOCALIZED_LANG}/freebsd-*/openofficeorg-*.tgz @cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ diff --git a/editors/openoffice.org-vcltesttool/files/patch-epm+epm-3.7.patch b/editors/openoffice.org-vcltesttool/files/patch-epm+epm-3.7.patch new file mode 100644 index 000000000000..4cc75dc9a25c --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-epm+epm-3.7.patch @@ -0,0 +1,87 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : epm porting for FreeBSD +o FreeBSD's package manager doesn't allow multiple lines for + @exec and @unexec +o chown is at /usr/sbin/ +o the way to recording package dependency is incorrect + +Index: epm/epm-3.7.patch +=================================================================== +RCS file: /cvs/external/epm/epm-3.7.patch,v +retrieving revision 1.2 +diff -u -r1.2 epm-3.7.patch +--- epm/epm-3.7.patch 10 Mar 2005 11:52:43 -0000 1.2 ++++ epm/epm-3.7.patch 3 Jun 2005 22:05:23 -0000 +@@ -1,3 +1,69 @@ ++*** misc/epm-3.7/bsd.c Wed Jan 15 02:05:01 2003 ++--- misc/build/epm-3.7/bsd.c Sat Jun 4 06:18:27 2005 ++*************** ++*** 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. ++*************** ++*** 150,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__ ++ /* ++--- 157,163 ---- ++ for (i = dist->num_depends, d = dist->depends; i > 0; i --, d ++) ++ { ++ if (d->type == DEPEND_REQUIRES) ++! fprintf(fp, "@pkgdep %s-%s-%s", d->product, dist->version, platname); ++ else ++ #ifdef __FreeBSD__ ++ /* ++*************** ++*** 179,187 **** ++--- 186,196 ---- ++ " 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); ++ } ++--- 208,214 ---- ++ */ ++ ++ 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/epm.c 2003-10-28 15:48:30.000000000 +0100 + --- misc/build/epm-3.7/epm.c 2004-11-24 10:38:40.000000000 +0100 + *************** + diff --git a/editors/openoffice.org-vcltesttool/files/patch-instsetoo b/editors/openoffice.org-vcltesttool/files/patch-instsetoo new file mode 100644 index 000000000000..e0c3eb10a59a --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-instsetoo @@ -0,0 +1,100 @@ +Issutracker : #iXXXXX# +CWS : N/A +Author: : <maho@openoffice.org> (JCA) +Description : remove circular dependency + +in this case, +core01 is depend on core02-core08, and core0[2-9] and core10 +depends on core01. for FreeBSD this is regarded as circular dependency +and pkg_add command is forked infinite times and eats up systems' resource. +namely when core01 tries to install core02, core02 also tries to +install core01. + +Index: instsetoo_native/inc_openoffice/unix/packagelist.txt +=================================================================== +RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v +retrieving revision 1.13 +diff -u -r1.13 packagelist.txt +--- instsetoo_native/inc_openoffice/unix/packagelist.txt 20 Apr 2005 11:38:08 -0000 1.13 ++++ instsetoo_native/inc_openoffice/unix/packagelist.txt 3 Jun 2005 22:58:41 -0000 +@@ -33,7 +33,7 @@ + solarispackagename = "openofficeorg-core01" + solarisrequires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" + packagename = "openofficeorg-core01" +-requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08" ++requires = "openofficeorg-core02,openofficeorg-core03,openofficeorg-core04,openofficeorg-core05,openofficeorg-core06,openofficeorg-core07,openofficeorg-core08,openofficeorg-core09,openofficeorg-core10" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -226,7 +226,6 @@ + solarispackagename = "openofficeorg-core02" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core02" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -238,7 +237,6 @@ + solarispackagename = "openofficeorg-core03" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core03" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -250,7 +248,6 @@ + solarispackagename = "openofficeorg-core04" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core04" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -262,7 +259,6 @@ + solarispackagename = "openofficeorg-core05" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core05" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -274,7 +270,6 @@ + solarispackagename = "openofficeorg-core06" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core06" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -286,7 +281,6 @@ + solarispackagename = "openofficeorg-core07" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core07" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -298,7 +292,6 @@ + solarispackagename = "openofficeorg-core08" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core08" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -310,7 +303,6 @@ + solarispackagename = "openofficeorg-core09" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core09" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" +@@ -323,7 +315,6 @@ + solarispackagename = "openofficeorg-core10" + solarisrequires = "openofficeorg-core01" + packagename = "openofficeorg-core10" +-requires = "openofficeorg-core01" + copyright = "1999-2004 by OpenOffice.org" + vendor = "OpenOffice.org" + description = "Office core module for %PRODUCTNAME %PRODUCTVERSION" |