diff options
author | Maho Nakata <maho@FreeBSD.org> | 2010-07-23 21:43:45 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2010-07-23 21:43:45 +0000 |
commit | 5a2d57c0ec461e377dbcf737f06232e2cee182db (patch) | |
tree | cc05e45e683c1bdb79cdb484f70bf306a79125c9 /editors | |
parent | abb1ada39c4ed296557612a9a80ac03742e0209a (diff) | |
download | freebsd-ports-5a2d57c0ec461e377dbcf737f06232e2cee182db.zip |
Some cleanups.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 25 | ||||
-rw-r--r-- | editors/openoffice.org-3-RC/distinfo | 9 |
2 files changed, 9 insertions, 25 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index fcdf3285faaf..a7df4e84f1f6 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -5,15 +5,12 @@ # $FreeBSD$ # -PORTNAME?= openoffice.org -PORTVERSION?= 3.3.${SNAPDATE} -CATEGORIES+= editors java +PORTNAME= openoffice.org +PORTVERSION= 3.3.${SNAPDATE} +CATEGORIES= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/sources/:extsrc \ - http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ - ${MASTER_SITE_MOZILLA_EXTENDED:S/$/:mozsrc/} \ http://tools.openoffice.org/unowinreg_prebuild/680/:unowinreg -MASTER_SITE_SUBDIR+= seamonkey/releases/${SEAMONKEY_VERSION}/:mozsrc DISTFILES+= ${OOOSRC} ${OOOEXTSRC} unowinreg.dll:unowinreg #de facto maintainer is maho@FreeBSD.org @@ -25,14 +22,11 @@ CONFLICTS= cppunit* EXTRATC_ONLY?= ${OOOSRC} ${OOOEXTSRC} -OOOEXTSRC= ext_sources.20100505.tar.bz2:extsrc +OOOEXTSRC= ext_sources.20100718.tar.bz2:extsrc NO_LATEST_LINK= yes .if !defined(WITHOUT_MOZILLA) -SEAMONKEY_VERSION= 1.1.14 -SEAMONKEY_SOURCE= seamonkey-${SEAMONKEY_VERSION}.source.tar.bz2 -DISTFILES+= ${SEAMONKEY_SOURCE}:mozsrc USE_GNOME+= libidl .endif @@ -128,7 +122,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ gtar:${PORTSDIR}/archivers/gtar \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ ant:${PORTSDIR}/devel/apache-ant \ - ${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit + ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit #see #i85469# for gperf USE_BISON= build @@ -191,16 +185,9 @@ pre-everything:: .endif #issue XXXXXX not raised yet... -CRLFFILES=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch - +DOS2UNIX_REGEX=curl/curl*patch neon/neon*patch jfreereport/patches/*.patch post-extract: - for i in ${CRLFFILES}; do \ - cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's#
##g' $$i ; \ - done @${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/ -.if !defined(WITHOUT_MOZILLA) - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SEAMONKEY_SOURCE} ${WRKSRC}/moz/download -.endif pre-configure: #Workaround for gperf. #i85469# diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index dfda45a03fb6..57eccd3f2b8b 100644 --- a/editors/openoffice.org-3-RC/distinfo +++ b/editors/openoffice.org-3-RC/distinfo @@ -1,12 +1,9 @@ MD5 (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = 57188540ddbf0ca27fa63cca89a710c1 SHA256 (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = ab936e6a1c3807507b7ec45d98281cf1b6840d13c23b2facccf8e6d48b3671f8 SIZE (openoffice.org3/OOo_OOO330_m1_source.tar.bz2) = 308218669 -MD5 (openoffice.org3/ext_sources.20100505.tar.bz2) = 222ec0066fb4cdd5147f9b15b4792a41 -SHA256 (openoffice.org3/ext_sources.20100505.tar.bz2) = dca86ab08c92ac44532e5c9060421c0cdf6ca235c6bd1dd5bd8b5259a297a3ef -SIZE (openoffice.org3/ext_sources.20100505.tar.bz2) = 207514823 +MD5 (openoffice.org3/ext_sources.20100718.tar.bz2) = da1971f1f0f3d23a3f1a63c1f9c18a88 +SHA256 (openoffice.org3/ext_sources.20100718.tar.bz2) = 68b032b0a2918eeb2af46b1d4adfb30af5f3d5ff1898de33460f5ec9b834dfc0 +SIZE (openoffice.org3/ext_sources.20100718.tar.bz2) = 214053194 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org3/unowinreg.dll) = 6144 -MD5 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 31eb6ce742dc73609884dab11b1f2712 -SHA256 (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 82d5166b227d0157c1108dc03809a89bea23cfd21f31c7e6767ef5ce1983ca28 -SIZE (openoffice.org3/seamonkey-1.1.14.source.tar.bz2) = 38063082 |