diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:02:29 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:02:29 +0000 |
| commit | d15cc85f7fab4c443c53273f2ff48f58afaa23ab (patch) | |
| tree | acad04b11750b736f04682707faa05c30b6bee4e /editors/openoffice.org-1.1 | |
| parent | 9a55a7fe85131d90f592a224dc80034f2557ca55 (diff) | |
| download | ports-d15cc85f7fab4c443c53273f2ff48f58afaa23ab.tar.gz ports-d15cc85f7fab4c443c53273f2ff48f58afaa23ab.zip | |
Remove expat patch. Expat is included in the release tarball, but in a
different location. Add a patch to fix the build.
Notes
Notes:
svn path=/head/; revision=68612
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/distinfo | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-expat+prj+d.lst | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index aede958b74a7..aeca65365a8e 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -15,7 +15,7 @@ MASTER_SITES+= http://ny1.mirror.openoffice.org/developer/%SUBDIR%/ \ http://ny1.mirror.openoffice.org/miscellaneous/helpcontent/:help \ http://people.freebsd.org/~mbr/ooo/:moz MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES+= oo_${PORTVERSION}_src.tar.bz2 neon.tgz:moz expat.tgz:moz \ +DISTFILES+= oo_${PORTVERSION}_src.tar.bz2 neon.tgz:moz \ gpc231.tar.Z:gpc patch-openoffice-mozilla101-2002-10-14:moz .if defined(L10NHELP) DISTFILES+= ${L10NHELP:S/$/:help/} @@ -113,7 +113,7 @@ USE_GMAKE= yes EXTRACT_BEFORE_ARGS_R= -dc EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} -EXTRACT_REST= gpc231.tar.Z neon.tgz expat.tgz +EXTRACT_REST= gpc231.tar.Z neon.tgz JDK13DIR?= ${LOCALBASE}/jdk1.3.1 JAVAVM= ${JDK13DIR}/bin/java @@ -303,8 +303,7 @@ post-extract: done @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ - @${CP} -r ${WRKDIR}/neon ${WRKSRC}/../external - @${CP} -r ${WRKDIR}/expat ${WRKSRC}/../external + @${CP} -r ${WRKDIR}/neon ${WRKSRC}/../ @${MAKE} extract-mozilla @-${RM} ${WRKSRC}/../moz/zipped/*.zip .if defined(L10NHELP) diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo index dd9157415866..e696c5681079 100644 --- a/editors/openoffice.org-1.1/distinfo +++ b/editors/openoffice.org-1.1/distinfo @@ -1,9 +1,8 @@ MD5 (openoffice/oo_643_src.tar.bz2) = 53c3a72acab3af71fae8c169d5224c21 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a -MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/neon.tgz) = 83f579864b68a635a08d8b5b7161e6d1 -MD5 (openoffice/expat.tgz) = 8bd00f6debda08d213a2220359455056 +MD5 (openoffice/helpcontent) = 832193e5f8954fea10392b73e8dab8c5 MD5 (openoffice/helpcontent_33_unix.tgz) = 20dcbf3211c20afb27fc5677ab8f69e5 MD5 (openoffice/helpcontent_34_unix.tgz) = ba6adc71dc5cb766dd75f5b13a7c6bc8 MD5 (openoffice/helpcontent_39_unix.tgz) = 4c33e3f9f8a64be68c63f33ff1e0e4a7 diff --git a/editors/openoffice.org-1.1/files/patch-expat+prj+d.lst b/editors/openoffice.org-1.1/files/patch-expat+prj+d.lst new file mode 100644 index 000000000000..0bc9afc2f6a8 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-expat+prj+d.lst @@ -0,0 +1,9 @@ +--- ../expat/prj/d.lst.orig Mon Apr 29 19:03:30 2002 ++++ ../expat/prj/d.lst Wed Oct 23 00:53:08 2002 +@@ -1,5 +1,5 @@ + mkdir: %_DEST%\inc%_EXT%\external\expat +-..\%__SRC%\misc\build\expat\xmlparse\xmlparse.h %_DEST%\inc%_EXT%\expat\xmlparse.h ++..\%__SRC%\misc\build\expat\xmlparse\xmlparse.h %_DEST%\inc%_EXT%\external\expat\xmlparse.h + ..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib + ..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib + ..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib |