Index: head/editors/ooo-build/Makefile =================================================================== --- head/editors/ooo-build/Makefile (revision 182351) +++ head/editors/ooo-build/Makefile (revision 182352) @@ -1,97 +1,97 @@ # New ports collection makefile for: ooo-build # Date created: 4 Dec 2005 # Whom: Nakata Maho # $FreeBSD$ PORTNAME= ooo-build PORTVERSION= ${OOOBUILD_VERSION} -MASTER_SITES+= http://www.go-ooo.org/packages/OOD680/ \ +MASTER_SITES+= http://www.go-ooo.org/packages/OOE680/ \ http://www.go-ooo.org/packages/SRC680/ \ http://www.openclipart.org/downloads/0.18/:openclipart DISTFILES+= ${OOOBUILD_SOURCE} \ ${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \ ${OOO_OPENCLIPART}:openclipart MAINTAINER= maho@FreeBSD.org COMMENT= Community enhanced/bug fixed version of OpenOffice.org DESCR= ${.CURDIR}/pkg-descr #DEVELOPER_VER= yes #you must be an expert or guru to activate this .if defined(DEVELOPER_VER) OOOBUILD_VERSION=2.0.2.${MILESTONE} MILESTONE= 156 OOOBUILD_TAG=src680-m${MILESTONE} OOOBUILD= ooo-build-src680.${MILESTONE}.0 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz OOO_EXTRA_ARTWORK=extras-2.tar.bz2 OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz OOO_OPENCLIPART= openclipart-0.18-full.tar.gz OOO_PATCHDIR=src680 .else -OOOBUILD_VERSION=2.0.4.3 -OOOBUILD_TAG=ood680-m5 -OOOSRC= OOo_2.0.4_src.tar.gz -OOOTAG= OOD680_m5 +OOOBUILD_VERSION=2.1 +OOOBUILD_TAG=ooe680-m6 +OOOSRC= OOo_OOE680_m6_source.tar.bz2 +OOOTAG= OOE680_m6 OOOBUILD= ooo-build-${OOOBUILD_VERSION} #OOOBUILD= ooo-build-${OOOBUILD_TAG} OOOBUILD_SOURCE=${OOOBUILD}.tar.gz OOO_EXTRA_ARTWORK=extras-2.tar.bz2 OOO_CRYSTAL_IMAGES= ooo_crystal_images-1.tar.gz OOO_OPENCLIPART= openclipart-0.18-full.tar.gz OOO_PATCHDIR=src680 .endif MD5_FILE= ${.CURDIR}/distinfo USE_AUTOTOOLS= autoconf:259 CONFIGURE_ARGS+= --enable-cairo --with-system-cairo --with-system-xrender-headers=yes #i62713# CONFIGURE_ARGS+= --disable-access #--with-system-mdbtools #for lpsolve... CONFIGURE_ARGS+= --with-system-lpsolve CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -L${PREFIX}/lib" CONFIGURE_ENV+= CFLAGS="${CFLAGS} -L${PREFIX}/lib" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo LIB_DEPENDS+= lpsolve55.1:${PORTSDIR}/math/lp_solve #LIB_DEPENDS+= mdb:${PORTSDIR}/databases/mdbtools USE_GSTREAMER= yes 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 post-patch: #just for lpsolve... @cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/set_soenv-patch pre-configure: @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz - .if !defined(DEVELOPER_VER) @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch .else @cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel .endif @cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=${OOOBUILD_TAG} @${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/ .if !defined(DEVELOPER_VER) @${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res .endif #extract some goodies cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK} #cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART} .if defined(DEVELOPER_VER) @${MKDIR} ${WRKSRC}/external_images @${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} ${WRKSRC}/external_images .endif .if defined(DEVELOPER_VER) MASTERDIR= ${.CURDIR}/../openoffice.org-2-devel .else MASTERDIR= ${.CURDIR}/../openoffice.org-2 .endif .include "${MASTERDIR}/Makefile" Property changes on: head/editors/ooo-build/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property Index: head/editors/ooo-build/distinfo =================================================================== --- head/editors/ooo-build/distinfo (revision 182351) +++ head/editors/ooo-build/distinfo (revision 182352) @@ -1,24 +1,24 @@ -SIZE (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 4602866 -MD5 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 100eb6ba7f7abcafea042a75692eb948 -SHA256 (openoffice.org2.0/ooo-build-2.0.4.3.tar.gz) = 932c25a6e1f91a5ad8be257179b0e3b18b46bab5736fbdd4223760b23e81ead5 +MD5 (openoffice.org2.0/ooo-build-2.1.tar.gz) = a9b1b3876a804251656374b92dd9e4f0 +SHA256 (openoffice.org2.0/ooo-build-2.1.tar.gz) = 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac +SIZE (openoffice.org2.0/ooo-build-2.1.tar.gz) = 4034756 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-1.tar.gz) = 9c57c933e793f791f2c8817ccd28911c SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 863a5d28a91c41d7d69de474895d7d67dbc4b50310c3f26f33641648b16ac817 SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060 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.4_src.tar.gz) = df4bb26645e974a2358bc17f8381a197 -SHA256 (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 98551d4574586c5a9e26635be758cf05a0315ee9eb44ad7c5ac7c7b983933ea6 -SIZE (openoffice.org2.0/OOo_2.0.4_src.tar.gz) = 333861883 +MD5 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = baa88794cb08d1a11169ae90ec25c0c4 +SHA256 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 492e702455a43c9c1b97266e74d3adc03815178e272c6f79b8e29c1089977e19 +SIZE (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 272194113 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 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 Property changes on: head/editors/ooo-build/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/editors/ooo-build/files/ooo-build-patch =================================================================== --- head/editors/ooo-build/files/ooo-build-patch (revision 182351) +++ head/editors/ooo-build/files/ooo-build-patch (revision 182352) @@ -1,69 +1,68 @@ -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 @@ +--- patches/apply.pl.orig Thu Jan 4 05:16:03 2007 ++++ patches/apply.pl Sun Jan 14 06:55:07 2007 +@@ -722,7 +722,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 @@ +@@ -1006,7 +1006,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 Thu Aug 31 02:44:39 2006 -+++ patches/src680/apply Sat Sep 2 14:50:24 2006 -@@ -81,6 +81,8 @@ - # Novell - NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas +--- patches/src680/apply.orig Fri Jan 12 06:43:19 2007 ++++ patches/src680/apply Sun Jan 14 06:43:42 2007 +@@ -96,6 +96,8 @@ NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas + # Mac OS X + MacOSX : MacOSXCommon, SystemJavaBits, CalcSolver, MacOSXOnly +# FreeBSD +FreeBSD : LinuxCommon, NotDebian, Lockdown, CalcSolver # -------- [ Tag [ >= etc. ], ] patch sets -------- -@@ -169,7 +169,7 @@ - cws-cmcfixes28.diff - - # fix build with newer gccs --buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 -+# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 - - # [ LinuxOnly ] - -@@ -755,7 +757,7 @@ +@@ -781,7 +783,7 @@ autodoc-add-missing-stdio-h.diff, rengelha # do not pack any potential .orig files with ppds -psprint_config-no-orig.diff, jholesov +# psprint_config-no-orig.diff, jholesov # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list # of files does not conflict with the main package, i#64802 -@@ -848,7 +850,7 @@ - buildfix-gcc41-pointers-icu.diff, pmladek +@@ -873,7 +875,7 @@ + warning-uninitialized-variables-tools-2.diff, i#58984, pmladek # Don't re-define NULL -solar-dont-define-NULL.diff, i#66666, jholesov +# solar-dont-define-NULL.diff, i#66666, jholesov # Fix warnings that appear on x86-64 & are considered dangerous - # FIXME file up-stream -@@ -908,7 +908,7 @@ - sixtyfour-warnings-binfilter.diff, jholesov + sixtyfour-warnings-svx.diff, i#70594, jholesov +@@ -887,7 +889,7 @@ + buildfix-gcc41-pointers-icu.diff, pmladek # fix build with newer gccs +-buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 ++# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684 + + [ BFBuildBits ] + SectionOwner => pmladek +@@ -903,7 +905,7 @@ + sixtyfour-warnings-binfilter.diff, i#70594, jholesov + + # fix build with newer gccs -buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684 +# buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684 - [ VCL ] + [ VCL ] Property changes on: head/editors/ooo-build/files/ooo-build-patch ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property