diff options
author | Maho Nakata <maho@FreeBSD.org> | 2005-12-04 04:15:15 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2005-12-04 04:15:15 +0000 |
commit | cf35d05477328b2d3e1e11fee6e2ce4275238567 (patch) | |
tree | 3f3a94204838c32c46e92d7ac70b26965daba27b /editors/ooo-build | |
parent | bd3ae8b0ebd1b9ef90b66008da91cb5d6bc097b5 (diff) | |
download | ports-cf35d05477328b2d3e1e11fee6e2ce4275238567.tar.gz ports-cf35d05477328b2d3e1e11fee6e2ce4275238567.zip |
Notes
Diffstat (limited to 'editors/ooo-build')
-rw-r--r-- | editors/ooo-build/Makefile | 91 | ||||
-rw-r--r-- | editors/ooo-build/Makefile~ | 91 | ||||
-rw-r--r-- | editors/ooo-build/distinfo | 36 | ||||
-rw-r--r-- | editors/ooo-build/files/cairo-patch | 45 | ||||
-rw-r--r-- | editors/ooo-build/files/ooo-build-patch | 44 | ||||
-rw-r--r-- | editors/ooo-build/files/ooo-build-patch-devel | 60 | ||||
-rw-r--r-- | editors/ooo-build/files/patch-i18npool | 8 |
7 files changed, 375 insertions, 0 deletions
diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile new file mode 100644 index 000000000000..ab3008fbf825 --- /dev/null +++ b/editors/ooo-build/Makefile @@ -0,0 +1,91 @@ +# New ports collection makefile for: ooo-build +# Date created: 4 Dec 2005 +# Whom: Nakata Maho <maho@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= ooo-build +PORTVERSION= ${OOO-BUILDVERSION} +MASTER_SITES+= http://ooo.ximian.com/packages/OOO680/ \ + http://ooo.ximian.com/packages/SRC680/ \ + ${MASTER_SITE_SOURCEFORGE:S/$/:wpd/}:wpd \ + http://www.openclipart.org/downloads/0.18/:openclipart +MASTER_SITE_SUBDIR+= libwpd/:wpd +DISTFILES+= ${OOOBUILD_SOURCE} ${OOO_CAIRO} \ + ${OOO_MDBTOOLS} ${OOO_LIBWPD}:wpd \ + ${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \ + ${OOO_OPENCLIPART}:openclipart + +MAINTAINER= maho@FreeBSD.org + +#DEVELOPER_VER= yes #you must be an expert or guru to activate this +.if defined(DEVELOPER_VER) +OOO-BUILDVERSION=2.0.0.${MILESTONE} +MILESTONE= 140 +OOOBUILD= ooo-build-src680.140.1 +OOOBUILD_SOURCE=${OOOBUILD}.tar.gz +OOO_CAIRO= cairo-1.0.2.tar.gz +OOO_MDBTOOLS= mdbtools-0.6pre1.tar.gz +OOO_LIBWPD= libwpd-0.8.3.tar.gz +OOO_EXTRA_ARTWORK=extras-2.tar.bz2 +OOO_CRYSTAL_IMAGES= ooo_crystal_images-6.tar.bz2 +OOO_OPENCLIPART= openclipart-0.18-full.tar.gz +OOO_PATCHDIR=src680 +.else +OOO-BUILDVERSION=2.0.0.2 +OOOBUILD= ooo-build-${OOO-BUILDVERSION} +OOOBUILD_SOURCE=${OOOBUILD}.tar.gz +OOO_CAIRO= cairo-1.0.2.tar.gz +OOO_MDBTOOLS= mdbtools-0.6pre1.tar.gz +OOO_LIBWPD= libwpd-0.8.3.tar.gz +OOO_EXTRA_ARTWORK=extras-2.tar.bz2 +OOO_CRYSTAL_IMAGES= ooo_crystal_images-6.tar.bz2 +OOO_OPENCLIPART= openclipart-0.18-full.tar.gz +OOO_PATCHDIR=OOO_2_0 +.endif + +MD5_FILE= ${.CURDIR}/distinfo +USE_AUTOTOOLS= autoconf:259 + +CONFIGURE_ARGS+= --with-icons="hicontrast industrial crystal" +#workarounds +CONFIGURE_ARGS+= --disable-access --disable-binfilter + +INSTALLATION_BASEDIR= ooo-build-${PORTVERSION} +EXECBASE= ooo-build-${PORTVERSION} +DIST_SUBDIR= openoffice.org2.0 +SIMPLEOSVER= ${OSREL:C/\.//g} +PACKAGE_BASENAME= ooo-build-${PORTVERSION}-${OPSYS}${SIMPLEOSVER}Intel + +pre-configure: +#see ooo-build*/bin/unpack and others for details + @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz - +.if !defined(DEVELOPER_VER) + @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch + @cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter +.else + @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel + @cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=src680-m${MILESTONE} +.endif + @${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download + @${MKDIR} ${WRKSRC}/mdbtools/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_MDBTOOLS} ${WRKSRC}/mdbtools/download + @${MKDIR} ${WRKSRC}/libwpd/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPD} ${WRKSRC}/libwpd/download + @${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/ +#extract some goodies + cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK} + #cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART} +#industrial set + @cd ${WRKSRC}/ooo_custom_images/industrial/res/commandimagelist ; ${CP} -f lc_zoomplus.png lc_zoomin.png ; ${CP} -f sc_zoomplus.png sc_zoomin.png ; ${RM} -f ${WRKSRC}/extras/source/autotext/lang/en-US/acor_en-GB.* + @${RM} -f ${WRKSRC}/ooo_custom_images/industrial/vcl/source/src/check* + @${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} -C ${WRKSRC}/ooo_custom_images + +#apply FreeBSD specifc (?) patches for ooo-build :( + @cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch + @cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/patch-i18npool + +.if defined(DEVELOPER_VER) +MASTERDIR= ${.CURDIR}/../openoffice.org-2.0-devel +.else +MASTERDIR= ${.CURDIR}/../openoffice.org-2.0 +.endif + +.include "${MASTERDIR}/Makefile" diff --git a/editors/ooo-build/Makefile~ b/editors/ooo-build/Makefile~ new file mode 100644 index 000000000000..3607f8e2be77 --- /dev/null +++ b/editors/ooo-build/Makefile~ @@ -0,0 +1,91 @@ +# New ports collection makefile for: ooo-build +# Date created: 4 Dec 2005 +# Whom: Nakata Maho <maho@FreeBSD.org> +# $FreeBSD: /tmp/pcvs/ports/editors/ooo-build/Attic/Makefile~,v 1.1 2005-12-04 04:15:15 maho Exp $ + +PORTNAME= ooo-build +PORTVERSION= ${OOO-BUILDVERSION} +MASTER_SITES+= http://ooo.ximian.com/packages/OOO680/ \ + http://ooo.ximian.com/packages/SRC680/ \ + ${MASTER_SITE_SOURCEFORGE:S/$/:wpd/}:wpd \ + http://www.openclipart.org/downloads/0.18/:openclipart +MASTER_SITE_SUBDIR+= libwpd/:wpd +DISTFILES+= ${OOOBUILD_SOURCE} ${OOO_CAIRO} \ + ${OOO_MDBTOOLS} ${OOO_LIBWPD}:wpd \ + ${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \ + ${OOO_OPENCLIPART}:openclipart + +MAINTAINER= maho@FreeBSD.org + +#DEVELOPER_VER= yes #you must be an expert or guru to activate this +.if defined(DEVELOPER_VER) +OOO-BUILDVERSION=2.0.0.${MILESTONE} +MILESTONE= 140 +OOOBUILD= ooo-build-src680.140.1 +OOOBUILD_SOURCE=${OOOBUILD}.tar.gz +OOO_CAIRO= cairo-1.0.2.tar.gz +OOO_MDBTOOLS= mdbtools-0.6pre1.tar.gz +OOO_LIBWPD= libwpd-0.8.3.tar.gz +OOO_EXTRA_ARTWORK=extras-2.tar.bz2 +OOO_CRYSTAL_IMAGES= ooo_crystal_images-6.tar.bz2 +OOO_OPENCLIPART= openclipart-0.18-full.tar.gz +OOO_PATCHDIR=src680 +.else +OOO-BUILDVERSION=2.0.0.2 +OOOBUILD= ooo-build-${OOO-BUILDVERSION} +OOOBUILD_SOURCE=${OOOBUILD}.tar.gz +OOO_CAIRO= cairo-1.0.2.tar.gz +OOO_MDBTOOLS= mdbtools-0.6pre1.tar.gz +OOO_LIBWPD= libwpd-0.8.3.tar.gz +OOO_EXTRA_ARTWORK=extras-2.tar.bz2 +OOO_CRYSTAL_IMAGES= ooo_crystal_images-6.tar.bz2 +OOO_OPENCLIPART= openclipart-0.18-full.tar.gz +OOO_PATCHDIR=OOO_2_0 +.endif + +MD5_FILE= ${.CURDIR}/distinfo +USE_AUTOTOOLS= autoconf:259 + +CONFIGURE_ARGS+= --with-icons="hicontrast industrial crystal" +#workarounds +CONFIGURE_ARGS+= --disable-access --disable-binfilter + +INSTALLATION_BASEDIR= ooo-build-${PORTVERSION} +EXECBASE= ooo-build-${PORTVERSION} +DIST_SUBDIR= openoffice.org2.0 +SIMPLEOSVER= ${OSREL:C/\.//g} +PACKAGE_BASENAME= ooo-build-${PORTVERSION}-${OPSYS}${SIMPLEOSVER}Intel + +pre-configure: +#see ooo-build*/bin/unpack and others for details + @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz - +.if !defined(DEVELOPER_VER) + @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch + @cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter +.else + @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel + @cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=src680-m${MILESTONE} +.endif + @${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download + @${MKDIR} ${WRKSRC}/mdbtools/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_MDBTOOLS} ${WRKSRC}/mdbtools/download + @${MKDIR} ${WRKSRC}/libwpd/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPD} ${WRKSRC}/libwpd/download + @${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/ +#extract some goodies + cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK} + #cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART} +#industrial set + @cd ${WRKSRC}/ooo_custom_images/industrial/res/commandimagelist ; ${CP} -f lc_zoomplus.png lc_zoomin.png ; ${CP} -f sc_zoomplus.png sc_zoomin.png ; ${RM} -f ${WRKSRC}/extras/source/autotext/lang/en-US/acor_en-GB.* + @${RM} -f ${WRKSRC}/ooo_custom_images/industrial/vcl/source/src/check* + @${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} -C ${WRKSRC}/ooo_custom_images + +#apply FreeBSD specifc (?) patches for ooo-build :( + @cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch + @cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/patch-i18npool + +.if defined(DEVELOPER_VER) +MASTERDIR= ${.CURDIR}/../openoffice.org-2.0-devel +.else +MASTERDIR= ${.CURDIR}/../openoffice.org-2.0 +.endif + +.include "${MASTERDIR}/Makefile" diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo new file mode 100644 index 000000000000..cb47e484f59d --- /dev/null +++ b/editors/ooo-build/distinfo @@ -0,0 +1,36 @@ +MD5 (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = ecbbc059d9913d54be592fdab9e91785 +SHA256 (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = 674ac9b0d333f801453d6229d16364026f700accc59563a8f20c885a8074ff34 +SIZE (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = 4350834 +MD5 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984 +SHA256 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e +SIZE (openoffice.org2.0/cairo-1.0.2.tar.gz) = 1458903 +MD5 (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 246e8f38b2a1af1bcff60ee0da59300b +SHA256 (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3 +SIZE (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 611756 +MD5 (openoffice.org2.0/libwpd-0.8.3.tar.gz) = f34404f8dc6123aca156d203c37e3e5d +SHA256 (openoffice.org2.0/libwpd-0.8.3.tar.gz) = 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c +SIZE (openoffice.org2.0/libwpd-0.8.3.tar.gz) = 482757 +MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020 +SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 +SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740 +MD5 (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 586d0f26b3f79d89bbb5b25b874e3df6 +SHA256 (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7 +SIZE (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 1308872 +MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619 +SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a +SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000 +MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa +SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b +SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325 +MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 +SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e +SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917 +MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14 +SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445 +SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366 +MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd +SHA256 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 6e833a8b5fc8c8b99be61d1c50ab0f5ec9fb731e6115d4b2bc927bcfea37a303 +SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335 +MD5 (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 885ab7d1cd41e8af6ba95b18d1adca04 +SHA256 (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 3dca8c41c5f80963f3ea605c428d15c3a072c65ec5c75971cef2c3103c4042fa +SIZE (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 4518998 diff --git a/editors/ooo-build/files/cairo-patch b/editors/ooo-build/files/cairo-patch new file mode 100644 index 000000000000..00085a0cd537 --- /dev/null +++ b/editors/ooo-build/files/cairo-patch @@ -0,0 +1,45 @@ +--- cairo/makefile.mk Wed Nov 2 14:03:55 2005 ++++ cairo/makefile.mk Wed Nov 2 14:00:02 2005 +@@ -81,6 +81,7 @@ + + TARFILE_NAME=cairo-1.0.2 + ++PATCH_FILE_NAME=$(TARFILE_NAME).patch + CONFIGURE_DIR= + + CONFIGURE_ACTION=./configure + +--- /dev/null Wed Nov 2 14:36:58 2005 ++++ cairo/cairo-1.0.2.patch Wed Nov 2 14:01:33 2005 +@@ -0,0 +1,31 @@ ++*** misc/cairo-1.0.2/ltmain.sh 2004-08-26 08:00:15.000000000 +0200 ++--- misc/build/cairo-1.0.2/ltmain.sh 2005-05-09 19:55:51.745319024 +0200 ++*************** ++*** 2994,3006 **** ++ ;; ++ ++ freebsd-aout) ++! major=".$current" ++! versuffix=".$current.$revision"; ++ ;; ++ ++ freebsd-elf) ++! major=".$current" ++! versuffix=".$current"; ++ ;; ++ ++ irix | nonstopux) ++--- 2994,3006 ---- ++ ;; ++ ++ freebsd-aout) ++! major=.`expr $current - $age` ++! versuffix="$major.$age.$revision" ++ ;; ++ ++ freebsd-elf) ++! major=.`expr $current - $age` ++! versuffix="$major.$age.$revision" ++ ;; ++ ++ irix | nonstopux) diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch new file mode 100644 index 000000000000..ed9a2dc3c6e8 --- /dev/null +++ b/editors/ooo-build/files/ooo-build-patch @@ -0,0 +1,44 @@ +gnu patch is gpatch for FreeBSD. +--- patches/apply.pl Tue Nov 1 00:07:02 2005 ++++ patches/apply.pl Tue Nov 1 00:07:32 2005 +@@ -473,7 +473,7 @@ + my $ver_line; + my $is_old = 1; + +- open ($Patch, "patch --version|") || die "Can't run patch: $!"; ++ open ($Patch, "gpatch --version|") || die "Can't run patch: $!"; + $ver_line = <$Patch>; + $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n"; + if ($1 >= 2 && $2 >= 5 && $3 >= 9) { +@@ -597,7 +597,7 @@ + $applied_patches = $dest_dir.'/applied_patches'; + + $opts = join ' ', @arguments; +- $base_cmd = "patch -l -p0 $opts -d $dest_dir"; ++ $base_cmd = "gpatch -l -p0 $opts -d $dest_dir"; + if (is_old_patch_version()) { + $base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd; + } + +--- patches/OOO_2_0/apply.orig Wed Nov 30 01:16:48 2005 ++++ patches/OOO_2_0/apply Sun Dec 4 11:54:05 2005 +@@ -57,6 +57,8 @@ + Gentoo64: GentooBase, 64bit + # Win32 + Win32 : Win32Common, NovellOnly, NovellOnlyWin32 ++# FreeBSD ++FreeBSD : LinuxCommon, NotDebian + + # -------- [ Tag [ >= <tag> etc. ], ] patch sets -------- + +@@ -495,7 +497,7 @@ + # Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3) + sal-cxa-guard.diff + # do not pack any potential .orig files with ppds +-psprint_config-no-orig.diff ++#psprint_config-no-orig.diff #don't apply for FBSD patch (workaround) + # Fix ODK Java bits + odk-java-wizpanel.diff + # add possibility to set ARCH_FLAGS when building libnas + + diff --git a/editors/ooo-build/files/ooo-build-patch-devel b/editors/ooo-build/files/ooo-build-patch-devel new file mode 100644 index 000000000000..fa28f6b6238d --- /dev/null +++ b/editors/ooo-build/files/ooo-build-patch-devel @@ -0,0 +1,60 @@ +gnu patch is gpatch for FreeBSD. +--- patches/apply.pl Tue Nov 1 00:07:02 2005 ++++ patches/apply.pl Tue Nov 1 00:07:32 2005 +@@ -473,7 +473,7 @@ + my $ver_line; + my $is_old = 1; + +- open ($Patch, "patch --version|") || die "Can't run patch: $!"; ++ open ($Patch, "gpatch --version|") || die "Can't run patch: $!"; + $ver_line = <$Patch>; + $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n"; + if ($1 >= 2 && $2 >= 5 && $3 >= 9) { +@@ -597,7 +597,7 @@ + $applied_patches = $dest_dir.'/applied_patches'; + + $opts = join ' ', @arguments; +- $base_cmd = "patch -l -p0 $opts -d $dest_dir"; ++ $base_cmd = "gpatch -l -p0 $opts -d $dest_dir"; + if (is_old_patch_version()) { + $base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd; + } + +--- patches/src680/apply.orig Wed Nov 30 18:02:19 2005 ++++ patches/src680/apply Sat Dec 3 20:05:50 2005 +@@ -64,6 +64,8 @@ + Gentoo64: GentooBase, 64bit + # Win32 + Win32 : Win32Common, NovellOnly, NovellOnlyWin32 ++# FreeBSD ++FreeBSD : LinuxCommon, NotDebian + + # -------- [ Tag [ >= <tag> etc. ], ] patch sets -------- + +@@ -80,7 +82,7 @@ + + [ TemporaryHacks == src680-m140 ] + # silly snafu. +-buildfix-svtools-m140.diff ++# buildfix-svtools-m140.diff # not compatible with my checkout(master fixed) + + [ TemporaryHacks ] + # adding glib-2.0 and ORBit-2.0 to pkgconfig modules; i#47923 +@@ -338,7 +340,7 @@ + + [ Shrink ] + # strip 450k of .comment sections - i#57063 +-size-strip.diff ++# size-strip.diff #break the build of FBSD see my comment on #i57063# + # save 1.7Mb of (shared) memory for non-asian locales + cws-i18nshrink.diff + +@@ -587,7 +589,7 @@ + # Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3) + sal-cxa-guard.diff + # do not pack any potential .orig files with ppds +-psprint_config-no-orig.diff ++#psprint_config-no-orig.diff #don't apply for FBSD patch (workaround) + # Fix ODK Java bits + odk-java-wizpanel.diff + # add possibility to set ARCH_FLAGS when building libnas diff --git a/editors/ooo-build/files/patch-i18npool b/editors/ooo-build/files/patch-i18npool new file mode 100644 index 000000000000..d411310e9ba3 --- /dev/null +++ b/editors/ooo-build/files/patch-i18npool @@ -0,0 +1,8 @@ +--- i18npool/prj/build.lst~ Wed Nov 2 10:54:24 2005 ++++ i18npool/prj/build.lst Wed Nov 2 14:41:04 2005 +@@ -1,4 +1,4 @@ +-inp i18npool : bridges sax stoc comphelper tools ICU:icu i18nutil regexp NULL ++inp i18npool : bridges sax stoc comphelper tools icu i18nutil regexp NULL + inp i18npool usr1 - all inp_mkout NULL + inp i18npool\source\unotypes nmake - all inp_utypes NULL + inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL |